summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/pxa-dt.c
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2013-07-11 19:17:56 +0400
committerKevin Hilman <khilman@linaro.org>2013-08-14 02:51:01 +0400
commit47288e0411bac539601a0837170f7cd83c194011 (patch)
treebd2c99ae5a91072918b77af44b8d315e8160db88 /arch/arm/mach-pxa/pxa-dt.c
parentad81f0545ef01ea651886dddac4bef6cec930092 (diff)
downloadlinux-47288e0411bac539601a0837170f7cd83c194011.tar.xz
ARM: pxa: fix DT auxdata for pxa3xx-gpio
Commit f87311743 ("ARM: mmp: add more compatible names in gpio driver") changed the DT match string for pxa3xx-gpio, but left the auxdata table unchanged. Signed-off-by: Daniel Mack <zonque@gmail.com> Cc: Haojian Zhuang <haojian.zhuang@linaro.org> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-pxa/pxa-dt.c')
-rw-r--r--arch/arm/mach-pxa/pxa-dt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c
index 3835979a0dd3..f6a2c4b1c1dc 100644
--- a/arch/arm/mach-pxa/pxa-dt.c
+++ b/arch/arm/mach-pxa/pxa-dt.c
@@ -28,7 +28,7 @@ static const struct of_dev_auxdata pxa3xx_auxdata_lookup[] __initconst = {
OF_DEV_AUXDATA("mrvl,pxa-uart", 0x40700000, "pxa2xx-uart.2", NULL),
OF_DEV_AUXDATA("mrvl,pxa-uart", 0x41600000, "pxa2xx-uart.3", NULL),
OF_DEV_AUXDATA("marvell,pxa-mmc", 0x41100000, "pxa2xx-mci.0", NULL),
- OF_DEV_AUXDATA("mrvl,pxa-gpio", 0x40e00000, "pxa-gpio", NULL),
+ OF_DEV_AUXDATA("intel,pxa3xx-gpio", 0x40e00000, "pxa3xx-gpio", NULL),
OF_DEV_AUXDATA("marvell,pxa-ohci", 0x4c000000, "pxa27x-ohci", NULL),
OF_DEV_AUXDATA("mrvl,pxa-i2c", 0x40301680, "pxa2xx-i2c.0", NULL),
OF_DEV_AUXDATA("mrvl,pwri2c", 0x40f500c0, "pxa3xx-i2c.1", NULL),