2018-02-14 08:56:36

by Corentin LABBE

[permalink] [raw]

Subject: [PATCH] ARM64: dts: allwinner: sun50i-h5-orangepi-zero-plus2: rename mmc0_pins_a to mmc0_pins

---

mmc0_pins_a were renamed in arch/arm but not in arch/arm64 resulting in
a build failure.

Fixes: 813f2c8fa119 ("ARM: dts: sunxi: h3-h5: rename mmc0_pins_a and mmc1_pins_a")
Signed-off-by: Corentin Labbe <[email protected]>
---
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
index feee125a4e9a..87c1a0dace5f 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
@@ -82,7 +82,7 @@

&mmc1 {
pinctrl-names = "default";
- pinctrl-0 = <&mmc1_pins_a>;
+ pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_vcc3v3>;
vqmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&wifi_pwrseq>;
--
2.13.6

2018-02-15 08:22:35

by Maxime Ripard

[permalink] [raw]

Subject: Re: [PATCH] ARM64: dts: allwinner: sun50i-h5-orangepi-zero-plus2: rename mmc0_pins_a to mmc0_pins

---

On Wed, Feb 14, 2018 at 08:54:47AM +0000, Corentin Labbe wrote:
> mmc0_pins_a were renamed in arch/arm but not in arch/arm64 resulting in
> a build failure.
>
> Fixes: 813f2c8fa119 ("ARM: dts: sunxi: h3-h5: rename mmc0_pins_a and mmc1_pins_a")
> Signed-off-by: Corentin Labbe <[email protected]>
> ---
> arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
> index feee125a4e9a..87c1a0dace5f 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
> @@ -82,7 +82,7 @@
>
> &mmc1 {
> pinctrl-names = "default";
> - pinctrl-0 = <&mmc1_pins_a>;
> + pinctrl-0 = <&mmc1_pins>;

The actual issue was that the commit 4db86a4b103e ("ARM: dts: sunxi:
h3-h5: Move pinctrl of mmc1 from dts to dtsi") didn't remove the node
in that DTS.

I've amended it.

Thanks!
Maxime

--
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com

---

Attachments:

(No filename) (1.19 kB)
signature.asc (849.00 B)
Download all attachments