[PATCH 14/23] ARM: dts: qcom-msm8974pro: Use &labels
DORMANTno replies
LANDED
From: Konrad Dybcio <hidden>
Date: 2022-04-15 11:58:08
Also in:
linux-arm-msm, lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
Landed in mainline as 7bdc6d8c37c0 on 2022-04-20.
Use &labels to align with the style used in new DTS and apply tiny style fixes. Signed-off-by: Konrad Dybcio <redacted> --- arch/arm/boot/dts/qcom-msm8974pro.dtsi | 31 +++++++++++--------------- 1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-msm8974pro.dtsi b/arch/arm/boot/dts/qcom-msm8974pro.dtsi
index b64c28036dd0..973bd1dafbfe 100644
--- a/arch/arm/boot/dts/qcom-msm8974pro.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974pro.dtsi@@ -1,23 +1,18 @@ #include "qcom-msm8974.dtsi" -/ { - soc { - sdhci@f9824900 { - clocks = <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>, - <&xo_board>, - <&gcc GCC_SDCC1_CDCCAL_FF_CLK>, - <&gcc GCC_SDCC1_CDCCAL_SLEEP_CLK>; - clock-names = "core", "iface", "xo", "cal", "sleep"; - }; +&gcc { + compatible = "qcom,gcc-msm8974pro"; +}; - clock-controller@fc400000 { - compatible = "qcom,gcc-msm8974pro"; - }; +&gpu { + compatible = "qcom,adreno-330.2", "qcom,adreno"; +}; - adreno@fdb00000 { - compatible = "qcom,adreno-330.2", - "qcom,adreno"; - }; - }; +&sdhc_1 { + clocks = <&gcc GCC_SDCC1_APPS_CLK>, + <&gcc GCC_SDCC1_AHB_CLK>, + <&xo_board>, + <&gcc GCC_SDCC1_CDCCAL_FF_CLK>, + <&gcc GCC_SDCC1_CDCCAL_SLEEP_CLK>; + clock-names = "core", "iface", "xo", "cal", "sleep"; };
--
2.35.2