From 649a59cf9be6dc923b660a65c778900a59d40815 Mon Sep 17 00:00:00 2001 From: Tony Prisk Date: Wed, 20 Feb 2013 09:52:23 +1300 Subject: arm: dts: vt8500: Update Wondermedia SoC dtsi files for pinctrl driver This patch adds pinctrl nodes to the VIA VT8500 and Wondermedia SoC dtsi files to support the pinctrl driver. Signed-off-by: Tony Prisk Acked-by: Linus Walleij --- arch/arm/boot/dts/wm8850.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'arch/arm/boot/dts/wm8850.dtsi') diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi index e8cbfdc87bba..297aa05800da 100644 --- a/arch/arm/boot/dts/wm8850.dtsi +++ b/arch/arm/boot/dts/wm8850.dtsi @@ -48,6 +48,15 @@ #gpio-cells = <3>; }; + pinctrl: pinctrl@d8110000 { + compatible = "wm,wm8850-pinctrl"; + reg = <0xd8110000 0x10000>; + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + }; + pmc@d8130000 { compatible = "via,vt8500-pmc"; reg = <0xd8130000 0x1000>; -- cgit v1.2.3 From eaa2badadfbe2b26a1f8ef4aebaa8e1d1951c721 Mon Sep 17 00:00:00 2001 From: Tony Prisk Date: Wed, 20 Feb 2013 17:28:56 +1300 Subject: arm: vt8500: Remove gpio devicetree nodes Remove the gpio related devicetree nodes as these are no longer required with the move to a combined pinctrl/gpio driver. Signed-off-by: Tony Prisk Acked-by: Linus Walleij --- arch/arm/boot/dts/wm8850.dtsi | 7 ------- 1 file changed, 7 deletions(-) (limited to 'arch/arm/boot/dts/wm8850.dtsi') diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi index 297aa05800da..11cd180c58d3 100644 --- a/arch/arm/boot/dts/wm8850.dtsi +++ b/arch/arm/boot/dts/wm8850.dtsi @@ -41,13 +41,6 @@ interrupts = <56 57 58 59 60 61 62 63>; }; - gpio: gpio-controller@d8110000 { - compatible = "wm,wm8650-gpio"; - gpio-controller; - reg = <0xd8110000 0x10000>; - #gpio-cells = <3>; - }; - pinctrl: pinctrl@d8110000 { compatible = "wm,wm8850-pinctrl"; reg = <0xd8110000 0x10000>; -- cgit v1.2.3