Skip to contentSkip to conversation

ARM: pxa: dts: fix mmc controller compatible string

PATCH New Daniel Mack 4 participants 5 messages Aug 14, 2014 – Sep 6, 2014 Device tree bindings

lore
Share & tools
lore

Daniel Mack

author
#0 lore raw

PATCH 1/2 ARM: pxa: dts: fix mmc controller compatible string

The vendor prefix was renamed from "mrvl" to "marvell". Follow this change in the dts file.

Signed-off-by Daniel Mack <[email protected]>
---
 arch/arm/boot/dts/pxa2xx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/pxa2xx.dtsi +1 -1
index febd391..f188f8c 100644
@@ -128,7 +128,7 @@
 		};
 
 		mmc0: mmc at 41100000 {
-			compatible = "mrvl,pxa-mmc";
+			compatible = "marvell,pxa-mmc";
 			reg = <0x41100000 0x1000>;
 			interrupts = <23>;
 			dmas = <&dma 21
Signature · 1 line
2.0.4
author
#1 lore raw

PATCH 2/2 ARM: pxa: dts: fix ohci controller compatible string

The vendor prefix was renamed from "mrvl" to "marvell". Follow this change in the dts file.

Signed-off-by Daniel Mack <[email protected]>
---
 arch/arm/boot/dts/pxa2xx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/pxa2xx.dtsi +1 -1
index f188f8c..6d52a72 100644
@@ -121,7 +121,7 @@
 		};
 
 		usb0: ohci at 4c000000 {
-			compatible = "mrvl,pxa-ohci";
+			compatible = "marvell,pxa-ohci";
 			reg = <0x4c000000 0x10000>;
 			interrupts = <3>;
 			status = "disabled";
Signature · 1 line
2.0.4
#2 lore raw

PATCH 1/2 ARM: pxa: dts: fix mmc controller compatible string

In reply to Daniel Mack
Quoted 22 lines · Daniel Mack

The vendor prefix was renamed from "mrvl" to "marvell". Follow this change in the dts file.

Signed-off-by Daniel Mack <[email protected]>
---
 arch/arm/boot/dts/pxa2xx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/pxa2xx.dtsi +1 -2
index febd391..f188f8c 100644
@@ -128,7 +128,7 @@
                };
 
                mmc0: mmc at 41100000 {
-                       compatible = "mrvl,pxa-mmc";
+                       compatible = "marvell,pxa-mmc";
                        reg = <0x41100000 0x1000>;
                        interrupts = <23>;
                        dmas = <&dma 21
--
Quoted 2 lines

2.0.4

Applied these 2 patches.

Regards
Haojian

#3 lore raw

PATCH 1/2 ARM: pxa: dts: fix mmc controller compatible string

In reply to Daniel Mack
Quoted 13 lines · Daniel Mack

The vendor prefix was renamed from "mrvl" to "marvell". Follow this change in the dts file.

Signed-off-by Daniel Mack <[email protected]>
---
 arch/arm/boot/dts/pxa2xx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/pxa2xx.dtsi +0 -0
index febd391..f188f8c 100644

arch/arm/boot/dts/pxa2xx.dtsi line 131

Quoted 5 lines
arch/arm/boot/dts/pxa2xx.dtsi +1 -1
@@ -128,7 +128,7 @@
                };
 
                mmc0: mmc at 41100000 {
-                       compatible = "mrvl,pxa-mmc";
+                       compatible = "marvell,pxa-mmc";

It seems that the driver was changed without consideration to backwards compatibility. The driver should still handle both the old and the new prefix (since we keep this a stable ABI). The old one should be deprecated but still accepted.

I.e. this is an OK change, but it's fine to hold off as a cleanup until 3.18. The driver has a regression though, that needs to be fixed for 3.17.

-Olof

#4 lore raw

PATCH 1/2 ARM: pxa: dts: fix mmc controller compatible string

Hi Olof,

Sorry for the late reply.

Quoted 25 lines · Olof Johansson
Quoted 13 lines · Daniel Mack

The vendor prefix was renamed from "mrvl" to "marvell". Follow this change in the dts file.

Signed-off-by Daniel Mack <[email protected]>
---
 arch/arm/boot/dts/pxa2xx.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/pxa2xx.dtsi +0 -0
index febd391..f188f8c 100644

arch/arm/boot/dts/pxa2xx.dtsi line 131

Quoted 5 lines
arch/arm/boot/dts/pxa2xx.dtsi +1 -1
@@ -128,7 +128,7 @@
                };
 
                mmc0: mmc at 41100000 {
-                       compatible = "mrvl,pxa-mmc";
+                       compatible = "marvell,pxa-mmc";

It seems that the driver was changed without consideration to backwards compatibility. The driver should still handle both the old and the new prefix (since we keep this a stable ABI). The old one should be deprecated but still accepted.

Quoted 3 lines

I.e. this is an OK change, but it's fine to hold off as a cleanup until 3.18. The driver has a regression though, that needs to be fixed for 3.17.

Hmm, no. The driver never actuall supported that string. It was my bad when I submitted the original version of pxa2xx.dtsi. Still, given that it went unnoticed for so long, it can well wait for 3.18.

Thanks,
Daniel