forked from Minki/linux
Since DT aren't fully enabled in pxa2xx, it's fine to merge them in v3.18
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJUGxqOAAoJELXbXY/c+iv2UBIP/2Sh/qtZw3Z5dFNrtCz0VbLE v5wVhy03txuEqmHw5n0jE4TgQ3+ULUkDa6dIPEvNDRbp04riyd5Xacv2xAOifk8u 1/GhxWhhDr8MsVptwUJO9VYUcXBpIkOWBEh+vMjfeyBuZTt1Bk+eHubBmYCb/IT8 s+5rVcQPzTYJXQMMfntpzKX2xxIAzwHbsc7xC1VmnLazUs7kM3D18ra8m4ced1Mr oEGwJ8JCJXMm4UvUJ6eZekS5TscPIu5yjLmzu13nJwp1BsjoeIMIOsMCdl/MAPLL Ab4pqXubgDHzxGlV3k02o7XftCQGBdy3xjP320QdY0FTfSrtdi4ey6V7f4kV+6Gs JnJrdOj1pukfaFHiTWUt28w7vNBvfnwd65c0i5ZzefvOlUYl8IN8Mw/DTl3TxtGX XyxNXs6gdTH5eV0CVP5i8KaMXzwdmD2Pb0bTHpXmtT9i4J9AtLZHNYa7zl/E0R8a bWywK/gA8FZoykhzoY68jDCgy/ecbxu2D6Lo3IOYLaigT/vQtu75CKBUMCwT5FPD Zmqj8T0SKLcYuvfLLO2CJIzqvurakLJPw2ylbEqPa+HdhmTc8AUi3DjDD6sVXgUt pyeoHhq9erwU1/RDmIKH86OG3cRjLL1Xaat9nzMcZUcPpn9gvn5MlgcVPFOIwQ80 rWKlJ0H/Z5Mp2gr1LMpV =v60b -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
84bdd3a491
@ -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";
|
||||
|
Loading…
Reference in New Issue
Block a user