From: Liu Ying <Ying.Liu@freescale.com>
To: grant.likely@secretlab.ca, rob.herring@calxeda.com,
rob@landley.net, linux@arm.linux.org.uk,
dmitry.torokhov@gmail.com, shawn.guo@linaro.org,
s.hauer@pengutronix.de, linus.walleij@linaro.org, cjb@laptop.org,
broonie@opensource.wolfsonmicro.com
Cc: linux-arm-kernel@lists.infradead.org,
linux-input@vger.kernel.org, linux-doc@vger.kernel.org,
liu.y.victor@gmail.com, Liu Ying <Ying.Liu@freescale.com>
Subject: [PATCH v2 2/3] ARM: dts: imx: Add imx51 KPP entry
Date: Tue, 1 Jan 2013 11:21:14 +0800 [thread overview]
Message-ID: <1357010475-7331-2-git-send-email-Ying.Liu@freescale.com> (raw)
In-Reply-To: <1357010475-7331-1-git-send-email-Ying.Liu@freescale.com>
1) Add KPP device node entry.
2) Add one KPP pinctrl entry.
Signed-off-by: Liu Ying <Ying.Liu@freescale.com>
---
arch/arm/boot/dts/imx51.dtsi | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 1f5d45e..6bda4dc 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -221,6 +221,14 @@
#interrupt-cells = <2>;
};
+ kpp: kpp@73f94000 {
+ compatible = "fsl,imx51-kpp", "fsl,imx21-kpp";
+ reg = <0x73f94000 0x4000>;
+ interrupts = <60>;
+ clocks = <&clks 0>;
+ status = "disabled";
+ };
+
wdog1: wdog@73f98000 {
compatible = "fsl,imx51-wdt", "fsl,imx21-wdt";
reg = <0x73f98000 0x4000>;
@@ -410,6 +418,21 @@
>;
};
};
+
+ kpp {
+ pinctrl_kpp_1: kppgrp-1 {
+ fsl,pins = <
+ 438 0xe0 /* MX51_PAD_KEY_ROW0__KEY_ROW0 */
+ 439 0xe0 /* MX51_PAD_KEY_ROW1__KEY_ROW1 */
+ 440 0xe0 /* MX51_PAD_KEY_ROW2__KEY_ROW2 */
+ 441 0xe0 /* MX51_PAD_KEY_ROW3__KEY_ROW3 */
+ 442 0xe8 /* MX51_PAD_KEY_COL0__KEY_COL0 */
+ 444 0xe8 /* MX51_PAD_KEY_COL1__KEY_COL1 */
+ 446 0xe8 /* MX51_PAD_KEY_COL2__KEY_COL2 */
+ 448 0xe8 /* MX51_PAD_KEY_COL3__KEY_COL3 */
+ >;
+ };
+ };
};
pwm1: pwm@73fb4000 {
--
1.7.1
next prev parent reply other threads:[~2013-01-01 4:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-01 3:21 [PATCH v2 1/3] Input: imx_keypad - Add device tree support Liu Ying
2013-01-01 3:21 ` Liu Ying [this message]
2013-01-03 7:14 ` [PATCH v2 2/3] ARM: dts: imx: Add imx51 KPP entry Shawn Guo
2013-01-01 3:21 ` [PATCH v2 3/3] ARM i.MX51 babbage: Add keypad support Liu Ying
2013-01-03 7:11 ` [PATCH v2 1/3] Input: imx_keypad - Add device tree support Shawn Guo
2013-01-03 13:06 ` Liu Ying
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=1357010475-7331-2-git-send-email-Ying.Liu@freescale.com \
--to=ying.liu@freescale.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=cjb@laptop.org \
--cc=dmitry.torokhov@gmail.com \
--cc=grant.likely@secretlab.ca \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=liu.y.victor@gmail.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=s.hauer@pengutronix.de \
--cc=shawn.guo@linaro.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).