From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gabriel FERNANDEZ Subject: [PATCH v2 2/5] ARM: STi: DT: add keyscan for stih415 Date: Tue, 18 Mar 2014 16:00:03 +0100 Message-ID: <1395154806-2810-3-git-send-email-gabriel.fernandez@st.com> References: <1395154806-2810-1-git-send-email-gabriel.fernandez@st.com> Return-path: In-Reply-To: <1395154806-2810-1-git-send-email-gabriel.fernandez@st.com> Sender: linux-kernel-owner@vger.kernel.org To: Dmitry Torokhov , Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Rob Landley , Russell King , Grant Likely Cc: devicetree@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org, kernel@stlinux.com, Lee Jones , Giuseppe CONDORELLI , Gabriel Fernandez List-Id: devicetree@vger.kernel.org From: Giuseppe CONDORELLI 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 Signed-off-by: Gabriel Fernandez --- 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..3e5e074 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..bda9e23 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,sti-keyscan"; + status = "disabled"; + reg = <0xfe4b0000 0x2000>; + interrupts = ; + clocks = <&CLK_SYSIN>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_keyscan>; + }; }; }; -- 1.9.0