ARM: dts: qcom-msm8974pro: Use &labels

Use &labels to align with the style used in new DTS and apply tiny
style fixes.

Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220415115633.575010-15-konrad.dybcio@somainline.org

diff --git a/arch/arm/boot/dts/qcom-msm8974pro.dtsi b/arch/arm/boot/dts/qcom-msm8974pro.dtsi
index b64c28036dd07a80ad40e8713d2c4e98b66ca6ea..973bd1dafbfe8d1b3fd2f4c0132b737c234ef9a9 100644 (file)
--- 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";
 };