TX48 DTS update

diff --git a/arch/arm/boot/dts/am335x-tx48.dts b/arch/arm/boot/dts/am335x-tx48.dts
index 6e000582c1f26eb842b1c8be5c0dcc2e2c6ad13e..a738584423b77eae20e2e1d45d0c2425de14e815 100755 (executable)
--- a/arch/arm/boot/dts/am335x-tx48.dts
+++ b/arch/arm/boot/dts/am335x-tx48.dts
@@ -13,6 +13,11 @@
        model = "Ka-Ro electronics TX48 module (TI AM335x)";
        compatible = "karo,am335x-tx48", "ti,am33xx";
 
+       aliases {
+               ethernet0 = &cpsw_emac0;
+               ethernet1 = &cpsw_emac1;
+       };
+
        cpus {
                cpu@0 {
                        cpu0-supply = <&sw2_reg>;
@@ -24,10 +29,9 @@
                reg = <0 0>; /* will be set up by bootloader */
        };
 
-       am33xx_pinmux: pinmux@44e10800 {
+       ocp {
+               pinmux@44e10800 {
                pinctrl-names = "default";
-//             pinctrl-names = "default","power";
-//             pinctrl-0 = <&usb_host_0 &volume_keys_s0>;
 
                pinctrl_usb_host_0: usbhostgrp-1 {
                        pinctrl-single,pins = <
@@ -47,10 +51,10 @@
                                0x104 0x7       /* mmc0_cmd.gpio2_31,  INPUT | MODE4; #USBOTG_OC */
                        >;
                };
-               pinctrl_i2c0_0: i2c0grp-1 {
+               pinctrl_i2c0_1: i2c0grp-1 {
                        pinctrl-single,pins = <
-                               0x188 0x0       /* i2c0_sda.i2c0_sda, OUTPUT | MODE0; I2C_DATA */
-                               0x18c 0x0       /* i2c0_scl.i2c0_scl, OUTPUT | MODE0; I2C_CLK */
+                               0x188 0x20      /* i2c0_sda.i2c0_sda, OUTPUT | MODE0; I2C_DATA */
+                               0x18c 0x20      /* i2c0_scl.i2c0_scl, OUTPUT | MODE0; I2C_CLK */
                        >;
                };
                pinctrl_pwm_0: pwm0grp-11 {
@@ -74,7 +78,7 @@
                };
                pinctrl_mmc_0: mmc0grp-1 {
                        pinctrl-single,pins = <
-                               0x194 0x4
+                               0x194 0x27
                                0x12c 0x4
                                0x130 0x4
                                0x134 0x4
@@ -83,15 +87,19 @@
                                0x80 0x2
                        >;
                };
-               pinctrl_uart_1: uart1grp-1 {
-                       pinctrl-single,pins = <
-                               0x174 0x0
-                               0x170 0x0
-                               0x168 0x0
-                               0x16c 0x0
-                       >;
+               uart1 {
+                       pinctrl_uart1_1: uart1grp-1 {
+                               pinctrl-single,pins = <
+                                       0x174 0x0
+                                       0x170 0x20
+                                       0x168 0x20
+                                       0x16c 0x0
+                               >;
+                       };
                };
-               pinctrl_uart_2: uart2grp-1 {
+
+               uart2 {
+               pinctrl_uart2_1: uart2grp-1 {
                        pinctrl-single,pins = <
                                0x184 0x0
                                0x180 0x0
@@ -99,7 +107,9 @@
                                0x17c 0x0
                        >;
                };
-               pinctrl_uart_3: uart3grp-1 {
+               };
+               uart6 {
+               pinctrl_uart6_1: uart6grp-1 {
                        pinctrl-single,pins = <
                                0x118 0x3
                                0x108 0x3
@@ -107,6 +117,7 @@
                                0xfc 0x2
                        >;
                };
+               };
                pinctrl_matrix_keypad_0: matrix-keypad0 {
                        pinctrl-single,pins = <
                                0xf0 0x7
@@ -166,6 +177,13 @@
                                0xe8 0x0
                        >;
                };
+
+               pinctrl_tsc2007: tsc2007grp-1 {
+                       pinctrl-single,pins = <
+                               0x198 0x27 /* GPIO3_16 */
+                       >;
+               };
+       };
        };
 };
 
@@ -178,27 +196,34 @@
 };
 
 &uart1 {
-//     status = "okay";
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_1>;
 };
 
 &uart2 {
        status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2_1>;
 };
 
 &uart6 {
        status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart6_1>;
 };
 
 &i2c1 {
        status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c0_1>;
 
        rtc1: ds1339@68 {
                compatible = "dallas,ds1339";
                reg = <0x68>;
-               trickle-charge = <0xa5>;
        };
 
-       pmic: lt3589@48 {
+       pmic: lt3589@34 {
                compatible = "lt,lt3589";
                reg = <0x34>;
        };
@@ -219,6 +244,8 @@
                pendown-gpios = <&gpio3 16 1>;
                model = "2007";
                x-plate-ohms = <660>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_tsc2007>;
        };
 
        polytouch: edt-ft5x06@38 {
@@ -237,8 +264,6 @@
                sw1_reg: regulator@4 {
                        /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
                        regulator-name = "vdd_core";
-/*                     regulator-min-microvolt = <912500>; */  // lt4%
-/*                     regulator-max-microvolt = <1150000>; */ // gt4%
                        regulator-min-microvolt = <912000>;
                        regulator-max-microvolt = <1144000>;
                        regulator-boot-on;
@@ -262,6 +287,15 @@
                        regulator-always-on;
                };
        };
+
+       leds {
+               compatible = "gpio-leds";
+               heartbeat {
+                       label = "heartbeat";
+                       gpios = <&gpio1 26 0>;
+                       linux,default-trigger = "heartbeat";
+               };
+       };
 };
 
 &codec {
@@ -275,3 +309,28 @@
                };
        };
 };
+
+&dcan0 {
+       status = "okay";
+};
+
+&dcan1 {
+       status = "okay";
+};
+
+&spi0 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_cspi_0>;
+};
+
+&spi1 {
+       status = "okay";
+};
+
+&mmchs0 {
+       status = "okay";
+       cd-gpios = <&gpio3 15 1>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_mmc_0>;
+};