ARM: dts: qcom: msm8960: drop amba device node

The separate amba device node doesn't add anything significant to the
DT. The OF parsing code already creates amba_device or platform_device
depending on the compatibility lists. Drop the amba node and reorder
sdcc nodes according to node addresses.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220930185236.867655-20-dmitry.baryshkov@linaro.org

diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi
index 487ab9b8d23bb14410fdce0f75605582fdc91bc3..30abf53b062d3a4bb4893e17e1e1f68aa84ab1f3 100644 (file)
--- a/arch/arm/boot/dts/qcom-msm8960.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8960.dtsi
@@ -297,44 +297,38 @@
                        clock-names = "core";
                };
 
-               amba {
-                       compatible = "simple-bus";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges;
-                       sdcc1: mmc@12400000 {
-                               status = "disabled";
-                               compatible = "arm,pl18x", "arm,primecell";
-                               arm,primecell-periphid = <0x00051180>;
-                               reg = <0x12400000 0x8000>;
-                               interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-names = "cmd_irq";
-                               clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
-                               clock-names = "mclk", "apb_pclk";
-                               bus-width = <8>;
-                               max-frequency = <96000000>;
-                               non-removable;
-                               cap-sd-highspeed;
-                               cap-mmc-highspeed;
-                               vmmc-supply = <&vsdcc_fixed>;
-                       };
+               sdcc3: mmc@12180000 {
+                       compatible = "arm,pl18x", "arm,primecell";
+                       arm,primecell-periphid = <0x00051180>;
+                       status = "disabled";
+                       reg = <0x12180000 0x8000>;
+                       interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "cmd_irq";
+                       clocks = <&gcc SDC3_CLK>, <&gcc SDC3_H_CLK>;
+                       clock-names = "mclk", "apb_pclk";
+                       bus-width = <4>;
+                       cap-sd-highspeed;
+                       cap-mmc-highspeed;
+                       max-frequency = <192000000>;
+                       no-1-8-v;
+                       vmmc-supply = <&vsdcc_fixed>;
+               };
 
-                       sdcc3: mmc@12180000 {
-                               compatible = "arm,pl18x", "arm,primecell";
-                               arm,primecell-periphid = <0x00051180>;
-                               status = "disabled";
-                               reg = <0x12180000 0x8000>;
-                               interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
-                               interrupt-names = "cmd_irq";
-                               clocks = <&gcc SDC3_CLK>, <&gcc SDC3_H_CLK>;
-                               clock-names = "mclk", "apb_pclk";
-                               bus-width = <4>;
-                               cap-sd-highspeed;
-                               cap-mmc-highspeed;
-                               max-frequency = <192000000>;
-                               no-1-8-v;
-                               vmmc-supply = <&vsdcc_fixed>;
-                       };
+               sdcc1: mmc@12400000 {
+                       status = "disabled";
+                       compatible = "arm,pl18x", "arm,primecell";
+                       arm,primecell-periphid = <0x00051180>;
+                       reg = <0x12400000 0x8000>;
+                       interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-names = "cmd_irq";
+                       clocks = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
+                       clock-names = "mclk", "apb_pclk";
+                       bus-width = <8>;
+                       max-frequency = <96000000>;
+                       non-removable;
+                       cap-sd-highspeed;
+                       cap-mmc-highspeed;
+                       vmmc-supply = <&vsdcc_fixed>;
                };
 
                tcsr: syscon@1a400000 {