| Message ID | 20221107235654.1769462-14-bryan.odonoghue@linaro.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2373366wru;
Mon, 7 Nov 2022 15:58:35 -0800 (PST)
X-Google-Smtp-Source:
AMsMyM7SvQmLlBDhCDyvBUrsMXXoFs8sVQaEPHiDQgi3mwzFMA8pAQtqdjIGfBHH010jWnZdEB7E
X-Received: by 2002:a63:df10:0:b0:43b:e82f:e01c with SMTP id
u16-20020a63df10000000b0043be82fe01cmr45720266pgg.19.1667865515058;
Mon, 07 Nov 2022 15:58:35 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1667865515; cv=none;
d=google.com; s=arc-20160816;
b=XwzCKxf2SBtOdroxldtF+QH3k3R/mzrwtreurvda65a86mbV5mQPFJJawNSF6dQW6y
J7eukvxNkmTtrlkS9MPtUUyZFWcjD0UMxeqxxXnmDveXO7CfXnXxBepwSNQuATlhZwCc
bd47zQza8w5BbS5IwzhhxmeFjJSleujB5SZsxdw6nRnIDfKkm8OnSO104bXQuYCzlJi3
UsUXW4IQifkMFVNRGVhNjsPwpCiwXHTdLK7Ke6miSZxYwHki+ycHy0wlXG6uPECMgjS7
fy/4XoCV4S3bU0lvWkWEix2DC+3LJLhrp6/O+pMdEDmrl6ELjXSZDj/txShsv3TLp0vJ
g/JQ==
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=950ZKmKhad8aMrZOtshFiSVQfwA+V/urByaO2QTWaYE=;
b=mmfS3CLpAw76g4aPlgLAtx/d1sQbEdVng9JvM59ZpRWgwNXtyEUxeIzMLzinHor9xM
bwVxSKEakBYnvVObISAsoOt8yr59NGt2uA1NeMuS8hzIDA6v8DrXBXEpyDbLJj+1EYRP
JODS9upNFNCt8hvwvhC4lqME0koxBxGu9UAyh/+8Vl4DeYNB46NVRA9LHLjq6mptspXN
Jq0LcaasHDSLKmHOP2Wsgucusq42NXZIJGl/jNpsmLPZCE9Hhpf7q4+v047KWgU8XL5k
CqxPfMz4AaLR2QXMubpSzU5tmU55GpUmE3cR1aozdk+RymHnqkt1hK468lpr6Ua1HgLb
8CQw==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=eKB49N6K;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
t15-20020a170902b20f00b00178a33faa42si11078572plr.66.2022.11.07.15.58.22;
Mon, 07 Nov 2022 15:58:35 -0800 (PST)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@linaro.org header.s=google header.b=eKB49N6K;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S233112AbiKGX5v (ORCPT <rfc822;hjfbswb@gmail.com> + 99 others);
Mon, 7 Nov 2022 18:57:51 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36396 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S232959AbiKGX5U (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Mon, 7 Nov 2022 18:57:20 -0500
Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com
[IPv6:2a00:1450:4864:20::331])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF21F28719
for <linux-kernel@vger.kernel.org>;
Mon, 7 Nov 2022 15:57:10 -0800 (PST)
Received: by mail-wm1-x331.google.com with SMTP id
ay14-20020a05600c1e0e00b003cf6ab34b61so10645387wmb.2
for <linux-kernel@vger.kernel.org>;
Mon, 07 Nov 2022 15:57:10 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google;
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=950ZKmKhad8aMrZOtshFiSVQfwA+V/urByaO2QTWaYE=;
b=eKB49N6KK7qkJjTz9Ws5RGtm9BjGoX2rvhRcKDjagCF7DkY0EfS0MGcXAZOGkKpw6J
nS6+9eIneNq/YzMtyUgQiuwelivJm0D5ws6vu6wNSuHyhiYteQFi7Mv0/5A69ZROAQ4t
BH0bpsN3EU4IGB6rP0ufHfg/Pr1QxTXyvVV1q+Rt2UCJp/ONWRn1Kw6i70/QVbRiGPcL
T15A3ALxzyD7BSckicSBVtbD3Xrg6TbT3dJ2YLrgjN9pTpmcPPhY8jG61kd1d7Ca5m9X
AHng2juXuNOpzizo//N+3swh1e5DkI67FpR7JJ2rK8hvsKL6NeYp0aLuaBCJiSfy2ukn
7Agg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
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=950ZKmKhad8aMrZOtshFiSVQfwA+V/urByaO2QTWaYE=;
b=vjeeGvugITeU6ABwdJ1o6w5ueFzUdDiuMCN+Ty3ii/Cgx22eoMJCtJLk0NKSSrh7SO
AgAXn+591ymw57ggui4iWAFODdE77sVzg3lNNfVjnQFIk/icnyuwz7YoISIlvLSaj0oW
BiX7QjEmpAgioFkTAlQ546m5XkVI+drla+0Jm02ul6Y7fOpctavKsMner/B6ruQsTh+j
VHmcJTEos7HRMNxPxTFEVj9vg4Yp3/gXFhHAWcH9qnD79vQ1hI3ds0yKB4Svye9qW2DQ
GU7RiU3oiSkrZMpP6LXKKRvlSm8CZOvFftAYyi7+oo2qZ8muFAYrrozoD0bl5W0DhENg
qSLQ==
X-Gm-Message-State: ACrzQf02WO4vSZa/CZHkcKt6rncuPVxv4ygTrY9WdkCdJe1JTvH2FPFy
rR1HjyJ+/Lzgp0bgWpFfvUIklQ==
X-Received: by 2002:a1c:730e:0:b0:3b4:b0c0:d616 with SMTP id
d14-20020a1c730e000000b003b4b0c0d616mr35222105wmb.72.1667865430588;
Mon, 07 Nov 2022 15:57:10 -0800 (PST)
Received: from sagittarius-a.chello.ie (188-141-3-169.dynamic.upc.ie.
[188.141.3.169])
by smtp.gmail.com with ESMTPSA id
b18-20020a056000055200b00236545edc91sm8386161wrf.76.2022.11.07.15.57.09
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 07 Nov 2022 15:57:10 -0800 (PST)
From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: robdclark@gmail.com, quic_abhinavk@quicinc.com,
dmitry.baryshkov@linaro.org, krzysztof.kozlowski+dt@linaro.org,
robh+dt@kernel.org, quic_mkrishn@quicinc.com,
linux-arm-msm@vger.kernel.org
Cc: Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Douglas Anderson <dianders@chromium.org>,
Rajendra Nayak <rnayak@codeaurora.org>,
Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Subject: [PATCH v2 13/18] arm64: dts: qcom: sc7180: Add compat
qcom,mdss-dsi-ctrl-sc7180
Date: Mon, 7 Nov 2022 23:56:49 +0000
Message-Id: <20221107235654.1769462-14-bryan.odonoghue@linaro.org>
X-Mailer: git-send-email 2.38.1
In-Reply-To: <20221107235654.1769462-1-bryan.odonoghue@linaro.org>
References: <20221107235654.1769462-1-bryan.odonoghue@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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_NONE,
SPF_HELO_NONE,SPF_PASS 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1748883750401890984?=
X-GMAIL-MSGID: =?utf-8?q?1748883750401890984?=
|
| Series |
[v2,01/18] dt-bindings: msm: dsi-controller-main: Fix operating-points-v2 constraint
|
|
Commit Message
Bryan O'Donoghue
Nov. 7, 2022, 11:56 p.m. UTC
Add silicon specific compatible qcom,mdss-dsi-ctrl-sc7180 to the
mdss-dsi-ctrl block. This allows us to differentiate the specific bindings
for sc7180 against the yaml documentation.
Cc: Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <andersson@kernel.org>
Cc: Konrad Dybcio <konrad.dybcio@somainline.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: linux-arm-msm@vger.kernel.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Rajendra Nayak <rnayak@codeaurora.org>
Cc: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Comments
Hi, On Mon, Nov 7, 2022 at 3:57 PM Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote: > > Add silicon specific compatible qcom,mdss-dsi-ctrl-sc7180 to the > mdss-dsi-ctrl block. This allows us to differentiate the specific bindings > for sc7180 against the yaml documentation. > > Cc: Andy Gross <agross@kernel.org> > Cc: Bjorn Andersson <andersson@kernel.org> > Cc: Konrad Dybcio <konrad.dybcio@somainline.org> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org> > Cc: linux-arm-msm@vger.kernel.org > Cc: devicetree@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: Douglas Anderson <dianders@chromium.org> > Cc: Rajendra Nayak <rnayak@codeaurora.org> > Cc: Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org> > Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > --- > arch/arm64/boot/dts/qcom/sc7180.dtsi | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > index d2c374e9d8c03..07acb7f843d62 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -2985,7 +2985,8 @@ opp-460000000 { > }; > > dsi0: dsi@ae94000 { > - compatible = "qcom,mdss-dsi-ctrl"; > + compatible = "qcom,mdss-dsi-ctrl-sc7180", > + "qcom,mdss-dsi-ctrl"; This seems fine, but I don't think it matches your bindings. Your bindings says you can have one compatible string. It could be "qcom,mdss-dsi-ctrl-sc7180" or it could be "qcom,mdss-dsi-ctrl". ...but your device tree has two compatible strings: the SoC specific one and the fallback one. You need to change your bindings to make this work. -Doug
On 08/11/2022 00:24, Doug Anderson wrote: > This seems fine, but I don't think it matches your bindings. Your > bindings says you can have one compatible string. It could be > "qcom,mdss-dsi-ctrl-sc7180" or it could be "qcom,mdss-dsi-ctrl". > ...but your device tree has two compatible strings: the SoC specific > one and the fallback one. You need to change your bindings to make > this work. With the update in this series the binding has a required const. If you drop back to just "qcom,mdss-dsi-ctrl-sc7180" you get a warning like this. arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dtb: dsi@ae94000: compatible: ['qcom,mdss-dsi-ctrl-sc7180'] is too short If you just have 'qcom,mdss-dsi-ctrl' you get arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dtb: dsi@ae94000: compatible:0: 'qcom,mdss-dsi-ctrl' is not one of ['qcom,dsi-ctrl-6g-qcm2290', 'qcom,mdss-dsi-ctrl-apq8064', 'qcom,mdss-dsi-ctrl-msm8916', 'qcom,mdss-dsi-ctrl-msm8974', 'qcom,mdss-dsi-ctrl-msm8996', 'qcom,mdss-dsi-ctrl-sc7180', 'qcom,mdss-dsi-ctrl-sc7280', 'qcom,mdss-dsi-ctrl-sdm630', 'qcom,mdss-dsi-ctrl-sdm660', 'qcom,mdss-dsi-ctrl-sdm845', 'qcom,mdss-dsi-ctrl-sm8250'] --- bod
Hi, On Tue, Nov 8, 2022 at 4:16 AM Bryan O'Donoghue <bryan.odonoghue@linaro.org> wrote: > > On 08/11/2022 00:24, Doug Anderson wrote: > > This seems fine, but I don't think it matches your bindings. Your > > bindings says you can have one compatible string. It could be > > "qcom,mdss-dsi-ctrl-sc7180" or it could be "qcom,mdss-dsi-ctrl". > > ...but your device tree has two compatible strings: the SoC specific > > one and the fallback one. You need to change your bindings to make > > this work. > > With the update in this series the binding has a required const. > > If you drop back to just "qcom,mdss-dsi-ctrl-sc7180" you get a warning > like this. > > arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dtb: dsi@ae94000: > compatible: ['qcom,mdss-dsi-ctrl-sc7180'] is too short > > If you just have 'qcom,mdss-dsi-ctrl' you get > > arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dtb: dsi@ae94000: > compatible:0: 'qcom,mdss-dsi-ctrl' is not one of > ['qcom,dsi-ctrl-6g-qcm2290', 'qcom,mdss-dsi-ctrl-apq8064', > 'qcom,mdss-dsi-ctrl-msm8916', 'qcom,mdss-dsi-ctrl-msm8974', > 'qcom,mdss-dsi-ctrl-msm8996', 'qcom,mdss-dsi-ctrl-sc7180', > 'qcom,mdss-dsi-ctrl-sc7280', 'qcom,mdss-dsi-ctrl-sdm630', > 'qcom,mdss-dsi-ctrl-sdm660', 'qcom,mdss-dsi-ctrl-sdm845', > 'qcom,mdss-dsi-ctrl-sm8250'] Huh. I must have missed something then. Ah, I see the problem. Since you didn't CC me on the bindings change I searched myself. I found patch #7 in your series ("dt-bindings: msm: dsi-controller-main: Add compatible strings for every current SoC"). In that patch everything is flat. I didn't notice patch #8 in your series which changes this. I would just get the compatibles right the right time. Looking at patch #8 I see that Dmitry already suggested this. So that means this is fine with me. A slight nit that I suspect Bjorn would prefer you to blow past the 80 column limit and put both compatibles on one line, but it's not huge in my mind. Reviewed-by: Douglas Anderson <dianders@chromium.org>
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index d2c374e9d8c03..07acb7f843d62 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -2985,7 +2985,8 @@ opp-460000000 { }; dsi0: dsi@ae94000 { - compatible = "qcom,mdss-dsi-ctrl"; + compatible = "qcom,mdss-dsi-ctrl-sc7180", + "qcom,mdss-dsi-ctrl"; reg = <0 0x0ae94000 0 0x400>; reg-names = "dsi_ctrl";