diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-13 16:49:26 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-13 16:49:41 -0700 |
| commit | 38494429f383c8c0bda1d462f6be3d54f1dc1fed (patch) | |
| tree | 725821f7d734beb2baa42006e391f876d5a2c87a | |
| parent | 19dab4ce09df0f11debc57a20a57e176adf9f31f (diff) | |
| parent | 93c5a5b179dfd79438c0744fc02af0abf11edbb9 (diff) | |
Merge branch 'pxa/dt' into next/dt
From: Haojian Zhuang <haojian.zhuang@gmail.com>:
* pxa/dt:
ARM: pxa: DTS: override gpio node in pxa3xx.dtsi
ARM: pxa: fix DT auxdata for pxa3xx-gpio
Signed-off-by: Kevin Hilman <khilman@linaro.org>
| -rw-r--r-- | arch/arm/boot/dts/pxa3xx.dtsi | 11 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/pxa-dt.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index f9d92da8678..83bb0eff697 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -28,5 +28,16 @@ marvell,intc-priority; marvell,intc-nr-irqs = <56>; }; + + gpio: gpio@40e00000 { + compatible = "intel,pxa3xx-gpio"; + reg = <0x40e00000 0x10000>; + interrupt-names = "gpio0", "gpio1", "gpio_mux"; + interrupts = <8 9 10>; + gpio-controller; + #gpio-cells = <0x2>; + interrupt-controller; + #interrupt-cells = <0x2>; + }; }; }; diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c index 3835979a0dd..f6a2c4b1c1d 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), |