summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-11-13 14:57:49 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-11-26 21:01:55 +0100
commita45cb698a7db6c623214a5345a32a4ce724ca560 (patch)
tree485d1483615c20fc2fac5c579bbeae8cd29c760c /arch/arm/boot/dts/ste-href-tvk1281618.dtsi
parentARM: ux500: move MSP pin control to the device tree (diff)
downloadlinux-a45cb698a7db6c623214a5345a32a4ce724ca560.tar.xz
linux-a45cb698a7db6c623214a5345a32a4ce724ca560.zip
ARM: ux500: move GPIO217/218 config to device tree
This moves the input-pulled-up setting for GPIO217 as used on the HREFs prior to v60 from the boardfile to the device tree. GPIO218 is only used with the TVK UIB so move it to that .dtsi file. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-href-tvk1281618.dtsi')
-rw-r--r--arch/arm/boot/dts/ste-href-tvk1281618.dtsi13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
index 61b180ea92ca..3f31f9206fb3 100644
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -22,6 +22,8 @@
reg = <0x44>;
interrupt-parent = <&gpio6>;
interrupts = <26 IRQ_TYPE_EDGE_RISING>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&tc35893_tvk_mode>;
interrupt-controller;
#interrupt-cells = <1>;
@@ -64,5 +66,16 @@
};
};
};
+ pinctrl {
+ /* Pull up this GPIO pin */
+ tc35893 {
+ tc35893_tvk_mode: tc35893_tvk {
+ tvk_cfg {
+ ste,pins = "GPIO218_AH11";
+ ste,config = <&gpio_in_pu>;
+ };
+ };
+ };
+ };
};
};