From 57302f9bec57e3f251196641a9fc526d3000e03f Mon Sep 17 00:00:00 2001
From: Rostislav Lisovy <lisovy@gmail.com>
Date: Tue, 16 Jul 2013 16:36:24 +0200
Subject: [PATCH] voipac mx53: Keypad F1--F5

---
 arch/arm/boot/dts/imx53-voipac.dts | 38 ++++++++++++++++++++++++++++--
 arch/arm/boot/dts/imx53.dtsi       |  8 +++++++
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/imx53-voipac.dts b/arch/arm/boot/dts/imx53-voipac.dts
index 64ffff0694d0..2f86404f94b6 100644
--- a/arch/arm/boot/dts/imx53-voipac.dts
+++ b/arch/arm/boot/dts/imx53-voipac.dts
@@ -98,8 +98,26 @@
 	i2c3 {
 		pinctrl_i2c3_2: i2c3grp2 {
 			fsl,pins = <
-				MX53_PAD_GPIO_3__I2C3_SCL		0xc0000000
-				MX53_PAD_GPIO_6__I2C3_SDA		0xc0000000
+				MX53_PAD_GPIO_3__I2C3_SCL	0xc0000000
+				MX53_PAD_GPIO_6__I2C3_SDA	0xc0000000
+			>;
+		};
+	};
+
+	kpp {
+		pinctrl_kpp_1: kppgrp-1 {
+			fsl,pins = <
+				MX53_PAD_GPIO_9__KPP_COL_6	 0xe8
+				MX53_PAD_GPIO_4__KPP_COL_7	 0xe8
+				MX53_PAD_KEY_COL2__KPP_COL_2	 0xe8
+				MX53_PAD_KEY_COL3__KPP_COL_3	 0xe8
+				MX53_PAD_KEY_COL4__KPP_COL_4	 0xe8
+
+				MX53_PAD_GPIO_2__KPP_ROW_6	 0xe0
+				MX53_PAD_GPIO_5__KPP_ROW_7	 0xe0
+				MX53_PAD_KEY_ROW2__KPP_ROW_2	 0xe0
+				MX53_PAD_KEY_ROW3__KPP_ROW_3	 0xe0
+				MX53_PAD_KEY_ROW4__KPP_ROW_4	 0xe0
 			>;
 		};
 	};
@@ -266,3 +284,19 @@
 		linux,wakeup;
 	};
 };
+
+&kpp {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_kpp_1>;
+	linux,keymap = <
+			0x0200003b	/* KEY_F1 */
+			0x0300003c	/* KEY_F2 */
+			0x0400003d	/* KEY_F3 */
+			0x0600003e	/* KEY_F4 */
+			0x0700003f	/* KEY_F5 */
+			>;
+	keypad,num-rows = <8>;
+	keypad,num-columns = <1>;
+	status = "okay";
+};
+
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 569aa9f2c4ed..8d10b7bcb176 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -265,6 +265,14 @@
 				#interrupt-cells = <2>;
 			};
 
+			kpp: kpp@53f94000 {
+				compatible = "fsl,imx53-kpp", "fsl,imx21-kpp";
+				reg = <0x53f94000 0x4000>;
+				interrupts = <60>;
+				clocks = <&clks 0>;
+				status = "disabled";
+			};
+
 			wdog1: wdog@53f98000 {
 				compatible = "fsl,imx53-wdt", "fsl,imx21-wdt";
 				reg = <0x53f98000 0x4000>;
-- 
2.39.2