From a2ec1d750359ecbf269f277a97fd8633f71c8e3f Mon Sep 17 00:00:00 2001
From: Oliver Wendt <ow@karo-electronics.de>
Date: Fri, 17 May 2013 11:13:16 +0200
Subject: [PATCH] WIP TX28 dts

---
 arch/arm/boot/dts/imx28-tx28.dts | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts
index d9935b619155..dfd6c940b7ea 100644
--- a/arch/arm/boot/dts/imx28-tx28.dts
+++ b/arch/arm/boot/dts/imx28-tx28.dts
@@ -59,13 +59,13 @@
 				pinctrl-0 = <&spi3_pins_tx28>;
 				status = "okay";
 
-/*				flash: m25p80@0 {
+				flash: m25p80@0 {
 					#address-cells = <1>;
 					#size-cells = <1>;
 					compatible = "m25p80";
 					spi-max-frequency = <40000000>;
 					reg = <0>;
-				}; */
+				};
 			};
 
 			pinctrl@80018000 {
@@ -150,7 +150,7 @@
 				usbphy0_pins_c: usbphy0@0 {
 					reg = <0>;
 					fsl,pinmux-ids = <
-//						0x31b3		/* MX28_PAD_SPDIF__GPIO_3_27 - USBH_VBUSEN */
+						0x31b3		/* MX28_PAD_SPDIF__GPIO_3_27 - USBH_VBUSEN */
 						0x4143		/* MX28_PAD_JTAG_RTCK__GPIO_4_20 - USBH_OC */
 					>;
 					fsl,drive-strength = <2>;
@@ -158,12 +158,12 @@
 					fsl,pull-up = <0>;
 				};
 
-/*				usbphy1_pins_b: usbphy1@0 {
+				usbphy1_pins_b: usbphy1@0 {
 					reg = <0>;
 					fsl,pinmux-ids = <*/
-//						0x0123		/* MX28_PAD_GPMI_CE2N__GPIO_0_18 - USBOTG_VBUSEN */
-//						0x0133		/* MX28_PAD_GPMI_CE3N__GPIO_0_19 - USBOTH_OC */
-/*					>;
+						0x0123		/* MX28_PAD_GPMI_CE2N__GPIO_0_18 - USBOTG_VBUSEN */
+						0x0133		/* MX28_PAD_GPMI_CE3N__GPIO_0_19 - USBOTH_OC */
+					>;
 					fsl,drive-strength = <2>;
 					fsl,voltage = <1>;
 					fsl,pull-up = <0>;
@@ -199,7 +199,7 @@
 				pinctrl-0 = <&can0_pins_a>;
 				status = "okay";
 			};
-/*
+
 			can1: can@80034000 {
 				pinctrl-names = "default";
 				pinctrl-0 = <&can1_pins_a>;
@@ -213,7 +213,7 @@
 			ocotp@8002c000 {
 				status = "okay";
 			};
-*/
+
 		};
 
 		apbx@80040000 {
@@ -315,7 +315,7 @@
 				status = "okay";
 			};
 
-			keypad@53f94000 {
+			keymap: keymap@ {
 				status = "okay";
 				/* sample keymap */
 				/* row/col 0,1 are mapped to KPP row/col 6,7 */
@@ -348,14 +348,14 @@
 		};
 
 /* OTG port - host mode */
-/*		usb1: usb@80090000 {
+		usb1: usb@80090000 {
 			vbus-supply = <&reg_usb1_vbus>;
 			pinctrl-names = "default";
 			pinctrl-0 = <&usbphy1_pins_b>;
 			disable-over-current;
 			dr_mode = "host";
 			status = "okay";
-		};*/
+		};
 
 		mac0: ethernet@800f0000 {
 			phy-mode = "rmii";
@@ -378,14 +378,14 @@
 			enable-active-high;
 		};
 
-/*		reg_usb1_vbus: usb1_vbus {
+		reg_usb1_vbus: usb1_vbus {
 			compatible = "regulator-fixed";
 			regulator-name = "usb1_vbus";
 			regulator-min-microvolt = <5000000>;
 			regulator-max-microvolt = <5000000>;
 			gpio = <&gpio0 18 0>;
 			enable-active-high;
-		};*/
+		};
 
 		reg_2p5v: 2p5v {
 			compatible = "regulator-fixed";
@@ -411,13 +411,13 @@
 
 		edt_ft5x06_reset: gpio-switch@0 {
 			compatible = "linux,gpio-switch";
-			gpio = <&gpio2 6 1>;
+			gpios = <&gpio2 6 1>;
 			label = "EDT-FT5x06 RESET";
 		};
 
 		edt_ft5x06_wake: gpio-switch@1 {
 			compatible = "linux,gpio-switch";
-			gpio = <&gpio4 9 0>;
+			gpios = <&gpio4 9 0>;
 			init-state = <1>;
 			label = "EDT-FT5x06 WAKE";
 		};
-- 
2.39.2