From: Oliver Wendt <ow@karo-electronics.de>
Date: Fri, 26 Apr 2013 14:30:37 +0000 (+0200)
Subject: Minor changes:
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f9d91cd38034743b003130d0d5d0cbdc31465524;p=karo-tx-linux.git

Minor changes:
	modified:   arch/arm/boot/dts/imx28-tx28.dts
---

diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index 097b82707352..b3ac2e19cf02 100644
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -31,12 +31,12 @@
 	apb@80000000 {
 		apbh@80000000 {
 			gpmi-nand@8000c000 {
-			    #address-cells = <1>;
-			    #size-cells = <1>;
-			    pinctrl-names = "default";
-			    pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
-			    nand-on-flash-bbt;
-			    status = "okay";
+				#address-cells = <1>;
+				#size-cells = <1>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&gpmi_pins_a &gpmi_status_cfg>;
+				nand-on-flash-bbt;
+				status = "okay";
 			};
 
 			ssp0: ssp@80010000 {
@@ -165,8 +165,8 @@
 				pinctrl-0 = <&can0_pins_a>;
 				status = "okay";
 			};
-/*
-			can1: can@80034000 {
+
+/*			can1: can@80034000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&can1_pins_a>;
 				status = "okay";
@@ -193,8 +193,8 @@
 				reg = <0x68>;
 				trickle-charge = <0xa5>;
 				};
-/*
-				pca9554: pca953x@20 {
+
+/*				pca9554: pca953x@20 {
 					compatible = "nxp,pca953x";
 					reg = <0x20>;
 					interrupt-parent = <&gpio3>;
@@ -203,8 +203,8 @@
 					#gpio-cells = <2>;
 					};
 */
-/* unfinished - required platform data bugfix
-				touchscreen: tsc2007@48 {
+/* unfinished - required platform data bugfix */
+/*				touchscreen: tsc2007@48 {
 					compatible = "ti,tsc2007";
 					reg = <0x48>;
 					interrupt-parent = <&gpio3>;
@@ -221,7 +221,9 @@
 					interrupts = <5>;
 					reset-switch = <&edt_ft5x06_reset>;
 					wake-switch = <&edt_ft5x06_wake>;
+					irq-switch = <&edt_ft5x06_irq>;
 					};
+
 				codec: sgtl5000@0a {
 					compatible = "fsl,sgtl5000";
 					reg = <0x0a>;
@@ -256,24 +258,48 @@
 				pinctrl-0 = <&duart_4pins_a>;
 				status = "okay";
 			};
+
 			/* 2nd TX-Std UART - (A)UART1  */
 			auart1: serial@8006c000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&auart1_pins_a>;
 				status = "okay";
 			};
+
 			/* 3th TX-Std UART - (A)UART3  */
 			auart3: serial@80070000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&auart3_pins_a>;
 				status = "okay";
 			};
+
 			usbphy0: usbphy@8007c000 {
 				status = "okay";
 			};
+
 			usbphy1: usbphy@8007e000 {
 				status = "okay";
 			};
+
+			keypad@53f94000 {
+				status = "okay";
+				/* sample keymap */
+				/* row/col 0,1 are mapped to KPP row/col 6,7 */
+				linux,keymap = <
+					0x06060074	/* row 6, col 6, KEY_POWER */
+					0x06070052	/* row 6, col 7, KEY_KP0 */
+					0x0602004f	/* row 6, col 2, KEY_KP1 */
+					0x06030050	/* row 6, col 3, KEY_KP2 */
+					0x07060051	/* row 7, col 6, KEY_KP3 */
+					0x0707004b	/* row 7, col 7, KEY_KP4 */
+					0x0702004c	/* row 7, col 2, KEY_KP5 */
+					0x0703004d	/* row 7, col 3, KEY_KP6 */
+					0x02060047	/* row 2, col 6, KEY_KP7 */
+					0x02070048	/* row 2, col 7, KEY_KP8 */
+					0x02020049	/* row 2, col 2, KEY_KP9 */
+				 >;
+			};
+
 		};
 	};
 
@@ -367,8 +393,8 @@
 			label = "EDT-FT5x06 IRQ";
 			init-state = <1>;
 		};
-	}
-/*
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
@@ -378,15 +404,8 @@
 			linux,default-trigger = "heartbeat";
 			init-state = <0>;
 		};
-/**/
-		user_lcd_power {
-			label = "lcd_power";
-			gpios = <&gpio1 31 1>;
-		/* init-state = <1>; */
-		};
-/**/
 	};
-*/
+
 	backlight {
 		compatible = "pwm-backlight";
 		pwms = <&pwm 0 5000000>;