]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: dts: imx53: Add support for Ka-Ro electronics TX53 modules
authorLothar Waßmann <LW@KARO-electronics.de>
Tue, 29 Oct 2013 07:46:59 +0000 (08:46 +0100)
committerLothar Waßmann <LW@KARO-electronics.de>
Tue, 5 Nov 2013 21:43:32 +0000 (22:43 +0100)
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx53-tx53.dts [new file with mode: 0644]
arch/arm/boot/dts/imx53-tx53.dtsi [deleted file]

index e9d8f14d778af586e51260d422617e8e966df125..1c9f3e679c4b78367a42f522f9f684411989fa88 100644 (file)
@@ -135,6 +135,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
        imx53-mba53.dtb \
        imx53-qsb.dtb \
        imx53-smd.dtb \
+       imx53-tx53.dtb \
        imx6dl-gw51xx.dtb \
        imx6dl-gw52xx.dtb \
        imx6dl-gw53xx.dtb \
diff --git a/arch/arm/boot/dts/imx53-tx53.dts b/arch/arm/boot/dts/imx53-tx53.dts
new file mode 100644 (file)
index 0000000..0555f6c
--- /dev/null
@@ -0,0 +1,773 @@
+/*
+ * Copyright 2012 <LW@KARO-electronics.de>
+ * based on imx53-qsb.dts
+ *   Copyright 2011 Freescale Semiconductor, Inc.
+ *   Copyright 2011 Linaro Ltd.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx53.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+       model = "Ka-Ro electronics TX53 module";
+       compatible = "karo,tx53", "fsl,imx53";
+
+       aliases {
+               can1 = &can1;
+               can2 = &can2;
+               display = &display;
+               ipu = &ipu;
+               lvds0 = &lvds0;
+               lvds1 = &lvds1;
+               usbh1 = &usbh1;
+               usbotg = &usbotg;
+       };
+
+       clocks {
+               ckih1 {
+                       clock-frequency = <0>;
+               };
+
+               mclk: codec_clock {
+                       compatible = "fixed-clock";
+                       reg = <0>;
+                       #clock-cells = <0>;
+                       clock-frequency = <27000000>;
+               };
+       };
+
+       soc {
+               display: display@di0 {
+                       compatible = "fsl,imx-parallel-display";
+                       crtcs = <&ipu 0>;
+                       interface-pix-fmt = "rgb24";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_rgb24_vga_1>;
+                       status = "okay";
+
+                       display-timings {
+                               VGA {
+                                       clock-frequency = <25200000>;
+                                       hactive = <640>;
+                                       vactive = <480>;
+                                       hback-porch = <48>;
+                                       hsync-len = <96>;
+                                       hfront-porch = <16>;
+                                       vback-porch = <31>;
+                                       vsync-len = <2>;
+                                       vfront-porch = <12>;
+                                       hsync-active = <0>;
+                                       vsync-active = <0>;
+                                       de-active = <1>;
+                                       pixelclk-active = <0>;
+                               };
+
+                               ETV570 {
+                                       clock-frequency = <25200000>;
+                                       hactive = <640>;
+                                       vactive = <480>;
+                                       hback-porch = <114>;
+                                       hsync-len = <30>;
+                                       hfront-porch = <16>;
+                                       vback-porch = <32>;
+                                       vsync-len = <3>;
+                                       vfront-porch = <10>;
+                                       hsync-active = <0>;
+                                       vsync-active = <0>;
+                                       de-active = <1>;
+                                       pixelclk-active = <0>;
+                               };
+
+                               ET0350 {
+                                       clock-frequency = <6413760>;
+                                       hactive = <320>;
+                                       vactive = <240>;
+                                       hback-porch = <34>;
+                                       hsync-len = <34>;
+                                       hfront-porch = <20>;
+                                       vback-porch = <15>;
+                                       vsync-len = <3>;
+                                       vfront-porch = <4>;
+                                       hsync-active = <0>;
+                                       vsync-active = <0>;
+                                       de-active = <1>;
+                                       pixelclk-active = <0>;
+                               };
+
+                               ET0430 {
+                                       clock-frequency = <9009000>;
+                                       hactive = <480>;
+                                       vactive = <272>;
+                                       hback-porch = <2>;
+                                       hsync-len = <41>;
+                                       hfront-porch = <2>;
+                                       vback-porch = <2>;
+                                       vsync-len = <10>;
+                                       vfront-porch = <2>;
+                                       hsync-active = <0>;
+                                       vsync-active = <0>;
+                                       de-active = <1>;
+                                       pixelclk-active = <1>;
+                               };
+
+                               ET0500 {
+                                       clock-frequency = <33264000>;
+                                       hactive = <800>;
+                                       vactive = <480>;
+                                       hback-porch = <88>;
+                                       hsync-len = <128>;
+                                       hfront-porch = <40>;
+                                       vback-porch = <33>;
+                                       vsync-len = <2>;
+                                       vfront-porch = <10>;
+                                       hsync-active = <0>;
+                                       vsync-active = <0>;
+                                       de-active = <1>;
+                                       pixelclk-active = <0>;
+                               };
+
+                               ET0700 { /* same as ET0500 */
+                                       clock-frequency = <33264000>;
+                                       hactive = <800>;
+                                       vactive = <480>;
+                                       hback-porch = <88>;
+                                       hsync-len = <128>;
+                                       hfront-porch = <40>;
+                                       vback-porch = <33>;
+                                       vsync-len = <2>;
+                                       vfront-porch = <10>;
+                                       hsync-active = <0>;
+                                       vsync-active = <0>;
+                                       de-active = <1>;
+                                       pixelclk-active = <0>;
+                               };
+
+                               ETQ570 {
+                                       clock-frequency = <6596040>;
+                                       hactive = <320>;
+                                       vactive = <240>;
+                                       hback-porch = <38>;
+                                       hsync-len = <30>;
+                                       hfront-porch = <30>;
+                                       vback-porch = <16>;
+                                       vsync-len = <3>;
+                                       vfront-porch = <4>;
+                                       hsync-active = <0>;
+                                       vsync-active = <0>;
+                                       de-active = <1>;
+                                       pixelclk-active = <0>;
+                               };
+                       };
+               };
+       };
+
+       sound {
+               compatible = "karo,tx53-audio-sgtl5000", "fsl,imx-audio-sgtl5000";
+               status = "okay";
+               model = "tx53-audio-sgtl5000";
+               ssi-controller = <&ssi1>;
+               audio-codec = <&sgtl5000>;
+               audio-routing =
+                       "MIC_IN", "Mic Jack",
+                       "Mic Jack", "Mic Bias",
+                       "Headphone Jack", "HP_OUT";
+               /* '1' based port numbers according to datasheet names */
+               mux-int-port = <1>;
+               mux-ext-port = <5>;
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+
+               power {
+                       label = "Power Button";
+                       gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>;
+                       linux,code = <116>; /* KEY_POWER */
+                       gpio-key,wakeup;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_stk5_led>;
+
+               user {
+                       label = "Heartbeat";
+                       gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "heartbeat";
+               };
+       };
+
+       backlight0: pwm-backlight@0 {
+               compatible = "pwm-backlight";
+               pwms = <&pwm2 0 500000>;
+               power-supply = <&reg_3v3>;
+               brightness-levels = <
+                         0  1  2  3  4  5  6  7  8  9
+                        10 11 12 13 14 15 16 17 18 19
+                        20 21 22 23 24 25 26 27 28 29
+                        30 31 32 33 34 35 36 37 38 39
+                        40 41 42 43 44 45 46 47 48 49
+                        50 51 52 53 54 55 56 57 58 59
+                        60 61 62 63 64 65 66 67 68 69
+                        70 71 72 73 74 75 76 77 78 79
+                        80 81 82 83 84 85 86 87 88 89
+                        90 91 92 93 94 95 96 97 98 99
+                       100>;
+               default-brightness-level = <50>;
+       };
+
+       backlight1: pwm-backlight@1 {
+               compatible = "pwm-backlight";
+               pwms = <&pwm1 0 500000>;
+               power-supply = <&reg_3v3>;
+               brightness-levels = <
+                         0  1  2  3  4  5  6  7  8  9
+                        10 11 12 13 14 15 16 17 18 19
+                        20 21 22 23 24 25 26 27 28 29
+                        30 31 32 33 34 35 36 37 38 39
+                        40 41 42 43 44 45 46 47 48 49
+                        50 51 52 53 54 55 56 57 58 59
+                        60 61 62 63 64 65 66 67 68 69
+                        70 71 72 73 74 75 76 77 78 79
+                        80 81 82 83 84 85 86 87 88 89
+                        90 91 92 93 94 95 96 97 98 99
+                       100>;
+               default-brightness-level = <50>;
+       };
+
+       regulators {
+               compatible = "simple-bus";
+
+               reg_2v5: 2v5 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "2V5";
+                       regulator-min-microvolt = <2500000>;
+                       regulator-max-microvolt = <2500000>;
+                       regulator-always-on;
+               };
+
+               reg_3v3: 3v3 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "3V3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_can_xcvr: can-xcvr {
+                       compatible = "regulator-fixed";
+                       regulator-name = "CAN XCVR";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
+                       enable-active-low;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&pinctrl_tx53_flexcan_xcvr>;
+               };
+
+               reg_lcd_pwr0: lcd-power@0 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "LCD POWER";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+                       regulator-boot-on;
+               };
+
+               reg_lcd_pwr1: lcd-power@1 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "LCD POWER";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+                       regulator-boot-on;
+               };
+
+               reg_lcd_reset: lcd-reset {
+                       compatible = "regulator-fixed";
+                       regulator-name = "LCD RESET";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
+                       startup-delay-us = <300000>;
+                       enable-active-high;
+                       regulator-always-on;
+                       regulator-boot-on;
+               };
+
+               reg_usbh1_vbus: usbh1_vbus {
+                       compatible = "regulator-fixed";
+                       regulator-name = "usbh1_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+
+               reg_usbotg_vbus: usbotg_vbus {
+                       compatible = "regulator-fixed";
+                       regulator-name = "usbotg_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
+                       enable-active-high;
+               };
+       };
+};
+
+&audmux {
+       status = "okay";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_audmux_1>;
+};
+
+&can1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_can1_3>;
+       xceiver-supply = <&reg_can_xcvr>;
+
+       status = "okay";
+};
+
+&can2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_can2_1>;
+       xceiver-supply = <&reg_can_xcvr>;
+
+       status = "okay";
+};
+
+&ecspi1 {
+       status = "okay";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <
+               &pinctrl_ecspi1_1
+               &pinctrl_cspi1_cs
+       >;
+
+       fsl,spi-num-chipselects = <2>;
+       cs-gpios = <&gpio2 30 0 &gpio3 19 GPIO_ACTIVE_HIGH>;
+
+       spidev0: spi@0 {
+               compatible = "spidev";
+               reg = <0>;
+               spi-max-frequency = <54000000>;
+       };
+};
+
+&esdhc1 {
+       status = "okay";
+       cd-gpios = <&gpio3 24 GPIO_ACTIVE_HIGH>;
+       fsl,wp-controller;
+       pinctrl-names = "default";
+       pinctrl-0 = <
+               &pinctrl_esdhc1_1
+               &pinctrl_tx53_esdhc1_cd
+       >;
+};
+
+&esdhc2 {
+       status = "okay";
+       cd-gpios = <&gpio3 25 GPIO_ACTIVE_HIGH>;
+       fsl,wp-controller;
+       pinctrl-names = "default";
+       pinctrl-0 = <
+               &pinctrl_esdhc2_1
+               &pinctrl_tx53_esdhc2_cd
+       >;
+};
+
+&fec {
+       status = "okay";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_fec_1>;
+
+       phy-mode = "rmii";
+       phy-reset-gpios = <&gpio7 6 GPIO_ACTIVE_HIGH>;
+       phy-handle = <&phy0>;
+       mac-address = [000000000000]; /* placeholder; will be overwritten by bootloader */
+
+       phy0: ethernet-phy@0 {
+               interrupt-parent = <&gpio2>;
+               interrupts = <4>;
+               device_type = "ethernet-phy";
+       };
+};
+
+&i2c1 {
+       status = "okay";
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1_2>;
+
+       rtc1: ds1339@68 {
+               compatible = "dallas,ds1339";
+               reg = <0x68>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_ds1339_int>;
+               interrupt-parent = <&gpio4>;
+               interrupts = <20 0>;
+       };
+
+       pmic: lt3589@48 {
+               compatible = "lt,lt3589";
+               reg = <0x48>;
+       };
+};
+
+&i2c3 {
+       status = "okay";
+
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3_2>;
+
+       sgtl5000: codec@0a {
+               compatible = "fsl,sgtl5000";
+               reg = <0x0a>;
+               VDDA-supply = <&reg_2v5>;
+               VDDIO-supply = <&reg_3v3>;
+               clocks = <&mclk>;
+       };
+
+       polytouch: edt-ft5x06@38 {
+               compatible = "edt,edt-ft5x06";
+               reg = <0x38>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_edt_ft5x06_1>;
+               interrupt-parent = <&gpio6>;
+               interrupts = <15 0>;
+               reset-gpios = <&gpio2 22 GPIO_ACTIVE_LOW>;
+               wake-gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
+       };
+
+       touchscreen: tsc2007@48 {
+               compatible = "ti,tsc2007";
+               reg = <0x48>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_tsc2007_1>;
+               interrupt-parent = <&gpio3>;
+               interrupts = <26 0>;
+               gpios = <&gpio3 26 GPIO_ACTIVE_LOW>;
+               ti,x-plate-ohms = <660>;
+               linux,wakeup;
+       };
+};
+
+&iomuxc {
+       pinctrl-names = "default";
+
+       cspi1 {
+               pinctrl_cspi1_cs: cspi1-cs-gpios {
+                       fsl,pins = <
+                               MX53_PAD_EIM_EB2__GPIO2_30 0xe0
+                               MX53_PAD_EIM_D19__GPIO3_19 0xe0
+                       >;
+               };
+       };
+
+       display {
+               pinctrl_rgb24_vga_1: rgb24-vga-grp-1 {
+                       fsl,pins = <
+                               MX53_PAD_DISP0_DAT0__IPU_DISP0_DAT_0 0x80000000
+                               MX53_PAD_DISP0_DAT1__IPU_DISP0_DAT_1 0x80000000
+                               MX53_PAD_DISP0_DAT2__IPU_DISP0_DAT_2 0x80000000
+                               MX53_PAD_DISP0_DAT3__IPU_DISP0_DAT_3 0x80000000
+                               MX53_PAD_DISP0_DAT4__IPU_DISP0_DAT_4 0x80000000
+                               MX53_PAD_DISP0_DAT5__IPU_DISP0_DAT_5 0x80000000
+                               MX53_PAD_DISP0_DAT6__IPU_DISP0_DAT_6 0x80000000
+                               MX53_PAD_DISP0_DAT7__IPU_DISP0_DAT_7 0x80000000
+                               MX53_PAD_DISP0_DAT8__IPU_DISP0_DAT_8 0x80000000
+                               MX53_PAD_DISP0_DAT9__IPU_DISP0_DAT_9 0x80000000
+                               MX53_PAD_DISP0_DAT10__IPU_DISP0_DAT_10 0x80000000
+                               MX53_PAD_DISP0_DAT11__IPU_DISP0_DAT_11 0x80000000
+                               MX53_PAD_DISP0_DAT12__IPU_DISP0_DAT_12 0x80000000
+                               MX53_PAD_DISP0_DAT13__IPU_DISP0_DAT_13 0x80000000
+                               MX53_PAD_DISP0_DAT14__IPU_DISP0_DAT_14 0x80000000
+                               MX53_PAD_DISP0_DAT15__IPU_DISP0_DAT_15 0x80000000
+                               MX53_PAD_DISP0_DAT16__IPU_DISP0_DAT_16 0x80000000
+                               MX53_PAD_DISP0_DAT17__IPU_DISP0_DAT_17 0x80000000
+                               MX53_PAD_DISP0_DAT18__IPU_DISP0_DAT_18 0x80000000
+                               MX53_PAD_DISP0_DAT19__IPU_DISP0_DAT_19 0x80000000
+                               MX53_PAD_DISP0_DAT20__IPU_DISP0_DAT_20 0x80000000
+                               MX53_PAD_DISP0_DAT21__IPU_DISP0_DAT_21 0x80000000
+                               MX53_PAD_DISP0_DAT22__IPU_DISP0_DAT_22 0x80000000
+                               MX53_PAD_DISP0_DAT23__IPU_DISP0_DAT_23 0x80000000
+                               MX53_PAD_DI0_PIN2__IPU_DI0_PIN2 0x80000000 /* HSYNC */
+                               MX53_PAD_DI0_PIN3__IPU_DI0_PIN3 0x80000000 /* VSYNC */
+                               MX53_PAD_DI0_PIN15__IPU_DI0_PIN15 0x80000000 /* OE */
+                               MX53_PAD_DI0_DISP_CLK__IPU_DI0_DISP_CLK 0x80000000 /* PIXCLK */
+                       >;
+               };
+
+               pinctrl_rgb24_vga_2: rgb24-vga-grp-2 {
+                       fsl,pins = <
+                               MX53_PAD_EIM_DA0__IPU_DISP1_DAT_9 0x80000000
+                               MX53_PAD_EIM_DA1__IPU_DISP1_DAT_8 0x80000000
+                               MX53_PAD_EIM_DA2__IPU_DISP1_DAT_7 0x80000000
+                               MX53_PAD_EIM_DA3__IPU_DISP1_DAT_6 0x80000000
+                               MX53_PAD_EIM_DA4__IPU_DISP1_DAT_5 0x80000000
+                               MX53_PAD_EIM_DA5__IPU_DISP1_DAT_4 0x80000000
+                               MX53_PAD_EIM_DA6__IPU_DISP1_DAT_3 0x80000000
+                               MX53_PAD_EIM_DA7__IPU_DISP1_DAT_2 0x80000000
+                               MX53_PAD_EIM_DA8__IPU_DISP1_DAT_1 0x80000000
+                               MX53_PAD_EIM_DA9__IPU_DISP1_DAT_0 0x80000000
+                       >;
+               };
+       };
+
+       ds1339 {
+               pinctrl_ds1339_int: ds1339-gpios {
+                       fsl,pins = <
+                               MX53_PAD_DI0_PIN4__GPIO4_20 0xe0
+                       >;
+               };
+       };
+
+       esdhc1 {
+               pinctrl_tx53_esdhc1_cd: esdhc1-cd-gpios {
+                       fsl,pins = <
+                               MX53_PAD_EIM_D24__GPIO3_24 0x1f0
+                       >;
+               };
+       };
+
+       esdhc2 {
+               pinctrl_tx53_esdhc2_cd: esdhc2-cd-gpios {
+                       fsl,pins = <
+                               MX53_PAD_EIM_D25__GPIO3_25 0x1f0
+                       >;
+               };
+       };
+
+       flexcan {
+               pinctrl_tx53_flexcan_xcvr: flexcan-xcvrgrp-1 {
+                       fsl,pins = <
+                               MX53_PAD_DISP0_DAT0__GPIO4_21 0xe0 /* Flexcan XCVR enable */
+                       >;
+               };
+       };
+
+       leds {
+               pinctrl_stk5_led: stk5-led-gpios {
+                       fsl,pins = <
+                               MX53_PAD_EIM_A18__GPIO2_20 0xc0
+                       >;
+               };
+       };
+
+       ssi1 {
+               pinctrl_ssi1: ssi1-gpios {
+                       fsl,pins = <
+                               MX53_PAD_EIM_D26__GPIO3_26 0x1f0
+                       >;
+               };
+       };
+
+       ssi2 {
+               pinctrl_ssi2: ssi2-gpios {
+                       fsl,pins = <
+                               MX53_PAD_EIM_D27__GPIO3_27 0x1f0
+                       >;
+               };
+       };
+
+       touchpanel {
+               pinctrl_tsc2007_1: tsc2007grp-1 {
+                       fsl,pins = <
+                               MX53_PAD_EIM_D26__GPIO3_26 0xe0 /* Interrupt */
+                       >;
+               };
+
+               pinctrl_edt_ft5x06_1: edt-ft5x06grp-1 {
+                       fsl,pins = <
+                               MX53_PAD_NANDF_CS2__GPIO6_15 0xe0 /* Interrupt */
+                               MX53_PAD_EIM_A16__GPIO2_22 0xe0 /* Reset */
+                               MX53_PAD_EIM_A17__GPIO2_21 0xe0 /* Wake */
+                       >;
+               };
+       };
+
+       usbh1 {
+               pinctrl_tx53_usbh1_1: usbh1-gpios {
+                       fsl,pins = <
+                               MX53_PAD_EIM_D31__GPIO3_31 0xe0 /* VBUS ENABLE */
+                               MX53_PAD_EIM_D30__GPIO3_30 0x100 /* OC */
+                       >;
+               };
+       };
+
+       usbotg {
+               pinctrl_tx53_usbotg_1: usbotg-gpios {
+                       fsl,pins = <
+                               MX53_PAD_GPIO_7__GPIO1_7 0xe0 /* VBUS ENABLE */
+                               MX53_PAD_GPIO_8__GPIO1_8 0x100 /* OC */
+                       >;
+               };
+       };
+};
+
+&ipu {
+       status = "okay";
+};
+
+&kpp {
+       /* 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 */
+       >;
+       status = "okay";
+};
+
+&ldb {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_ipu_disp2_1>;
+       status = "okay";
+
+       lvds0: lvds-channel@0 {
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&lvds_timing0>;
+                       lvds_timing0: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hsync-len = <60>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vsync-len = <10>;
+                               vfront-porch = <7>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+
+       lvds1: lvds-channel@1 {
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
+               status = "okay";
+
+               display-timings {
+                       native-mode = <&lvds_timing1>;
+                       lvds_timing1: hsd100pxn1 {
+                               clock-frequency = <65000000>;
+                               hactive = <1024>;
+                               vactive = <768>;
+                               hback-porch = <220>;
+                               hsync-len = <60>;
+                               hfront-porch = <40>;
+                               vback-porch = <21>;
+                               vsync-len = <10>;
+                               vfront-porch = <7>;
+                               hsync-active = <0>;
+                               vsync-active = <0>;
+                               de-active = <1>;
+                               pixelclk-active = <0>;
+                       };
+               };
+       };
+};
+
+&nfc {
+       nand-bus-width = <8>;
+       nand-ecc-mode = "hw";
+       nand-on-flash-bbt;
+       status = "okay";
+};
+
+&pwm1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm1_2>;
+};
+
+&pwm2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm2_1>;
+};
+
+&sata {
+       status = "okay";
+};
+
+&sdma {
+       fsl,sdma-ram-script-name = "sdma-imx53.bin";
+};
+
+&ssi1 {
+       fsl,mode = "i2s-slave";
+       codec-handle = <&sgtl5000>;
+       status = "okay";
+};
+
+&ssi2 {
+       status = "okay";
+};
+
+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_2 &pinctrl_uart1_3>;
+       fsl,uart-has-rtscts;
+       status = "okay";
+};
+
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2_2>;
+       fsl,uart-has-rtscts;
+       status = "okay";
+};
+
+&uart3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart3_1>;
+       fsl,uart-has-rtscts;
+       status = "okay";
+};
+
+&usbh1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_tx53_usbh1_1>;
+       disable-over-current;
+       vbus-supply = <&reg_usbh1_vbus>;
+       status = "okay";
+};
+
+&usbotg {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_tx53_usbotg_1>;
+       disable-over-current;
+       vbus-supply = <&reg_usbotg_vbus>;
+       status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx53-tx53.dtsi b/arch/arm/boot/dts/imx53-tx53.dtsi
deleted file mode 100644 (file)
index f494766..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright 2013 Steffen Trumtrar <s.trumtrar@pengutronix.de>
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/include/ "imx53.dtsi"
-
-/ {
-       model = "Ka-Ro TX53";
-       compatible = "karo,tx53", "fsl,imx53";
-
-       memory {
-               reg = <0x70000000 0x40000000>; /* Up to 1GiB */
-       };
-
-       regulators {
-               compatible = "simple-bus";
-
-               reg_3p3v: 3p3v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "3P3V";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-       };
-};
-
-&can1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_can1_2>;
-       status = "disabled";
-};
-
-&can2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_can2_1>;
-       status = "disabled";
-};
-
-&ecspi1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_ecspi1_2>;
-       status = "disabled";
-};
-
-&esdhc1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_esdhc1_2>;
-       status = "disabled";
-};
-
-&esdhc2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_esdhc2_1>;
-       status = "disabled";
-};
-
-&fec {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_fec_1>;
-       phy-mode = "rmii";
-       status = "disabled";
-};
-
-&i2c3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c3_2>;
-       status = "disabled";
-};
-
-&owire {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_owire_1>;
-       status = "disabled";
-};
-
-&pwm2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_pwm2_1>;
-       status = "disabled";
-};
-
-&ssi1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_audmux_1>;
-       status = "disabled";
-};
-
-&ssi2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_audmux_2>;
-       status = "disabled";
-};
-
-&uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_2>,
-                   <&pinctrl_uart1_3>;
-       fsl,uart-has-rtscts;
-       status = "disabled";
-};
-
-&uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2_2>;
-       fsl,uart-has-rtscts;
-       status = "disabled";
-};
-
-&uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart3_1>;
-       fsl,uart-has-rtscts;
-       status = "disabled";
-};