[PATCH u-boot-marvell 6/9] arm: a37xx: Update sdhci pointers to official DT bindings

[Stefan Roese]

On 2/14/22 11:34, Pali Rohár wrote:
> In Linux kernel version of armada-37xx.dtsi file sdhci1 pointer refers to
> sdhci at d0000 node and sdhci0 pointer to sdhci at d8000 node.

Strange. Do you know why this "reverted naming" is used in the
Kernel?

> Signed-off-by: Pali Rohár <pali at kernel.org>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   arch/arm/dts/armada-3720-db.dts           | 4 ++--
>   arch/arm/dts/armada-3720-espressobin.dts  | 4 ++--
>   arch/arm/dts/armada-3720-turris-mox.dts   | 2 +-
>   arch/arm/dts/armada-3720-uDPU-u-boot.dtsi | 2 +-
>   arch/arm/dts/armada-3720-uDPU.dts         | 2 +-
>   arch/arm/dts/armada-37xx.dtsi             | 4 ++--
>   6 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm/dts/armada-3720-db.dts b/arch/arm/dts/armada-3720-db.dts
> index 42e7ddd25c55..6272d83fc011 100644
> --- 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 360d521bbada..f59f82d91632 100644
> --- 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 d01757062fa5..a5ccb558ccd6 100644
> --- 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 fdad90ad123f..cf8ae4412b97 100644
> --- 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 58557c680a4d..319fbe7348ad 100644
> --- 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 4c686c380cee..8ac481cb58f3 100644
> --- a/arch/arm/dts/armada-37xx.dtsi
> +++ b/arch/arm/dts/armada-37xx.dtsi
> @@ -251,7 +251,7 @@
>   				};
>   			};
>   
> -			sdhci0: sdhci at d0000 {
> +			sdhci1: sdhci at d0000 {
>   				compatible = "marvell,armada-3700-sdhci",
>   				"marvell,sdhci-xenon";
>   				reg = <0xd0000 0x300
> @@ -259,7 +259,7 @@
>   				status = "disabled";
>   			};
>   
> -			sdhci1: sdhci at d8000 {
> +			sdhci0: sdhci at d8000 {
>   				compatible = "marvell,armada-3700-sdhci",
>   				"marvell,sdhci-xenon";
>   				reg = <0xd8000 0x300

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de