arm: a37xx: Update sdhci pointers to official DT bindings

In Linux kernel version of armada-37xx.dtsi file sdhci1 pointer refers to
sdhci@d0000 node and sdhci0 pointer to sdhci@d8000 node.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts
index 42e7ddd..6272d83 100644 (file)
--- a/arch/arm/dts/armada-3720-db.dts
+++ b/arch/arm/dts/armada-3720-db.dts
@@ -98,14 +98,14 @@
        status = "okay";
 };
 
-&sdhci0 {
+&sdhci1 {
        bus-width = <4>;
        pinctrl-names = "default";
        pinctrl-0 = <&sdio_pins>;
        status = "okay";
 };
 
-&sdhci1 {
+&sdhci0 {
        non-removable;
        bus-width = <8>;
        mmc-ddr-1_8v;

diff --git a/arch/arm/dts/armada-3720-espressobin.dts b/arch/arm/dts/armada-3720-espressobin.dts
index 360d521..f59f82d 100644 (file)
--- a/arch/arm/dts/armada-3720-espressobin.dts
+++ b/arch/arm/dts/armada-3720-espressobin.dts
@@ -104,7 +104,7 @@
        phys = <&comphy2 0>;
 };
 
-&sdhci0 {
+&sdhci1 {
        pinctrl-names = "default";
        pinctrl-0 = <&sdio_pins>;
        bus-width = <4>;
@@ -114,7 +114,7 @@
 };
 
 /* U11 */
-&sdhci1 {
+&sdhci0 {
        non-removable;
        bus-width = <8>;
        mmc-ddr-1_8v;

diff --git a/arch/arm/dts/armada-3720-turris-mox.dts b/arch/arm/dts/armada-3720-turris-mox.dts
index d017570..a5ccb55 100644 (file)
--- a/arch/arm/dts/armada-3720-turris-mox.dts
+++ b/arch/arm/dts/armada-3720-turris-mox.dts
@@ -120,7 +120,7 @@
        };
 };
 
-&sdhci1 {
+&sdhci0 {
        wp-inverted;
        bus-width = <4>;
        cd-gpios = <&gpionb 10 GPIO_ACTIVE_HIGH>;

diff --git a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi
index fdad90a..cf8ae44 100644 (file)
--- a/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi
+++ b/arch/arm/dts/armada-3720-uDPU-u-boot.dtsi
@@ -28,6 +28,6 @@
        };
 };
 
-&sdhci1 {
+&sdhci0 {
        u-boot,dm-pre-reloc;
 };

diff --git a/arch/arm/dts/armada-3720-uDPU.dts b/arch/arm/dts/armada-3720-uDPU.dts
index 58557c6..319fbe7 100644 (file)
--- a/arch/arm/dts/armada-3720-uDPU.dts
+++ b/arch/arm/dts/armada-3720-uDPU.dts
@@ -151,7 +151,7 @@
        };
 };
 
-&sdhci1 {
+&sdhci0 {
        non-removable;
        mmc-ddr-1_8v;
        mmc-hs200-1_8v;

diff --git a/arch/arm/dts/armada-37xx.dtsi b/arch/arm/dts/armada-37xx.dtsi
index 4c686c3..8ac481c 100644 (file)
--- a/arch/arm/dts/armada-37xx.dtsi
+++ b/arch/arm/dts/armada-37xx.dtsi
@@ -251,7 +251,7 @@
                                };
                        };
 
-                       sdhci0: sdhci@d0000 {
+                       sdhci1: sdhci@d0000 {
                                compatible = "marvell,armada-3700-sdhci",
                                "marvell,sdhci-xenon";
                                reg = <0xd0000 0x300
@@ -259,7 +259,7 @@
                                status = "disabled";
                        };
 
-                       sdhci1: sdhci@d8000 {
+                       sdhci0: sdhci@d8000 {
                                compatible = "marvell,armada-3700-sdhci",
                                "marvell,sdhci-xenon";
                                reg = <0xd8000 0x300