diff mbox

[5/5] ARM: pxa: DTS: override gpio node in pxa3xx.dtsi

Message ID 1373555877-29887-6-git-send-email-zonque@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Mack July 11, 2013, 3:17 p.m. UTC 
The gpio controller node inherited from pxa2xx.dtsi won't work for
pxa3xx SoCs, so let's override it in pxa3xx.dtsi.

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>
---
 arch/arm/boot/dts/pxa3xx.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

Comments

Haojian Zhuang Aug. 11, 2013, 9:51 a.m. UTC | #1 
On 11 July 2013 23:17, Daniel Mack <zonque@gmail.com> wrote:
> The gpio controller node inherited from pxa2xx.dtsi won't work for
> pxa3xx SoCs, so let's override it in pxa3xx.dtsi.
>
> 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>
> ---
>  arch/arm/boot/dts/pxa3xx.dtsi | 11 +++++++++++
>  1 file changed, 11 insertions(+)
>
> diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
> index f9d92da..83bb0ef 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>;
> +               };
>         };
>  };
> --
> 1.8.1.4
>

Applied.

Regards
Haojian
diff mbox

Patch

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index f9d92da..83bb0ef 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>;
+		};
 	};
 };