From: Gabriel FERNANDEZ <gabriel.fernandez@st.com> To: Dmitry Torokhov <dmitry.torokhov@gmail.com>, Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>, Mark Rutland <mark.rutland@arm.com>, Ian Campbell <ijc+devicetree@hellion.org.uk>, Kumar Gala <galak@codeaurora.org>, Rob Landley <rob@landley.net>, Russell King <linux@arm.linux.org.uk>, Grant Likely <grant.likely@linaro.org> 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 <lee.jones@linaro.org>, Giuseppe CONDORELLI <giuseppe.condorelli@st.com>, Gabriel Fernandez <gabriel.fernandez@st.com> Subject: [PATCH 2/5] ARM: STi: DT: add keyscan for stih415 Date: Wed, 5 Mar 2014 04:39:29 +0100 [thread overview] Message-ID: <1393990772-9567-3-git-send-email-gabriel.fernandez@st.com> (raw) In-Reply-To: <1393990772-9567-1-git-send-email-gabriel.fernandez@st.com> From: Giuseppe CONDORELLI <giuseppe.condorelli@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.condorelli@st.com> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@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
WARNING: multiple messages have this Message-ID (diff)
From: gabriel.fernandez@st.com (Gabriel FERNANDEZ) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/5] ARM: STi: DT: add keyscan for stih415 Date: Wed, 5 Mar 2014 04:39:29 +0100 [thread overview] Message-ID: <1393990772-9567-3-git-send-email-gabriel.fernandez@st.com> (raw) In-Reply-To: <1393990772-9567-1-git-send-email-gabriel.fernandez@st.com> From: Giuseppe CONDORELLI <giuseppe.condorelli@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.condorelli@st.com> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@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 at 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
next prev parent reply other threads:[~2014-03-05 3:42 UTC|newest] Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-03-05 3:39 [PATCH 0/5] Add ST Keyscan driver Gabriel FERNANDEZ 2014-03-05 3:39 ` Gabriel FERNANDEZ 2014-03-05 3:39 ` [PATCH 1/5] drivers: input: keyboard: st-keyscan: add keyscan driver Gabriel FERNANDEZ 2014-03-05 3:39 ` Gabriel FERNANDEZ 2014-03-05 3:39 ` Gabriel FERNANDEZ 2014-03-05 6:46 ` Dmitry Torokhov 2014-03-05 6:46 ` Dmitry Torokhov 2014-03-07 4:51 ` Gabriel Fernandez 2014-03-10 11:48 ` Lee Jones 2014-03-10 11:48 ` Lee Jones 2014-03-10 15:28 ` Dmitry Torokhov 2014-03-10 15:28 ` Dmitry Torokhov 2014-03-10 15:38 ` Lee Jones 2014-03-10 15:38 ` Lee Jones 2014-03-10 15:58 ` Dmitry Torokhov 2014-03-10 15:58 ` Dmitry Torokhov 2014-03-10 16:35 ` Lee Jones 2014-03-10 16:35 ` Lee Jones 2014-03-10 16:35 ` Lee Jones 2014-03-14 10:13 ` Gabriel Fernandez 2014-03-14 10:13 ` Gabriel Fernandez 2014-03-14 10:13 ` Gabriel Fernandez 2014-03-14 10:42 ` Lee Jones 2014-03-14 10:42 ` Lee Jones 2014-03-14 10:42 ` Lee Jones 2014-03-18 10:25 ` Gabriel Fernandez 2014-03-18 10:25 ` Gabriel Fernandez 2014-03-18 10:25 ` Gabriel Fernandez 2014-03-18 11:01 ` Lee Jones 2014-03-18 11:01 ` Lee Jones 2014-03-14 15:26 ` Dmitry Torokhov 2014-03-14 15:26 ` Dmitry Torokhov 2014-03-05 3:39 ` Gabriel FERNANDEZ [this message] 2014-03-05 3:39 ` [PATCH 2/5] ARM: STi: DT: add keyscan for stih415 Gabriel FERNANDEZ 2014-03-10 11:50 ` Lee Jones 2014-03-10 11:50 ` Lee Jones 2014-03-10 11:50 ` Lee Jones 2014-03-05 3:39 ` [PATCH 3/5] ARM: STi: DT: add keyscan for stih416 Gabriel FERNANDEZ 2014-03-05 3:39 ` Gabriel FERNANDEZ 2014-03-10 11:52 ` Lee Jones 2014-03-10 11:52 ` Lee Jones 2014-03-10 11:52 ` Lee Jones 2014-03-05 3:39 ` [PATCH 4/5] ARM: STi: DT: add keyscan for stih41x-b2000 Gabriel FERNANDEZ 2014-03-05 3:39 ` Gabriel FERNANDEZ 2014-03-10 11:54 ` Lee Jones 2014-03-10 11:54 ` Lee Jones 2014-03-10 11:54 ` Lee Jones 2014-03-05 3:39 ` [PATCH 5/5] ARM: multi_v7_defconfig: add st-keyscan driver Gabriel FERNANDEZ 2014-03-05 3:39 ` Gabriel FERNANDEZ 2014-03-10 10:34 ` Lee Jones 2014-03-10 10:34 ` Lee Jones
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1393990772-9567-3-git-send-email-gabriel.fernandez@st.com \ --to=gabriel.fernandez@st.com \ --cc=devicetree@vger.kernel.org \ --cc=dmitry.torokhov@gmail.com \ --cc=galak@codeaurora.org \ --cc=giuseppe.condorelli@st.com \ --cc=grant.likely@linaro.org \ --cc=ijc+devicetree@hellion.org.uk \ --cc=kernel@stlinux.com \ --cc=lee.jones@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-doc@vger.kernel.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=mark.rutland@arm.com \ --cc=pawel.moll@arm.com \ --cc=rob@landley.net \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.