Skip to contentSkip to conversation

ARM: dts: rockchip: fix MMC compatibles for rk3288

PATCH In review John Keeping 2 participants 3 messages Jan 25, 2022 – Jan 26, 2022

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

PATCH 1/1 ARM: dts: rockchip: fix MMC compatibles for rk3288

Prior to commit 4bac670aa5cb ("mmc: dw_mmc: rockchip: use common_caps") the mshcN aliases were used in an unusual way by the dw_mmc driver and affected behaviour. Now that this has been fixed, rename the mmc aliases to use the standard form.

---
 arch/arm/boot/dts/rk3288.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +4 -4
index aaaa61875701..50fa0a4652b5 100644
@@ -25,10 +25,10 @@ aliases {
 		i2c3 = &i2c3;
 		i2c4 = &i2c4;
 		i2c5 = &i2c5;
-		mshc0 = &emmc;
-		mshc1 = &sdmmc;
-		mshc2 = &sdio0;
-		mshc3 = &sdio1;
+		mmc0 = &emmc;
+		mmc1 = &sdmmc;
+		mmc2 = &sdio0;
+		mmc3 = &sdio1;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
Signature · 7 lines
2.35.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#1 lore raw

Hi John,

MMC aliases should go in the dts board files.
Sort on reg address, based on availability and without number gab. (For rk3288 a lot of boards to change. That's why it wasn't done yet...Could someone pick that up?)

Johan

Quoted 19 lines · John Keeping

Prior to commit 4bac670aa5cb ("mmc: dw_mmc: rockchip: use common_caps") the mshcN aliases were used in an unusual way by the dw_mmc driver and affected behaviour. Now that this has been fixed, rename the mmc aliases to use the standard form.

---
 arch/arm/boot/dts/rk3288.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +0 -1
index aaaa61875701..50fa0a4652b5 100644
@@ -25,10 +25,10 @@ aliases {
 		i2c3 = &i2c3;
 		i2c4 = &i2c4;
 		i2c5 = &i2c5;
-		mshc0 = &emmc;

arch/arm/boot/dts/rk3288.dtsi aliases { · line 34

Quoted 10 lines
arch/arm/boot/dts/rk3288.dtsi +4 -3
-		mshc1 = &sdmmc;
-		mshc2 = &sdio0;
-		mshc3 = &sdio1;
+		mmc0 = &emmc;
+		mmc1 = &sdmmc;
+		mmc2 = &sdio0;
+		mmc3 = &sdio1;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#2 lore raw

Hi Johan,

Quoted 4 lines · Johan Jonker

MMC aliases should go in the dts board files.
Sort on reg address, based on availability and without number gab. (For rk3288 a lot of boards to change. That's why it wasn't done yet...Could someone pick that up?)

Since there aren't any mmc aliases for rk3288 at the moment, I'll drop this and send a patch adding them for the one board I have access to.

At some point the nonstandard mshc aliases should be removed, but it may be best to keep them around for a while given that 5.17 will be the first kernel that doesn't use these as a weird mechanism for per-port settings.

Quoted 30 lines · John Keeping
Quoted 29 lines

Prior to commit 4bac670aa5cb ("mmc: dw_mmc: rockchip: use common_caps") the mshcN aliases were used in an unusual way by the dw_mmc driver and affected behaviour. Now that this has been fixed, rename the mmc aliases to use the standard form.

---
 arch/arm/boot/dts/rk3288.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/rk3288.dtsi +4 -4
index aaaa61875701..50fa0a4652b5 100644
@@ -25,10 +25,10 @@ aliases {
 		i2c3 = &i2c3;
 		i2c4 = &i2c4;
 		i2c5 = &i2c5;
-		mshc0 = &emmc;
-		mshc1 = &sdmmc;
-		mshc2 = &sdio0;
-		mshc3 = &sdio1;
+		mmc0 = &emmc;
+		mmc1 = &sdmmc;
+		mmc2 = &sdio0;
+		mmc3 = &sdio1;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;