From patchwork Sat Nov 11 20:49:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 164164 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp413378vqg; Sat, 11 Nov 2023 12:49:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNrID5jMTwkzQMzT9Jf2T06A6XbA0qOG1gpN+MB03UlncnwBFTmlCy3AqgbhyBnhhkK5fR X-Received: by 2002:a17:90b:3a8f:b0:27d:1334:d266 with SMTP id om15-20020a17090b3a8f00b0027d1334d266mr1867283pjb.27.1699735777053; Sat, 11 Nov 2023 12:49:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699735777; cv=none; d=google.com; s=arc-20160816; b=JSgDKVoG7a7YfAvUJoQAu09CU8oTBnb4t08XwztVWzvbHVaxLxPzR80chKgn2qTwYO Y3c5SdyYhT4Tp93NPhTKOprnn5QNwoXW3XNbvIrD1V84vGh8dob1qyfo8zcGrXD+LXnl dMhFogJKDbH2uI1b1tvhtuMw0OcQ1t9r5LP4ofKMeyKcWlYNMFlumLmlcUgkuxoHynTv pfQ5/vowvPkxyyJ5CE/lFTwi2hh26z5v8UaFyjKNQw+4FIS4QePkzIdRtVD23zCVFLy5 8IX3GRfXiGJ1CYT11R//oediXCmDecwdATM7foFlJVL92SXDzNS8K6mNYYxEptuq+N7C dGyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DLBtiPYj3Yy2cVg+bWJ7eQ8pYjPfevkkuxOoGNznoSw=; fh=KTMWq40OZZut8q1OIhHizLgMV76GqD4q/4m6GO8tkV4=; b=namBs4EmSX879yf8OyBO4LHth/3jdKBo6ylr7ccsfLQlFCB4c8NgmeH7nh2qPwEp2C 0GyErHpynzd31vbw3+evmT97IGBszDK0meHptwO7PJlrVQF23mQaLLzgFS6rjjX8uanw LYol4mwVG4xjY5GID1wVn/QtGHA+M7l7z8uD2AAgRsUL9Sg0kjurBlD6fwswg4NM+ysF qesqdQJrGy+eYuarpmzRbzYj0tKysg8mCbw7d1JwfgVWJi1ZokpXTVxgXVrU7xa7uqka XnCSvxxvYqp4zbgXFrfVr/ndPlkj41tEaKReJ3qHgKQXGE1fNnZfDrZH3V7MNCrGW57k VJ4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mp4kal5X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id nn17-20020a17090b38d100b002774c17dd73si2694776pjb.11.2023.11.11.12.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 12:49:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mp4kal5X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 277CC80C65CA; Sat, 11 Nov 2023 12:49:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229704AbjKKUtb (ORCPT + 29 others); Sat, 11 Nov 2023 15:49:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbjKKUt3 (ORCPT ); Sat, 11 Nov 2023 15:49:29 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB99630D1 for ; Sat, 11 Nov 2023 12:49:25 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4079ed65582so23779705e9.1 for ; Sat, 11 Nov 2023 12:49:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699735764; x=1700340564; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DLBtiPYj3Yy2cVg+bWJ7eQ8pYjPfevkkuxOoGNznoSw=; b=mp4kal5X1fTFGgn4v3Vhn+fITh9jiKL1Iv1CNkVz2dr1iNwPUYuPc0yWZFdJL4Lq5Q ldy7MQEmGZ/zM9sN29GN8jaGRjbDKvJwkWCHN17n7VD9Nl0m1mEvE4NebdNGQgKwLsvn 0HxB/APgVS0L05zzwus3GuOV94nBGXLSzrLTKPmmmkbErSfMkGOTqQOfNpSlIqw8wpD1 EEORiLY8q04F5oAH6xEMAx7Fz3K+QAwt9KJV3UkpwzUrmdptB1xge2jP7at1Gmp1heS+ JKJZwzcnP6Swnv7R3KkYeKyP/yQzTDXJ15GzlgUL3I2HFmV0XzHvgDvCuhsPyLflat4d yUww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699735764; x=1700340564; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DLBtiPYj3Yy2cVg+bWJ7eQ8pYjPfevkkuxOoGNznoSw=; b=mqvzF1PIPtO4Bh+k06WPMfl8oM9kIzG9KxsJRP46YbIMveayNyUq1zCqnFg46833ME M9cNfyDFjqyTZQ08MueyoxUgwJoO4YLOPK/fJKyD2X1WKiPx+zlPcVyaLgWIvYEaMFz2 Bl+jX+u5spsK0eH/K5b5pF0ZN05/O49YmNxq4YESLW5Q+26AJH4P4ayN9jvf5eGRWLVM dIrisX59rQ7o+G0BcfBD+uYkyEltqnY4NnHVVFsaI0rNKwfx9eHf6sbY4R1Ii4OF7mGm +un4h+GDRGAFOKGFdAzYpEzVeIlCuStv5SWvHsIp796fSXzRnK7W0t1XK/nEmT4GQttQ chUw== X-Gm-Message-State: AOJu0YxknJSbSByVKHHarBLNyH6QURMV/DBt+5jtmI5Fq3aq7KxP8DTX Jqma27X1ri6WsYMRwFMXo9ElBA== X-Received: by 2002:a05:600c:4ecc:b0:406:8496:bd8b with SMTP id g12-20020a05600c4ecc00b004068496bd8bmr1983168wmq.9.1699735764163; Sat, 11 Nov 2023 12:49:24 -0800 (PST) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id t9-20020a05600c198900b00407752bd834sm3121226wmq.1.2023.11.11.12.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 12:49:23 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Jassi Brar , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v5 1/3] dt-bindings: mailbox: qcom,apcs-kpss-global: drop duplicated qcom,ipq8074-apcs-apps-global Date: Sat, 11 Nov 2023 21:49:14 +0100 Message-Id: <20231111204916.35835-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231111204916.35835-1-krzysztof.kozlowski@linaro.org> References: <20231111204916.35835-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 11 Nov 2023 12:49:36 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782302142114050791 X-GMAIL-MSGID: 1782302142114050791 qcom,ipq8074-apcs-apps-global compatible is listed in two places: with and without fallback. Drop the second case to match DTS. Fixes: 34d8775a0edc ("dt-bindings: mailbox: qcom,apcs-kpss-global: use fallbacks for few variants") Signed-off-by: Krzysztof Kozlowski Acked-by: Conor Dooley --- .../devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml index a38413f8d132..a22c8640dc0e 100644 --- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml @@ -41,7 +41,6 @@ properties: - const: syscon - enum: - qcom,ipq6018-apcs-apps-global - - qcom,ipq8074-apcs-apps-global - qcom,msm8996-apcs-hmss-global - qcom,msm8998-apcs-hmss-global - qcom,qcm2290-apcs-hmss-global From patchwork Sat Nov 11 20:49:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 164165 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp413401vqg; Sat, 11 Nov 2023 12:49:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IGwNyw73drVnyVS55+VH8MdylRZpQNnEZkYItzof/+mzPiH33RY+0iz0pe7rJ2a5ggdw3SM X-Received: by 2002:a05:6a21:3283:b0:181:219f:4a76 with SMTP id yt3-20020a056a21328300b00181219f4a76mr4152412pzb.38.1699735780265; Sat, 11 Nov 2023 12:49:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699735780; cv=none; d=google.com; s=arc-20160816; b=AH4lSAug1gCBihDq6uhaYn3eawVXzW00WYJflE3WfpcTBKfi8Jp4O2X91bqtneQyum P4mz0Hjfi49HIT4yjyNROoLZ68CiITyDOFeVO6HmELLZ1IB3McGjxKseXY8/KN2Cebs2 E169hK+lnhrFgJ3BUzny+lkWZ9sz5QwVur+wRruqDx3656cw0FD/4FVidzvkrNeIH5hR qjuxkDLX0FFexvGfvc1fBB+WuDnpzbwIsOK7xB4yH2/bUzjmrGmjfac0yfuNXky1C5y1 WjCQgwLn6WDOHPTk/ejFbBr6zIsk4khNuLZiRhB1NDuPCwW5NH4kkNZNvAD+PSGsc1TJ 6+yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Dw1ndMUKXNlOHoymKchXozvXFQJ/Nc6du3K0pUpN4dE=; fh=8I17DER8Ydf8nM0FgDq6lmOMQ6elL1e1ZH5w9SNY+Jo=; b=Qp8+go1d0MQVTtbbbD488to5gIIA6uXHDigM0iLiKChHeWyDw8DVKqPDtXCPVx9MqK vhOcScjKebNXNXr3orsEQbDNzeLszmQ8k7dXk4PS1z9Dzqiey2wAASXu75csKUBoVn7x fqt+RKgtGbZ+lBCmnD4VIc0FRUlT99LdS98ec7t0LNwrE7yygOyIPYsXmycZdt3GgDPY WLtXvZZ2ikDWn3xCwrJhccD2sCydnKFMcbedM5G7IovRyLHA08lmm8cOSkzShapP43YC qVQ7a2GOjtEbqgKRYhwbCRIqtJqjgztGoCZ3kG50QLBKb4WnYgMRU7T74ZPYIeecWLce KTWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Knht1UNn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id x8-20020a056a00188800b006c0035ff9dasi2504130pfh.198.2023.11.11.12.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 12:49:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Knht1UNn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 8A03C80C5FB7; Sat, 11 Nov 2023 12:49:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229728AbjKKUte (ORCPT + 29 others); Sat, 11 Nov 2023 15:49:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229672AbjKKUta (ORCPT ); Sat, 11 Nov 2023 15:49:30 -0500 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BEB72D73 for ; Sat, 11 Nov 2023 12:49:27 -0800 (PST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-40790b0a224so23886145e9.0 for ; Sat, 11 Nov 2023 12:49:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699735766; x=1700340566; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Dw1ndMUKXNlOHoymKchXozvXFQJ/Nc6du3K0pUpN4dE=; b=Knht1UNnnReKyyOUyIxQYPEiqrYAMZTAS8ABU8k4wryRg2P4WLUuVSYQNs9qCbmClg eodUBLtzMI84C+U9JtcgWq0JjAiriuUP851fx/jSXZxIw3JjyIKi/CP7IuwNqzN5PQIf WPk0njd+uzxtoHA2p660/JL5MLihqyRlkunZlIsWLU4FFWEMOtm75+6ouHcIyeN/a4z7 OcKQ8tEqiVAv6PiJBu9MOQzvXXSAVekfNtZHbDwwWTsEaka54hRYcf1KHpwWuaSTv5mp VoXCBBZCxC6taKZq9rv2lEGozfAP/B9dJJaG9chVBfcb4irhpG1Wqfifz0dHoHeD+Sd9 o96A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699735766; x=1700340566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dw1ndMUKXNlOHoymKchXozvXFQJ/Nc6du3K0pUpN4dE=; b=XaDnfxv95QdZWXq4FERwuXQXQ6IEyX3VI4fyzWae75GAIe7STPB/aFkqdPPI433heH CFDLMz00OLG4QN+tIeHEIlzikMU+prsl3NcawgCXxadaANlZidGQc1YWFsqhgaMYbw69 ZY2G1VJcpmafSn+BYmKEpESgzjxXySjg4F/Ar0CxQWmoyYcKi+eWM9cPlwo9qw12MTSx WmAOq1JJddShnXN/Ba8zqetroArLqHfJ4sx/hsw8CEpyfpflVwe3mE4Q8C1x37clbtno xPqKjKkmpopYCBx3fqmtbKy05/hWIJKq0znZBscbdDnQ0+cdHGHpBCJHuHiGqteB9LGz j+OA== X-Gm-Message-State: AOJu0YxI2ZfgwUvgmRmcqgkdw95ntCe9/b0o4ytXDhYJVe/2S0jBx3YA j7aZaTpbua/I7w6qp++1GA79Lg== X-Received: by 2002:a05:600c:4689:b0:408:37aa:4766 with SMTP id p9-20020a05600c468900b0040837aa4766mr2219387wmo.5.1699735766179; Sat, 11 Nov 2023 12:49:26 -0800 (PST) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id t9-20020a05600c198900b00407752bd834sm3121226wmq.1.2023.11.11.12.49.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 12:49:25 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Jassi Brar , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Krzysztof Kozlowski , Rob Herring Subject: [PATCH v5 2/3] dt-bindings: mailbox: qcom,apcs-kpss-global: use fallbacks Date: Sat, 11 Nov 2023 21:49:15 +0100 Message-Id: <20231111204916.35835-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231111204916.35835-1-krzysztof.kozlowski@linaro.org> References: <20231111204916.35835-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 11 Nov 2023 12:49:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782302145570971073 X-GMAIL-MSGID: 1782302145570971073 Rework the compatibles and group devices which have similar interface (same from Linux driver point of view) as compatible. This allows smaller of_device_id table in the Linux driver and smaller allOf:if:then: constraints. Signed-off-by: Krzysztof Kozlowski Acked-by: Rob Herring --- .../mailbox/qcom,apcs-kpss-global.yaml | 61 +++++++++++++------ 1 file changed, 43 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml index a22c8640dc0e..79eb523b8436 100644 --- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml +++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml @@ -23,6 +23,24 @@ properties: - qcom,ipq8074-apcs-apps-global - qcom,ipq9574-apcs-apps-global - const: qcom,ipq6018-apcs-apps-global + - items: + - enum: + - qcom,qcs404-apcs-apps-global + - const: qcom,msm8916-apcs-kpss-global + - const: syscon + - items: + - enum: + - qcom,msm8976-apcs-kpss-global + - const: qcom,msm8994-apcs-kpss-global + - const: syscon + - items: + - enum: + - qcom,msm8998-apcs-hmss-global + - qcom,sdm660-apcs-hmss-global + - qcom,sm4250-apcs-hmss-global + - qcom,sm6115-apcs-hmss-global + - qcom,sm6125-apcs-hmss-global + - const: qcom,msm8994-apcs-kpss-global - items: - enum: - qcom,sc7180-apss-shared @@ -34,21 +52,14 @@ properties: - qcom,msm8916-apcs-kpss-global - qcom,msm8939-apcs-kpss-global - qcom,msm8953-apcs-kpss-global - - qcom,msm8976-apcs-kpss-global - qcom,msm8994-apcs-kpss-global - - qcom,qcs404-apcs-apps-global - qcom,sdx55-apcs-gcc - const: syscon - enum: - qcom,ipq6018-apcs-apps-global - qcom,msm8996-apcs-hmss-global - - qcom,msm8998-apcs-hmss-global - qcom,qcm2290-apcs-hmss-global - - qcom,sdm660-apcs-hmss-global - qcom,sdm845-apss-shared - - qcom,sm4250-apcs-hmss-global - - qcom,sm6115-apcs-hmss-global - - qcom,sm6125-apcs-hmss-global reg: maxItems: 1 @@ -79,10 +90,9 @@ allOf: - if: properties: compatible: - enum: - - qcom,msm8916-apcs-kpss-global - - qcom,msm8939-apcs-kpss-global - - qcom,qcs404-apcs-apps-global + contains: + enum: + - qcom,msm8916-apcs-kpss-global then: properties: clocks: @@ -94,6 +104,25 @@ allOf: - const: pll - const: aux + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8939-apcs-kpss-global + then: + properties: + clocks: + items: + - description: primary pll parent of the clock driver + - description: auxiliary parent + - description: reference clock + clock-names: + items: + - const: pll + - const: aux + - const: ref + - if: properties: compatible: @@ -112,6 +141,7 @@ allOf: - const: ref - const: pll - const: aux + - if: properties: compatible: @@ -136,16 +166,10 @@ allOf: compatible: enum: - qcom,msm8953-apcs-kpss-global - - qcom,msm8976-apcs-kpss-global - qcom,msm8994-apcs-kpss-global - qcom,msm8996-apcs-hmss-global - - qcom,msm8998-apcs-hmss-global - qcom,qcm2290-apcs-hmss-global - - qcom,sdm660-apcs-hmss-global - qcom,sdm845-apss-shared - - qcom,sm4250-apcs-hmss-global - - qcom,sm6115-apcs-hmss-global - - qcom,sm6125-apcs-hmss-global then: properties: clocks: false @@ -191,7 +215,8 @@ examples: #define GCC_APSS_AHB_CLK_SRC 1 #define GCC_GPLL0_AO_OUT_MAIN 123 apcs: mailbox@b011000 { - compatible = "qcom,qcs404-apcs-apps-global", "syscon"; + compatible = "qcom,qcs404-apcs-apps-global", + "qcom,msm8916-apcs-kpss-global", "syscon"; reg = <0x0b011000 0x1000>; #mbox-cells = <1>; clocks = <&apcs_hfpll>, <&gcc GCC_GPLL0_AO_OUT_MAIN>; From patchwork Sat Nov 11 20:49:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 164166 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp413404vqg; Sat, 11 Nov 2023 12:49:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHyo5gLaRaxBCattT47WhB42KBYqcN2JiY6wDfFiHv9kE+TjgMhJ6GWeExnF5BJzYujr7Hn X-Received: by 2002:a05:6358:e496:b0:169:8620:a228 with SMTP id by22-20020a056358e49600b001698620a228mr2402251rwb.3.1699735780757; Sat, 11 Nov 2023 12:49:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699735780; cv=none; d=google.com; s=arc-20160816; b=TsIs5aMtbrPurrB0i26HZDn+GR7+aXSev2/bAHNtbOhAAOTXxHKHjsqSt9xtMhsXfu CBojyy8XGHC0XI44JWElnzKKz24vjKDv8m0gU53s5yXkFsZSNkFA/Vd7BP7kGM0faowr 3rrhdPpufKKIwc33tPHvJnX73/VBSxG0kxUvR+wYP9pBivRvCcH84ENYUlK65d96RGCj +Nq0U6ql/18Nftezv/0wG4l0ukoUHPCACANQy3svpWeJjoWybxswJhpigSFJp/GIMZVI EycH0cuxqHXZL7nKV+b3JGhj/Jl9YzrOxBUzBWS6AqRlEKAiChyLhJK43iCjieEVc+Hj gy+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=f4JO3wrflztQvCLRxh9c/YzTkfu7aFzRvnmTFixGbvk=; fh=KTMWq40OZZut8q1OIhHizLgMV76GqD4q/4m6GO8tkV4=; b=Dyh4YQtcBFC3OAz14S7xzjNDfbi+KHBSza7LlpGKSBZ8x1j77WhXztaozujovBBmTL ldLgmloMcd6H97Syba7h1GgLrNtRHKd1/l6kp5W4FUjKvy6TsmDJOvvE9iq9jAyadOVR UROIVTvzYYcx792SEmpaBmJCThY9v9zh1kALdcctbUYJXINy5JRY8TdMAV767VKgEYMX L019JmPB8OPWdJfWEE1uHThjO9t8uOteEl4pvbsPwOn4/t6kpSrMrOzJ93NQbK0oZn72 urO54JP7hTXfG4Of2FF9L0m8XYXgvu4cZsZJcy7DpOo6w6kUQkht58UxL/j2pPPqOA0s iUoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yf1aEC8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id z9-20020a655a49000000b005b8f60baea9si2511264pgs.801.2023.11.11.12.49.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 12:49:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yf1aEC8g; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A3C5C80C65CC; Sat, 11 Nov 2023 12:49:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229733AbjKKUth (ORCPT + 29 others); Sat, 11 Nov 2023 15:49:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229725AbjKKUtc (ORCPT ); Sat, 11 Nov 2023 15:49:32 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B51A2D77 for ; Sat, 11 Nov 2023 12:49:29 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40a4d04af5cso4080405e9.0 for ; Sat, 11 Nov 2023 12:49:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699735767; x=1700340567; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f4JO3wrflztQvCLRxh9c/YzTkfu7aFzRvnmTFixGbvk=; b=Yf1aEC8gvjEBLNa2uQQRDIu9QEAni6L4ZKokPdnZq8RM820ptrOJ5Ql6S+AB6eGGvs S/RKpeFCuXxYV7yuXIwIY1A45+augElV0BqmDwNzZdZtwLVH15yXnShiYJ8/sqHYsIgx n3RWm2CpRZzh5CuMOwouHzpJcdHMTCpWiIsm+NSyDKziK6iM8HZemdRf8XtA1wlVPo8R YOM/TH1E0gboubhaG045EkwTG2c0IRl2diWnu8wrrz//Ya12UL8Gm0TmonRUIQ/7bGYN dwaUesRpU17m4QgxhStQ63nM06dOouPhb1c/846XvQaW3aEi5pjbrzOHu5MKr7qcEgyJ ae+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699735767; x=1700340567; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f4JO3wrflztQvCLRxh9c/YzTkfu7aFzRvnmTFixGbvk=; b=n7UAaxvzHY8RXuXPbggCiGNfA9YQmJa9C35YwJZsM3GZGhxHSZeq37X19jrjGPPmEn ZSmJPaEiyv2TGQmhX83krMPcDt0+ufLL1nU7vLXjfl+W5cy2XAASL3uJonkY6pVqO9+d BPkCOA3dXeGVmuXSjcswjIv4jhKdsboJae9zdK0N78KjEnthc0ZPzk+d2j15H2ukaxJV jW1hu7k4uLxxP6pYscau2afmqRurFMYZbU4ziJJ0lBcHke8Ogju3lLfSeTTPWm79nsbP FB69rIAOhHQpg0fhYcIAYHrMv1rWJ5L31WeDKsrqcQvnoaQHcPrR1nVqTssjtp0VgAd3 dPVw== X-Gm-Message-State: AOJu0Yw82tRwruiLJ93RnlkyMHF05FYB+1f4v3Wv9vVqIXHSRAnyyn04 5WWmGClzGj94z/9cuspJ4+yqhQ== X-Received: by 2002:a05:600c:450a:b0:409:375:5a44 with SMTP id t10-20020a05600c450a00b0040903755a44mr2330569wmo.24.1699735767758; Sat, 11 Nov 2023 12:49:27 -0800 (PST) Received: from krzk-bin.. ([178.197.218.126]) by smtp.gmail.com with ESMTPSA id t9-20020a05600c198900b00407752bd834sm3121226wmq.1.2023.11.11.12.49.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Nov 2023 12:49:27 -0800 (PST) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Jassi Brar , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v5 3/3] mailbox: qcom-apcs-ipc: re-organize compatibles with fallbacks Date: Sat, 11 Nov 2023 21:49:16 +0100 Message-Id: <20231111204916.35835-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231111204916.35835-1-krzysztof.kozlowski@linaro.org> References: <20231111204916.35835-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sat, 11 Nov 2023 12:49:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782302145657337489 X-GMAIL-MSGID: 1782302145657337489 Similarly to previous commit e17225887005 ("mailbox: qcom-apcs-ipc: do not grow the of_device_id"), move compatibles with fallbacks in the of_device_id table, to indicate these are not necessary. This only shuffles the code. No functional impact. Signed-off-by: Krzysztof Kozlowski --- drivers/mailbox/qcom-apcs-ipc-mailbox.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index 002a135ee868..79136fb62f01 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -145,19 +145,19 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = { { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data }, { .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data }, { .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data }, - { .compatible = "qcom,msm8976-apcs-kpss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,msm8994-apcs-kpss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,msm8996-apcs-hmss-global", .data = &msm8996_apcs_data }, - { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,qcm2290-apcs-hmss-global", .data = &msm8994_apcs_data }, + { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data }, + { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data }, + /* Do not add any more entries using existing driver data */ + { .compatible = "qcom,msm8976-apcs-kpss-global", .data = &msm8994_apcs_data }, + { .compatible = "qcom,msm8998-apcs-hmss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,qcs404-apcs-apps-global", .data = &msm8916_apcs_data }, { .compatible = "qcom,sdm660-apcs-hmss-global", .data = &msm8994_apcs_data }, - { .compatible = "qcom,sdm845-apss-shared", .data = &apps_shared_apcs_data }, { .compatible = "qcom,sm4250-apcs-hmss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,sm6125-apcs-hmss-global", .data = &msm8994_apcs_data }, { .compatible = "qcom,sm6115-apcs-hmss-global", .data = &msm8994_apcs_data }, - { .compatible = "qcom,sdx55-apcs-gcc", .data = &sdx55_apcs_data }, - /* Do not add any more entries using existing driver data */ { .compatible = "qcom,ipq5332-apcs-apps-global", .data = &ipq6018_apcs_data }, { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data }, { .compatible = "qcom,sc7180-apss-shared", .data = &apps_shared_apcs_data },