aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/stih415-pinctrl.dtsi
diff options
context:
space:
mode:
authorGabriel FERNANDEZ <gabriel.fernandez@st.com>2014-04-11 11:07:00 -0400
committerMaxime Coquelin <maxime.coquelin@st.com>2014-05-21 08:27:06 -0400
commitc316d7d420ca6cad6b5b992b581122c6607553e4 (patch)
tree622c6e0c5556985a4869a23b0b7be15ff90b0023 /arch/arm/boot/dts/stih415-pinctrl.dtsi
parentd6c057f313cfe9484b46876dd13106ede6bc30e2 (diff)
ARM: STi: DT: add keyscan for stih415
Add keyscan support for stih415. It is put disabled by default because it is not enabled on all boards Also there are PIOs conflict with already claimed lines. Acked-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli@st.com> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org> Signed-off-by: Maxime Coquelin <maxime.coquelin@st.com>
Diffstat (limited to 'arch/arm/boot/dts/stih415-pinctrl.dtsi')
-rw-r--r--arch/arm/boot/dts/stih415-pinctrl.dtsi16
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/stih415-pinctrl.dtsi b/arch/arm/boot/dts/stih415-pinctrl.dtsi
index f09fb10a3791..caeac7e0c1f6 100644
--- a/arch/arm/boot/dts/stih415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih415-pinctrl.dtsi
@@ -102,6 +102,22 @@
102 }; 102 };
103 }; 103 };
104 104
105 keyscan {
106 pinctrl_keyscan: keyscan {
107 st,pins {
108 keyin0 = <&PIO0 2 ALT2 IN>;
109 keyin1 = <&PIO0 3 ALT2 IN>;
110 keyin2 = <&PIO0 4 ALT2 IN>;
111 keyin3 = <&PIO2 6 ALT2 IN>;
112
113 keyout0 = <&PIO1 6 ALT2 OUT>;
114 keyout1 = <&PIO1 7 ALT2 OUT>;
115 keyout2 = <&PIO0 6 ALT2 OUT>;
116 keyout3 = <&PIO2 7 ALT2 OUT>;
117 };
118 };
119 };
120
105 sbc_i2c0 { 121 sbc_i2c0 {
106 pinctrl_sbc_i2c0_default: sbc_i2c0-default { 122 pinctrl_sbc_i2c0_default: sbc_i2c0-default {
107 st,pins { 123 st,pins {