From 2bf172cfddee1fc7012980edc97f62526f65281a Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Thu, 14 Aug 2014 11:46:12 +0200 Subject: [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 Signed-off-by: Haojian Zhuang --- arch/arm/boot/dts/pxa2xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index a5e90f078aa9..0e8dbff6145d 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -120,7 +120,7 @@ }; mmc0: mmc@41100000 { - compatible = "mrvl,pxa-mmc"; + compatible = "marvell,pxa-mmc"; reg = <0x41100000 0x1000>; interrupts = <23>; status = "disabled"; From 7a08cf77dbb976cec39c300201cebfee94552f54 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Thu, 14 Aug 2014 11:46:13 +0200 Subject: [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 Signed-off-by: Haojian Zhuang --- arch/arm/boot/dts/pxa2xx.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index 0e8dbff6145d..c08f84629aa9 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/arch/arm/boot/dts/pxa2xx.dtsi @@ -113,7 +113,7 @@ }; usb0: ohci@4c000000 { - compatible = "mrvl,pxa-ohci"; + compatible = "marvell,pxa-ohci"; reg = <0x4c000000 0x10000>; interrupts = <3>; status = "disabled";