Message ID | 20220202132301.v3.14.I4ebe7533f00324213d224efc7267ebd16fd6f253@changeid (mailing list archive) |
---|---|
State | Changes Requested |
Headers | show |
Series | arm64: dts: qcom: sc7x80: A smattering of misc dts cleanups + herobrine-rev1 | expand |
Quoting Douglas Anderson (2022-02-02 13:23:48) > There's a proposal to take the SoC name out of the top-level > compatible and move it under the "soc@0" node. Building on the patch > ("arm64: dts: qcom: sc7280: Add the CPU compatible to the soc@0 > node"), which added this to the soc@0 node, this removes it from the > top-level node. > > NOTE: while the previous patch could land at any time without any > compatibility issues, this patch will cause problems without a code > change to the cpufreq driver [1]. > > [1] https://lore.kernel.org/r/CAE-0n50sX9-0MxcpF+3Rwqm75jSw5=aNwdsitLwE2sEA69jLJw@mail.gmail.com > > Suggested-by: Stephen Boyd <swboyd@chromium.org> > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org> It needs to wait though, as stated above.
diff --git a/arch/arm64/boot/dts/qcom/sc7280-crd.dts b/arch/arm64/boot/dts/qcom/sc7280-crd.dts index e2efbdde53a3..f02cda91675c 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-crd.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-crd.dts @@ -12,7 +12,7 @@ / { model = "Qualcomm Technologies, Inc. sc7280 CRD platform"; - compatible = "qcom,sc7280-crd", "google,hoglin", "qcom,sc7280"; + compatible = "qcom,sc7280-crd", "google,hoglin"; aliases { serial0 = &uart5; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts index f7d4adeae90c..c40ccb1dc429 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts @@ -25,7 +25,7 @@ / { model = "Google Herobrine (rev0)"; - compatible = "google,herobrine-rev0", "qcom,sc7280"; + compatible = "google,herobrine-rev0"; }; / { diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts index f95273052da0..8d993bba4389 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts @@ -11,7 +11,7 @@ / { model = "Google Herobrine (rev1+)"; - compatible = "google,herobrine", "qcom,sc7280"; + compatible = "google,herobrine"; }; /* ADDITIONS TO NODES DEFINED IN PARENT DEVICE TREE FILES */ diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts index a7be133a782f..7f3c8189555e 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts @@ -13,7 +13,7 @@ / { model = "Qualcomm Technologies, Inc. sc7280 IDP SKU1 platform"; - compatible = "qcom,sc7280-idp", "google,senor", "qcom,sc7280"; + compatible = "qcom,sc7280-idp", "google,senor"; aliases { serial0 = &uart5; diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp2.dts b/arch/arm64/boot/dts/qcom/sc7280-idp2.dts index 73b9911dd802..004925fd896e 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp2.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-idp2.dts @@ -12,7 +12,7 @@ / { model = "Qualcomm Technologies, Inc. sc7280 IDP SKU2 platform"; - compatible = "qcom,sc7280-idp2", "google,piglin", "qcom,sc7280"; + compatible = "qcom,sc7280-idp2", "google,piglin"; aliases { serial0 = &uart5;
There's a proposal to take the SoC name out of the top-level compatible and move it under the "soc@0" node. Building on the patch ("arm64: dts: qcom: sc7280: Add the CPU compatible to the soc@0 node"), which added this to the soc@0 node, this removes it from the top-level node. NOTE: while the previous patch could land at any time without any compatibility issues, this patch will cause problems without a code change to the cpufreq driver [1]. [1] https://lore.kernel.org/r/CAE-0n50sX9-0MxcpF+3Rwqm75jSw5=aNwdsitLwE2sEA69jLJw@mail.gmail.com Suggested-by: Stephen Boyd <swboyd@chromium.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> --- Not for commiting right now since we'd need the corresponding code change. Changes in v3: - ("Remove "qcom,sc7280" from top-level") patch new for v3. arch/arm64/boot/dts/qcom/sc7280-crd.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r1.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-idp2.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)