Merge tag 'pxa-fix-abi' of https://git.kernel.org/pub/scm/linux/kerne…

…l/git/hzhuang1/linux into next/dt

Pull "pxa2xx DT changes" from Haojian Zhuang:

Since DT aren't fully enabled in pxa2xx, it's fine to merge them in v3.18

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

* tag 'pxa-fix-abi' of https://git.kernel.org/pub/scm/linux/kernel/git/hzhuang1/linux:
  ARM: pxa: dts: fix ohci controller compatible string
  ARM: pxa: dts: fix mmc controller compatible string

arch/arm/boot/dts/pxa2xx.dtsi

@@ -113,14 +113,14 @@
 		};
 
 		usb0: ohci@4c000000 {
-			compatible = "mrvl,pxa-ohci";
+			compatible = "marvell,pxa-ohci";
 			reg = <0x4c000000 0x10000>;
 			interrupts = <3>;
 			status = "disabled";
 		};
 
 		mmc0: mmc@41100000 {
-			compatible = "mrvl,pxa-mmc";
+			compatible = "marvell,pxa-mmc";
 			reg = <0x41100000 0x1000>;
 			interrupts = <23>;
 			status = "disabled";