From: Giuseppe CONDORELLI <giuseppe.condore...@st.com>

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.

Signed-off-by: Giuseppe Condorelli <giuseppe.condore...@st.com>
Signed-off-by: Gabriel Fernandez <gabriel.fernan...@st.com>
---
 arch/arm/boot/dts/stih415-pinctrl.dtsi | 16 ++++++++++++++++
 arch/arm/boot/dts/stih415.dtsi         | 10 ++++++++++
 2 files changed, 26 insertions(+)

diff --git a/arch/arm/boot/dts/stih415-pinctrl.dtsi 
b/arch/arm/boot/dts/stih415-pinctrl.dtsi
index e56449d..731e4b1 100644
--- a/arch/arm/boot/dts/stih415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih415-pinctrl.dtsi
@@ -87,6 +87,22 @@
                                };
                        };
 
+                       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 {
diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
index d9c7dd1..5930467 100644
--- a/arch/arm/boot/dts/stih415.dtsi
+++ b/arch/arm/boot/dts/stih415.dtsi
@@ -136,5 +136,15 @@
 
                        status          = "disabled";
                };
+
+               keyscan: keyscan@fe4b0000 {
+                       compatible = "st,keypad";
+                       status = "disabled";
+                       reg = <0xfe4b0000 0x2000>;
+                       interrupts = <GIC_SPI 212 IRQ_TYPE_NONE>;
+                       clocks  = <&CLK_SYSIN>;
+                       pinctrl-names   = "default";
+                       pinctrl-0 = <&pinctrl_keyscan>;
+               };
        };
 };
-- 
1.9.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to