diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 20:02:30 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 20:02:30 +0400 |
| commit | 84bdd3a491aecd83781244a2f42d37625a9ed431 (patch) | |
| tree | 1bf5d29686f8eb59a7dc2f69ae8db8be3539c374 /arch | |
| parent | ea62edd850da4c0b277105877fa4adea5877b03e (diff) | |
| parent | 7a08cf77dbb976cec39c300201cebfee94552f54 (diff) | |
| download | linux-84bdd3a491aecd83781244a2f42d37625a9ed431.tar.xz | |
Merge tag 'pxa-fix-abi' of https://git.kernel.org/pub/scm/linux/kernel/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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/pxa2xx.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi index a5e90f078aa9..c08f84629aa9 100644 --- a/arch/arm/boot/dts/pxa2xx.dtsi +++ b/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"; |