linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Gabriel Fernandez <gabriel.fernandez@linaro.org>,
	Giuseppe Condorelli <giuseppe.condorelli@st.com>
Subject: [PATCH v4 3/7] driver: reset: sti: add keyscan for stih416
Date: Fri, 11 Apr 2014 17:07:32 +0200	[thread overview]
Message-ID: <1397228856-9218-4-git-send-email-gabriel.fernandez@linaro.org> (raw)
In-Reply-To: <1397228856-9218-1-git-send-email-gabriel.fernandez@linaro.org>

Add keyscan reset on stih416 reset controller.

Signed-off-by: Giuseppe Condorelli <giuseppe.condorelli@st.com>
Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org>
---
 drivers/reset/sti/reset-stih416.c                     | 1 +
 include/dt-bindings/reset-controller/stih416-resets.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/reset/sti/reset-stih416.c b/drivers/reset/sti/reset-stih416.c
index fe3bf02..5fc9870 100644
--- a/drivers/reset/sti/reset-stih416.c
+++ b/drivers/reset/sti/reset-stih416.c
@@ -104,6 +104,7 @@ static const struct syscfg_reset_channel_data stih416_softresets[] = {
 	[STIH416_COMPO_A_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 4),
 	[STIH416_VP8_DEC_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 10),
 	[STIH416_VTG_MAIN_SOFTRESET] = STIH416_SRST_CPU(SYSCFG_7564, 16),
+	[STIH416_KEYSCAN_SOFTRESET] = STIH416_SRST_LPM(LPM_SYSCFG_1, 8),
 };
 
 static struct syscfg_reset_controller_data stih416_powerdown_controller = {
diff --git a/include/dt-bindings/reset-controller/stih416-resets.h b/include/dt-bindings/reset-controller/stih416-resets.h
index 2127743..fcf9af1 100644
--- a/include/dt-bindings/reset-controller/stih416-resets.h
+++ b/include/dt-bindings/reset-controller/stih416-resets.h
@@ -46,5 +46,6 @@
 #define STIH416_COMPO_A_SOFTRESET	25
 #define STIH416_VP8_DEC_SOFTRESET	26
 #define STIH416_VTG_MAIN_SOFTRESET	27
+#define STIH416_KEYSCAN_SOFTRESET	28
 
 #endif /* _DT_BINDINGS_RESET_CONTROLLER_STIH416 */
-- 
1.9.1

  parent reply	other threads:[~2014-04-11 15:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-11 15:07 [PATCH v4 0/7] Add ST Keyscan driver Gabriel FERNANDEZ
2014-04-11 15:07 ` [PATCH v4 1/7] drivers: input: keyboard: st-keyscan: add keyscan driver Gabriel FERNANDEZ
2014-04-13  5:10   ` Dmitry Torokhov
2014-04-16  8:49     ` Gabriel Fernandez
2014-04-19 21:09       ` Dmitry Torokhov
2014-04-11 15:07 ` [PATCH v4 2/7] driver: reset: sti: add keyscan for stih415 Gabriel FERNANDEZ
2014-05-14  8:51   ` [STLinux Kernel] " Maxime Coquelin
2014-05-14  9:15     ` Philipp Zabel
2014-05-14 10:00       ` Maxime Coquelin
2014-04-11 15:07 ` Gabriel FERNANDEZ [this message]
2014-04-11 15:07 ` [PATCH v4 4/7] ARM: STi: DT: " Gabriel FERNANDEZ
2014-04-11 15:07 ` [PATCH v4 5/7] ARM: STi: DT: add keyscan for stih416 Gabriel FERNANDEZ
2014-04-11 15:07 ` [PATCH v4 6/7] ARM: STi: DT: add keyscan for stih41x-b2000 Gabriel FERNANDEZ
2014-04-11 15:07 ` [PATCH v4 7/7] ARM: multi_v7_defconfig: add ST Keyscan driver Gabriel FERNANDEZ
2014-05-14  8:47 ` [STLinux Kernel] [PATCH v4 0/7] Add " Maxime Coquelin

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=1397228856-9218-4-git-send-email-gabriel.fernandez@linaro.org \
    --to=gabriel.fernandez@st.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=gabriel.fernandez@linaro.org \
    --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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).