Skip to contentSkip to conversation

ARM64: dts: allwinner: sun50i-h5-orangepi-zero-plus2: rename mmc0_pins_a to mmc0_pins

PATCH In review Corentin Labbe 2 participants 2 messages Feb 14, 2018 – Feb 15, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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")
---
 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +1 -1
index feee125a4e9a..87c1a0dace5f 100644
@@ -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>;
Signature · 1 line
2.13.6
#1 lore raw
Quoted 14 lines · Corentin Labbe

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")
---
 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +0 -0
index feee125a4e9a..87c1a0dace5f 100644

arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts line 85

Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts +1 -1
@@ -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

Signature · 10 lines
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20180215/8c2094fd/attachment-0001.sig>