OSDN Git Service

ARM: STi: DT: add keyscan for stih415
authorGabriel FERNANDEZ <gabriel.fernandez@st.com>
Fri, 11 Apr 2014 15:07:00 +0000 (17:07 +0200)
committerMaxime Coquelin <maxime.coquelin@st.com>
Wed, 21 May 2014 12:27:06 +0000 (14:27 +0200)
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>
arch/arm/boot/dts/stih415-pinctrl.dtsi
arch/arm/boot/dts/stih415.dtsi

index f09fb10..caeac7e 100644 (file)
                                };
                        };
 
+                       keyscan {
+                               pinctrl_keyscan: keyscan {
+                                       st,pins {
+                                               keyin0 = <&PIO0 2 ALT2 IN>;
+                                               keyin1 = <&PIO0 3 ALT2 IN>;
+                                               keyin2 = <&PIO0 4 ALT2 IN>;
+                                               keyin3 = <&PIO2 6 ALT2 IN>;
+
+                                               keyout0 = <&PIO1 6 ALT2 OUT>;
+                                               keyout1 = <&PIO1 7 ALT2 OUT>;
+                                               keyout2 = <&PIO0 6 ALT2 OUT>;
+                                               keyout3 = <&PIO2 7 ALT2 OUT>;
+                                       };
+                               };
+                       };
+
                        sbc_i2c0 {
                                pinctrl_sbc_i2c0_default: sbc_i2c0-default {
                                        st,pins {
index d89064c..ba0905c 100644 (file)
                        pinctrl-0       = <&pinctrl_ir>;
                        resets          = <&softreset STIH415_IRB_SOFTRESET>;
                };
+
+               keyscan: keyscan@fe4b0000 {
+                       compatible = "st,sti-keyscan";
+                       status = "disabled";
+                       reg = <0xfe4b0000 0x2000>;
+                       interrupts = <GIC_SPI 212 IRQ_TYPE_NONE>;
+                       clocks = <&CLK_SYSIN>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_keyscan>;
+                       resets  = <&powerdown STIH415_KEYSCAN_POWERDOWN>,
+                                 <&softreset STIH415_KEYSCAN_SOFTRESET>;
+               };
        };
 };