imx6: update Ventana dts
authorLuka Perkov <luka@openwrt.org>
Thu, 20 Feb 2014 17:26:10 +0000 (17:26 +0000)
committerLuka Perkov <luka@openwrt.org>
Thu, 20 Feb 2014 17:26:10 +0000 (17:26 +0000)
Update the Ventana device-tree to match upstream:
 - Add IMX6Q/IMX6DL variants for GW54xx/GW53xx/GW52xx/GW51xx
 - align pinctrl with upstream
 - consolidate multiple patches into one

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
SVN-Revision: 39644

20 files changed:
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw51xx.dts
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw52xx.dts
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw53xx.dts
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw54xx.dts [new file with mode: 0644]
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw51xx.dts [new file with mode: 0644]
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw52xx.dts [new file with mode: 0644]
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw53xx.dts [new file with mode: 0644]
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw5400-a.dts
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw54xx.dts
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi [new file with mode: 0644]
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi [new file with mode: 0644]
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi [new file with mode: 0644]
target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi [new file with mode: 0644]
target/linux/imx6/patches-3.10/110-gateworks-ventana.patch [new file with mode: 0644]
target/linux/imx6/patches-3.10/110-gw5400-a.patch [deleted file]
target/linux/imx6/patches-3.10/111-gw54xx.patch [deleted file]
target/linux/imx6/patches-3.10/112-gw51xx.patch [deleted file]
target/linux/imx6/patches-3.10/113-gw52xx.patch [deleted file]
target/linux/imx6/patches-3.10/114-gw53xx.patch [deleted file]
target/linux/imx6/profiles/120-gateworks.mk

index 3368d45..07f0acd 100644 (file)
 
 /dts-v1/;
 #include "imx6dl.dtsi"
+#include "imx6qdl-gw51xx.dtsi"
 
 / {
        model = "Gateworks Ventana i.MX6 DualLite GW51XX";
        compatible = "gw,imx6dl-gw51xx", "gw,ventana", "fsl,imx6dl";
-
-       /* these are used by bootloader for disabling nodes */
-       aliases {
-               can0 = &can1;
-               ethernet0 = &fec;
-               i2c0 = &i2c1;
-               i2c1 = &i2c2;
-               i2c2 = &i2c3;
-               led0 = &led0;
-               led1 = &led1;
-               nand = &gpmi;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
-       };
-
-       memory {
-               reg = <0x10000000 0x20000000>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led0: user1 {
-                       label = "user1";
-                       gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
-                       default-state = "on";
-                       linux,default-trigger = "heartbeat";
-               };
-
-               led1: user2 {
-                       label = "user2";
-                       gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
-                       default-state = "off";
-               };
-       };
-
-       regulators {
-               compatible = "simple-bus";
-
-               reg_3p3v: 3p3v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "3P3V";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-
-               reg_5p0v: 5p0v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "5P0V";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
-
-               reg_usb_otg_vbus: usb_otg_vbus {
-                       compatible = "regulator-fixed";
-                       regulator-name = "usb_otg_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio3 22 0>;
-                       enable-active-high;
-               };
-       };
-};
-
-&fec {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_enet_1>;
-       phy-mode = "rgmii";
-       phy-reset-gpios = <&gpio1 30 0>;
-       status = "okay";
-};
-
-&gpmi {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gpmi_nand_2>;
-       status = "okay";
-};
-
-&i2c1 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1_1>;
-       status = "okay";
-
-       eeprom1: eeprom@50 {
-               compatible = "atmel,24c02";
-               reg = <0x50>;
-               pagesize = <16>;
-       };
-
-       eeprom2: eeprom@51 {
-               compatible = "atmel,24c02";
-               reg = <0x51>;
-               pagesize = <16>;
-       };
-
-       eeprom3: eeprom@52 {
-               compatible = "atmel,24c02";
-               reg = <0x52>;
-               pagesize = <16>;
-       };
-
-       eeprom4: eeprom@53 {
-               compatible = "atmel,24c02";
-               reg = <0x53>;
-               pagesize = <16>;
-       };
-
-       gpio: pca9555@23 {
-               compatible = "nxp,pca9555";
-               reg = <0x23>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
-
-       hwmon: gsc@29 {
-               compatible = "gw,gsp";
-               reg = <0x29>;
-       };
-
-       rtc: ds1672@68 {
-               compatible = "dallas,ds1672";
-               reg = <0x68>;
-       };
-};
-
-&i2c2 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2_2>;
-       status = "okay";
-
-       pmic: ltc3676@3c {
-               compatible = "ltc,ltc3676";
-               reg = <0x3c>;
-
-               regulators {
-                       sw1_reg: ltc3676__sw1 {
-                               regulator-min-microvolt = <1175000>;
-                               regulator-max-microvolt = <1175000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw2_reg: ltc3676__sw2 {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw3_reg: ltc3676__sw3 {
-                               regulator-min-microvolt = <1175000>;
-                               regulator-max-microvolt = <1175000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw4_reg: ltc3676__sw4 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo2_reg: ltc3676__ldo2 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo4_reg: ltc3676__ldo4 {
-                               regulator-min-microvolt = <3000000>;
-                               regulator-max-microvolt = <3000000>;
-                       };
-               };
-       };
-};
-
-&i2c3 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c3_2>;
-       status = "okay";
-
-       videoin: adv7180@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-       };
 };
 
 &iomuxc {
                };
        };
 };
-
-&pcie {
-       reset-gpio = <&gpio1 0 0>;
-       status = "okay";
-};
-
-&uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_2>;
-       status = "okay";
-};
-
-&uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2_1>;
-       status = "okay";
-};
-
-&uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart3_1>;
-       status = "okay";
-};
-
-&uart5 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart5_1>;
-       status = "okay";
-};
-
-&usbotg {
-       vbus-supply = <&reg_usb_otg_vbus>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usbotg_1>;
-       disable-over-current;
-       status = "okay";
-};
-
-&usbh1 {
-       status = "okay";
-};
index eef42ed..cafbc06 100644 (file)
 
 /dts-v1/;
 #include "imx6dl.dtsi"
+#include "imx6qdl-gw52xx.dtsi"
 
 / {
        model = "Gateworks Ventana i.MX6 DualLite GW52XX";
        compatible = "gw,imx6dl-gw52xx", "gw,ventana", "fsl,imx6dl";
-
-       /* these are used by bootloader for disabling nodes */
-       aliases {
-               can0 = &can1;
-               ethernet0 = &fec;
-               i2c0 = &i2c1;
-               i2c1 = &i2c2;
-               i2c2 = &i2c3;
-               led0 = &led0;
-               led1 = &led1;
-               led2 = &led2;
-               nand = &gpmi;
-               ssi0 = &ssi1;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
-               usdhc2 = &usdhc3;
-       };
-
-       memory {
-               reg = <0x10000000 0x20000000>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led0: user1 {
-                       label = "user1";
-                       gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
-                       default-state = "on";
-                       linux,default-trigger = "heartbeat";
-               };
-
-               led1: user2 {
-                       label = "user2";
-                       gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
-                       default-state = "off";
-               };
-
-               led2: user3 {
-                       label = "user3";
-                       gpios = <&gpio4 15 1>; /* 111 - MX6_LOCLED# */
-                       default-state = "off";
-               };
-       };
-
-       regulators {
-               compatible = "simple-bus";
-
-               reg_1p0v: 1p0v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "1P0V";
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1000000>;
-                       regulator-always-on;
-               };
-
-               /* remove this fixed regulator once ltc3676__sw2 driver available */
-               reg_1p8v: 1p8v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "1P8V";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-               };
-
-               reg_3p3v: 3p3v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "3P3V";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-
-               reg_5p0v: 5p0v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "5P0V";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
-
-               reg_usb_otg_vbus: usb_otg_vbus {
-                       compatible = "regulator-fixed";
-                       regulator-name = "usb_otg_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio3 22 0>;
-                       enable-active-high;
-               };
-       };
-
-       sound {
-               compatible = "fsl,imx6q-sabrelite-sgtl5000",
-                            "fsl,imx-audio-sgtl5000";
-               model = "imx6q-sabrelite-sgtl5000";
-               ssi-controller = <&ssi1>;
-               audio-codec = <&codec>;
-               audio-routing =
-                       "MIC_IN", "Mic Jack",
-                       "Mic Jack", "Mic Bias",
-                       "Headphone Jack", "HP_OUT";
-               mux-int-port = <1>;
-               mux-ext-port = <4>;
-       };
-};
-
-&audmux {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_audmux_1>;
-       status = "okay";
-};
-
-&can1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_flexcan1_1>;
-       status = "okay";
-};
-
-&fec {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_enet_1>;
-       phy-mode = "rgmii";
-       phy-reset-gpios = <&gpio1 30 0>;
-       status = "okay";
-};
-
-&gpmi {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gpmi_nand_2>;
-       status = "okay";
-};
-
-&i2c1 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1_1>;
-       status = "okay";
-
-       eeprom1: eeprom@50 {
-               compatible = "atmel,24c02";
-               reg = <0x50>;
-               pagesize = <16>;
-       };
-
-       eeprom2: eeprom@51 {
-               compatible = "atmel,24c02";
-               reg = <0x51>;
-               pagesize = <16>;
-       };
-
-       eeprom3: eeprom@52 {
-               compatible = "atmel,24c02";
-               reg = <0x52>;
-               pagesize = <16>;
-       };
-
-       eeprom4: eeprom@53 {
-               compatible = "atmel,24c02";
-               reg = <0x53>;
-               pagesize = <16>;
-       };
-
-       gpio: pca9555@23 {
-               compatible = "nxp,pca9555";
-               reg = <0x23>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
-
-       hwmon: gsc@29 {
-               compatible = "gw,gsp";
-               reg = <0x29>;
-       };
-
-       rtc: ds1672@68 {
-               compatible = "dallas,ds1672";
-               reg = <0x68>;
-       };
-};
-
-&i2c2 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2_2>;
-       status = "okay";
-
-       pciswitch: pex8609@3f {
-               compatible = "plx,pex8609";
-               reg = <0x3f>;
-       };
-
-       pmic: ltc3676@3c {
-               compatible = "ltc,ltc3676";
-               reg = <0x3c>;
-
-               regulators {
-                       sw1_reg: ltc3676__sw1 {
-                               regulator-min-microvolt = <1175000>;
-                               regulator-max-microvolt = <1175000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw2_reg: ltc3676__sw2 {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw3_reg: ltc3676__sw3 {
-                               regulator-min-microvolt = <1175000>;
-                               regulator-max-microvolt = <1175000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw4_reg: ltc3676__sw4 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo2_reg: ltc3676__ldo2 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo3_reg: ltc3676__ldo3 {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo4_reg: ltc3676__ldo4 {
-                               regulator-min-microvolt = <3000000>;
-                               regulator-max-microvolt = <3000000>;
-                       };
-               };
-       };
-};
-
-&i2c3 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c3_2>;
-       status = "okay";
-
-       accelerometer: fxos8700@1e {
-               compatible = "fsl,fxos8700";
-               reg = <0x13>;
-       };
-
-       codec: sgtl5000@0a {
-               compatible = "fsl,sgtl5000";
-               reg = <0x0a>;
-               clocks = <&clks 169>;
-               VDDA-supply = <&reg_1p8v>;
-               VDDIO-supply = <&reg_3p3v>;
-       };
-
-       touchscreen: egalax_ts@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               interrupt-parent = <&gpio7>;
-               interrupts = <12 2>; /* gpio7_12 active low */
-               wakeup-gpios = <&gpio7 12 0>;
-       };
-
-       videoin: adv7180@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-       };
 };
 
 &iomuxc {
                };
        };
 };
-
-&ldb {
-       status = "okay";
-       lvds-channel@0 {
-               crtcs = <&ipu1 0>, <&ipu1 1>;
-       };
-};
-
-&pcie {
-       reset-gpio = <&gpio1 29 0>;
-       status = "okay";
-};
-
-&ssi1 {
-       fsl,mode = "i2s-slave";
-       status = "okay";
-};
-
-&uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_2>;
-       status = "okay";
-};
-
-&uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2_1>;
-       status = "okay";
-};
-
-&uart5 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart5_1>;
-       status = "okay";
-};
-
-&usbotg {
-       vbus-supply = <&reg_usb_otg_vbus>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usbotg_1>;
-       disable-over-current;
-       status = "okay";
-};
-
-&usbh1 {
-       status = "okay";
-};
-
-&usdhc3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usdhc3_2>;
-       cd-gpios = <&gpio7 0 0>;
-       vmmc-supply = <&reg_3p3v>;
-       status = "okay";
-};
index 99d3d4c..fe2b029 100644 (file)
 
 /dts-v1/;
 #include "imx6dl.dtsi"
+#include "imx6qdl-gw53xx.dtsi"
 
 / {
        model = "Gateworks Ventana i.MX6 DualLite GW53XX";
        compatible = "gw,imx6dl-gw53xx", "gw,ventana", "fsl,imx6dl";
-
-       /* these are used by bootloader for disabling nodes */
-       aliases {
-               can0 = &can1;
-               ethernet0 = &fec;
-               ethernet1 = &eth1;
-               i2c0 = &i2c1;
-               i2c1 = &i2c2;
-               i2c2 = &i2c3;
-               led0 = &led0;
-               led1 = &led1;
-               led2 = &led2;
-               nand = &gpmi;
-               sky2 = &eth1;
-               ssi0 = &ssi1;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
-               usdhc2 = &usdhc3;
-       };
-
-       chosen {
-               bootargs = "console=ttymxc1,115200";
-       };
-
-       memory {
-               reg = <0x10000000 0x40000000>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led0: user1 {
-                       label = "user1";
-                       gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
-                       default-state = "on";
-                       linux,default-trigger = "heartbeat";
-               };
-
-               led1: user2 {
-                       label = "user2";
-                       gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
-                       default-state = "off";
-               };
-
-               led2: user3 {
-                       label = "user3";
-                       gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
-                       default-state = "off";
-               };
-       };
-
-       regulators {
-               compatible = "simple-bus";
-
-               reg_1p0v: 1p0v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "1P0V";
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1000000>;
-                       regulator-always-on;
-               };
-
-               /* remove this fixed regulator once ltc3676__sw2 driver available */
-               reg_1p8v: 1p8v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "1P8V";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-               };
-
-               reg_3p3v: 3p3v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "3P3V";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-
-               reg_usb_h1_vbus: usb_h1_vbus {
-                       compatible = "regulator-fixed";
-                       regulator-name = "usb_h1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
-
-               reg_usb_otg_vbus: usb_otg_vbus {
-                       compatible = "regulator-fixed";
-                       regulator-name = "usb_otg_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio3 22 0>;
-                       enable-active-high;
-               };
-       };
-
-       sound {
-               compatible = "fsl,imx6q-sabrelite-sgtl5000",
-                            "fsl,imx-audio-sgtl5000";
-               model = "imx6q-sabrelite-sgtl5000";
-               ssi-controller = <&ssi1>;
-               audio-codec = <&codec>;
-               audio-routing =
-                       "MIC_IN", "Mic Jack",
-                       "Mic Jack", "Mic Bias",
-                       "Headphone Jack", "HP_OUT";
-               mux-int-port = <1>;
-               mux-ext-port = <4>;
-       };
-};
-
-&audmux {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_audmux_1>;
-       status = "okay";
-};
-
-&can1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_flexcan1_1>;
-       status = "okay";
-};
-
-&fec {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_enet_1>;
-       phy-mode = "rgmii";
-       phy-reset-gpios = <&gpio1 30 0>;
-       status = "okay";
-};
-
-&gpmi {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gpmi_nand_2>;
-       status = "okay";
-};
-
-&i2c1 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1_1>;
-       status = "okay";
-
-       eeprom1: eeprom@50 {
-               compatible = "atmel,24c02";
-               reg = <0x50>;
-               pagesize = <16>;
-       };
-
-       eeprom2: eeprom@51 {
-               compatible = "atmel,24c02";
-               reg = <0x51>;
-               pagesize = <16>;
-       };
-
-       eeprom3: eeprom@52 {
-               compatible = "atmel,24c02";
-               reg = <0x52>;
-               pagesize = <16>;
-       };
-
-       eeprom4: eeprom@53 {
-               compatible = "atmel,24c02";
-               reg = <0x53>;
-               pagesize = <16>;
-       };
-
-       gpio: pca9555@23 {
-               compatible = "nxp,pca9555";
-               reg = <0x23>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
-
-       hwmon: gsc@29 {
-               compatible = "gw,gsp";
-               reg = <0x29>;
-       };
-
-       rtc: ds1672@68 {
-               compatible = "dallas,ds1672";
-               reg = <0x68>;
-       };
-};
-
-&i2c2 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2_2>;
-       status = "okay";
-
-       pciswitch: pex8609@3f {
-               compatible = "plx,pex8609";
-               reg = <0x3f>;
-       };
-
-       pmic: ltc3676@3c {
-               compatible = "ltc,ltc3676";
-               reg = <0x3c>;
-
-               regulators {
-                       sw1_reg: ltc3676__sw1 {
-                               regulator-min-microvolt = <1175000>;
-                               regulator-max-microvolt = <1175000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw2_reg: ltc3676__sw2 {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw3_reg: ltc3676__sw3 {
-                               regulator-min-microvolt = <1175000>;
-                               regulator-max-microvolt = <1175000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw4_reg: ltc3676__sw4 {
-                               regulator-min-microvolt = <1500000>;
-                               regulator-max-microvolt = <1500000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo2_reg: ltc3676__ldo2 {
-                               regulator-min-microvolt = <2500000>;
-                               regulator-max-microvolt = <2500000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo3_reg: ltc3676__ldo3 {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <1800000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       ldo4_reg: ltc3676__ldo4 {
-                               regulator-min-microvolt = <3000000>;
-                               regulator-max-microvolt = <3000000>;
-                       };
-               };
-       };
-};
-
-&i2c3 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c3_2>;
-       status = "okay";
-
-       accelerometer: fxos8700@1e {
-               compatible = "fsl,fxos8700";
-               reg = <0x1e>;
-       };
-
-       codec: sgtl5000@0a {
-               compatible = "fsl,sgtl5000";
-               reg = <0x0a>;
-               clocks = <&clks 169>;
-               VDDA-supply = <&reg_1p8v>;
-               VDDIO-supply = <&reg_3p3v>;
-       };
-
-       hdmiin: adv7611@4c {
-               compatible = "adi,adv7611";
-               reg = <0x4c>;
-       };
-
-       touchscreen: egalax_ts@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               interrupt-parent = <&gpio7>;
-               interrupts = <12 2>; /* gpio7_12 active low */
-               wakeup-gpios = <&gpio7 12 0>;
-       };
-
-       videoout: adv7393@2a {
-               compatible = "adi,adv7393";
-               reg = <0x2a>;
-       };
-
-       videoin: adv7180@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-       };
 };
 
 &iomuxc {
                };
        };
 };
-
-&ldb {
-       status = "okay";
-       lvds-channel@0 {
-               crtcs = <&ipu1 0>, <&ipu1 1>;
-       };
-};
-
-&pcie {
-       reset-gpio = <&gpio1 29 0>;
-       status = "okay";
-
-       eth1: sky2@8 { /* MAC/PHY on bus 8 */
-               compatible = "marvell,sky2";
-               /* Filled in by U-Boot */
-               mac-address = [ 00 00 00 00 00 00 ];
-       };
-};
-
-&ssi1 {
-       fsl,mode = "i2s-slave";
-       status = "okay";
-};
-
-&uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_2>;
-       status = "okay";
-};
-
-&uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2_1>;
-       status = "okay";
-};
-
-&uart5 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart5_1>;
-       status = "okay";
-};
-
-&usbotg {
-       vbus-supply = <&reg_usb_otg_vbus>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usbotg_1>;
-       disable-over-current;
-       status = "okay";
-};
-
-&usbh1 {
-       vbus-supply = <&reg_usb_h1_vbus>;
-       status = "okay";
-};
-
-&usdhc3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usdhc3_2>;
-       cd-gpios = <&gpio7 0 0>;
-       vmmc-supply = <&reg_3p3v>;
-       status = "okay";
-};
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw54xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6dl-gw54xx.dts
new file mode 100644 (file)
index 0000000..6a0ad02
--- /dev/null
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013 Gateworks Corporation
+ *
+ * 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
+ */
+
+/dts-v1/;
+#include "imx6dl.dtsi"
+#include "imx6qdl-gw54xx.dtsi"
+
+/ {
+       model = "Gateworks Ventana i.MX6 DualLite GW54XX";
+       compatible = "gw,imx6dl-gw54xx", "gw,ventana", "fsl,imx6dl";
+};
+
+&iomuxc {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hog>;
+
+       hog {
+               pinctrl_hog: hoggrp {
+                       fsl,pins = <
+                               MX6DL_PAD_EIM_D22__GPIO3_IO22    0x80000000 /* OTG_PWR_EN */
+                               MX6DL_PAD_EIM_D19__GPIO3_IO19    0x80000000 /* SPINOR_CS0# */
+                               MX6DL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000 /* PCIE IRQ */
+                               MX6DL_PAD_ENET_TXD1__GPIO1_IO29  0x80000000 /* PCIE RST */
+                               MX6DL_PAD_GPIO_0__CCM_CLKO1      0x000130b0 /* AUD4_MCK */
+                               MX6DL_PAD_GPIO_2__GPIO1_IO02     0x80000000 /* CAN_STBY */
+                               MX6DL_PAD_GPIO_17__GPIO7_IO12    0x80000000 /* TOUCH_IRQ# */
+                               MX6DL_PAD_KEY_COL0__GPIO4_IO06   0x80000000 /* user1 led */
+                               MX6DL_PAD_KEY_ROW0__GPIO4_IO07   0x80000000 /* user2 led */
+                               MX6DL_PAD_KEY_ROW4__GPIO4_IO15   0x80000000 /* user3 led */
+                               MX6DL_PAD_SD1_DAT0__GPIO1_IO16   0x80000000 /* USBHUB_RST# */
+                               MX6DL_PAD_SD1_DAT3__GPIO1_IO21   0x80000000 /* MIPI_DIO */
+                        >;
+               };
+       };
+};
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw51xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw51xx.dts
new file mode 100644 (file)
index 0000000..4c2f8c4
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013 Gateworks Corporation
+ *
+ * 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
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-gw51xx.dtsi"
+
+/ {
+       model = "Gateworks Ventana i.MX6 Quad GW51XX";
+       compatible = "gw,imx6q-gw51xx", "gw,ventana", "fsl,imx6q";
+};
+
+&iomuxc {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hog>;
+
+       hog {
+               pinctrl_hog: hoggrp {
+                       fsl,pins = <
+                               MX6Q_PAD_EIM_A19__GPIO2_IO19   0x80000000 /* MEZZ_DIO0 */
+                               MX6Q_PAD_EIM_A20__GPIO2_IO18   0x80000000 /* MEZZ_DIO1 */
+                               MX6Q_PAD_EIM_D22__GPIO3_IO22   0x80000000 /* OTG_PWR_EN */
+                               MX6Q_PAD_ENET_TXD0__GPIO1_IO30 0x80000000 /* PHY Reset */
+                               MX6Q_PAD_GPIO_0__GPIO1_IO00    0x80000000 /* PCIE_RST# */
+                               MX6Q_PAD_KEY_COL0__GPIO4_IO06  0x80000000 /* user1 led */
+                               MX6Q_PAD_KEY_ROW0__GPIO4_IO07  0x80000000 /* user2 led */
+                        >;
+               };
+       };
+};
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw52xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw52xx.dts
new file mode 100644 (file)
index 0000000..18bf17d
--- /dev/null
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013 Gateworks Corporation
+ *
+ * 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
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-gw52xx.dtsi"
+
+/ {
+       model = "Gateworks Ventana i.MX6 Quad GW52XX";
+       compatible = "gw,imx6q-gw52xx", "gw,ventana", "fsl,imx6q";
+};
+
+&iomuxc {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hog>;
+
+       hog {
+               pinctrl_hog: hoggrp {
+                       fsl,pins = <
+                               MX6Q_PAD_EIM_A19__GPIO2_IO19   0x80000000 /* MEZZ_DIO0 */
+                               MX6Q_PAD_EIM_A20__GPIO2_IO18   0x80000000 /* MEZZ_DIO1 */
+                               MX6Q_PAD_EIM_D22__GPIO3_IO22   0x80000000 /* OTG_PWR_EN */
+                               MX6Q_PAD_EIM_D31__GPIO3_IO31   0x80000000 /* VIDDEC_PDN# */
+                               MX6Q_PAD_ENET_TXD0__GPIO1_IO30 0x80000000 /* PHY Reset */
+                               MX6Q_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 /* PCIE_RST# */
+                               MX6Q_PAD_ENET_RXD0__GPIO1_IO27 0x80000000 /* GPS_PWDN */
+                               MX6Q_PAD_ENET_RXD1__GPIO1_IO26 0x80000000 /* GPS_PPS */
+                               MX6Q_PAD_GPIO_0__CCM_CLKO1     0x000130b0 /* AUD4_MCK */
+                               MX6Q_PAD_GPIO_2__GPIO1_IO02    0x80000000 /* USB_SEL_PCI */
+                               MX6Q_PAD_GPIO_17__GPIO7_IO12   0x80000000 /* TOUCH_IRQ# */
+                               MX6Q_PAD_KEY_COL0__GPIO4_IO06  0x80000000 /* user1 led */
+                               MX6Q_PAD_KEY_ROW0__GPIO4_IO07  0x80000000 /* user2 led */
+                               MX6Q_PAD_KEY_ROW4__GPIO4_IO15  0x80000000 /* user3 led */
+                               MX6Q_PAD_SD2_CMD__GPIO1_IO11   0x80000000 /* LVDS_TCH# */
+                               MX6Q_PAD_SD3_DAT5__GPIO7_IO00  0x80000000 /* SD3_CD# */
+                               MX6Q_PAD_SD4_DAT3__GPIO2_IO11  0x80000000 /* UART2_EN# */
+                        >;
+               };
+       };
+};
+
+&sata {
+        status = "okay";
+};
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw53xx.dts b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6q-gw53xx.dts
new file mode 100644 (file)
index 0000000..4453cb5
--- /dev/null
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2013 Gateworks Corporation
+ *
+ * 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
+ */
+
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-gw53xx.dtsi"
+
+/ {
+       model = "Gateworks Ventana i.MX6 Quad GW53XX";
+       compatible = "gw,imx6q-gw53xx", "gw,ventana", "fsl,imx6q";
+};
+
+&iomuxc {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hog>;
+
+       hog {
+               pinctrl_hog: hoggrp {
+                       fsl,pins = <
+                               MX6Q_PAD_EIM_A19__GPIO2_IO19   0x80000000 /* MEZZ_DIO0 */
+                               MX6Q_PAD_EIM_A20__GPIO2_IO18   0x80000000 /* MEZZ_DIO1 */
+                               MX6Q_PAD_EIM_D22__GPIO3_IO22   0x80000000 /* OTG_PWR_EN */
+                               MX6Q_PAD_EIM_D31__GPIO3_IO31   0x80000000 /* VIDDEC_PDN# */
+                               MX6Q_PAD_ENET_TXD0__GPIO1_IO30 0x80000000 /* PHY Reset */
+                               MX6Q_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 /* PCIE_RST# */
+                               MX6Q_PAD_ENET_RXD0__GPIO1_IO27 0x80000000 /* GPS_PWDN */
+                               MX6Q_PAD_ENET_RXD1__GPIO1_IO26 0x80000000 /* GPS_PPS */
+                               MX6Q_PAD_GPIO_0__CCM_CLKO1     0x000130b0 /* AUD4_MCK */
+                               MX6Q_PAD_GPIO_17__GPIO7_IO12   0x80000000 /* TOUCH_IRQ# */
+                               MX6Q_PAD_KEY_COL0__GPIO4_IO06  0x80000000 /* user1 led */
+                               MX6Q_PAD_KEY_ROW0__GPIO4_IO07  0x80000000 /* user2 led */
+                               MX6Q_PAD_KEY_ROW4__GPIO4_IO15  0x80000000 /* user3 led */
+                               MX6Q_PAD_SD2_CMD__GPIO1_IO11   0x80000000 /* LVDS_TCH# */
+                               MX6Q_PAD_SD3_DAT5__GPIO7_IO00  0x80000000 /* SD3_CD# */
+                               MX6Q_PAD_SD4_DAT3__GPIO2_IO11  0x80000000 /* UART2_EN# */
+                        >;
+               };
+       };
+};
+
+&sata {
+        status = "okay";
+};
index 825d952..9677135 100644 (file)
                bootargs = "console=ttymxc1,115200";
        };
 
-       memory {
-               reg = <0x10000000 0x40000000>;
-       };
-
        leds {
                compatible = "gpio-leds";
 
                };
        };
 
+       memory {
+               reg = <0x10000000 0x40000000>;
+       };
+
        regulators {
                compatible = "simple-bus";
 
 
 &uart2 {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2_2>;
-       status = "okay";
-};
-
-&uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart3_1>;
+       pinctrl-0 = <&pinctrl_uart2_3>;
        status = "okay";
 };
 
index 828fc81..c851339 100644 (file)
 
 /dts-v1/;
 #include "imx6q.dtsi"
+#include "imx6qdl-gw54xx.dtsi"
 
 / {
        model = "Gateworks Ventana i.MX6 Quad GW54XX";
        compatible = "gw,imx6q-gw54xx", "gw,ventana", "fsl,imx6q";
-
-       /* these are used by bootloader for disabling nodes */
-       aliases {
-               can0 = &can1;
-               ethernet0 = &fec;
-               ethernet1 = &eth1;
-               i2c0 = &i2c1;
-               i2c1 = &i2c2;
-               i2c2 = &i2c3;
-               led0 = &led0;
-               led1 = &led1;
-               led2 = &led2;
-               nand = &gpmi;
-               sky2 = &eth1;
-               ssi0 = &ssi1;
-               usb0 = &usbh1;
-               usb1 = &usbotg;
-               usdhc2 = &usdhc3;
-       };
-
-       chosen {
-               bootargs = "console=ttymxc1,115200";
-       };
-
-       memory {
-               reg = <0x10000000 0x40000000>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led0: user1 {
-                       label = "user1";
-                       gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
-                       default-state = "on";
-                       linux,default-trigger = "heartbeat";
-               };
-
-               led1: user2 {
-                       label = "user2";
-                       gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
-                       default-state = "off";
-               };
-
-               led2: user3 {
-                       label = "user3";
-                       gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
-                       default-state = "off";
-               };
-       };
-
-       regulators {
-               compatible = "simple-bus";
-
-               reg_1p0v: 1p0v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "1P0V";
-                       regulator-min-microvolt = <1000000>;
-                       regulator-max-microvolt = <1000000>;
-                       regulator-always-on;
-               };
-
-               reg_3p3v: 3p3v {
-                       compatible = "regulator-fixed";
-                       regulator-name = "3P3V";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
-
-               reg_usb_h1_vbus: usb_h1_vbus {
-                       compatible = "regulator-fixed";
-                       regulator-name = "usb_h1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
-
-               reg_usb_otg_vbus: usb_otg_vbus {
-                       compatible = "regulator-fixed";
-                       regulator-name = "usb_otg_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio3 22 0>;
-                       enable-active-high;
-               };
-       };
-
-       sound {
-               compatible = "fsl,imx6q-sabrelite-sgtl5000",
-                            "fsl,imx-audio-sgtl5000";
-               model = "imx6q-sabrelite-sgtl5000";
-               ssi-controller = <&ssi1>;
-               audio-codec = <&codec>;
-               audio-routing =
-                       "MIC_IN", "Mic Jack",
-                       "Mic Jack", "Mic Bias",
-                       "Headphone Jack", "HP_OUT";
-               mux-int-port = <1>;
-               mux-ext-port = <4>;
-       };
-};
-
-&audmux {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_audmux_1>;
-       status = "okay";
-};
-
-&can1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_flexcan1_1>;
-       status = "okay";
-};
-
-&fec {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_enet_1>;
-       phy-mode = "rgmii";
-       phy-reset-gpios = <&gpio1 30 0>;
-       status = "okay";
-};
-
-&gpmi {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_gpmi_nand_2>;
-       status = "okay";
-};
-
-&i2c1 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c1_1>;
-       status = "okay";
-
-       eeprom1: eeprom@50 {
-               compatible = "atmel,24c02";
-               reg = <0x50>;
-               pagesize = <16>;
-       };
-
-       eeprom2: eeprom@51 {
-               compatible = "atmel,24c02";
-               reg = <0x51>;
-               pagesize = <16>;
-       };
-
-       eeprom3: eeprom@52 {
-               compatible = "atmel,24c02";
-               reg = <0x52>;
-               pagesize = <16>;
-       };
-
-       eeprom4: eeprom@53 {
-               compatible = "atmel,24c02";
-               reg = <0x53>;
-               pagesize = <16>;
-       };
-
-       gpio: pca9555@23 {
-               compatible = "nxp,pca9555";
-               reg = <0x23>;
-               gpio-controller;
-               #gpio-cells = <2>;
-       };
-
-       hwmon: gsc@29 {
-               compatible = "gw,gsp";
-               reg = <0x29>;
-       };
-
-       rtc: ds1672@68 {
-               compatible = "dallas,ds1672";
-               reg = <0x68>;
-       };
-};
-
-&i2c2 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2_2>;
-       status = "okay";
-
-       pmic: pfuze100@08 {
-               compatible = "fsl,pfuze100";
-               reg = <0x08>;
-
-               regulators {
-                       sw1a_reg: sw1ab {
-                               regulator-min-microvolt = <300000>;
-                               regulator-max-microvolt = <1875000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                               regulator-ramp-delay = <6250>;
-                       };
-
-                       sw1c_reg: sw1c {
-                               regulator-min-microvolt = <300000>;
-                               regulator-max-microvolt = <1875000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                               regulator-ramp-delay = <6250>;
-                       };
-
-                       sw2_reg: sw2 {
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <3950000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw3a_reg: sw3a {
-                               regulator-min-microvolt = <400000>;
-                               regulator-max-microvolt = <1975000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw3b_reg: sw3b {
-                               regulator-min-microvolt = <400000>;
-                               regulator-max-microvolt = <1975000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       sw4_reg: sw4 {
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <3300000>;
-                       };
-
-                       swbst_reg: swbst {
-                               regulator-min-microvolt = <5000000>;
-                               regulator-max-microvolt = <5150000>;
-                       };
-
-                       snvs_reg: vsnvs {
-                               regulator-min-microvolt = <1000000>;
-                               regulator-max-microvolt = <3000000>;
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       vref_reg: vrefddr {
-                               regulator-boot-on;
-                               regulator-always-on;
-                       };
-
-                       vgen1_reg: vgen1 {
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1550000>;
-                       };
-
-                       vgen2_reg: vgen2 {
-                               regulator-min-microvolt = <800000>;
-                               regulator-max-microvolt = <1550000>;
-                       };
-
-                       vgen3_reg: vgen3 {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                       };
-
-                       vgen4_reg: vgen4 {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       vgen5_reg: vgen5 {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-
-                       vgen6_reg: vgen6 {
-                               regulator-min-microvolt = <1800000>;
-                               regulator-max-microvolt = <3300000>;
-                               regulator-always-on;
-                       };
-               };
-       };
-
-       pciswitch: pex8609@3f {
-               compatible = "plx,pex8609";
-               reg = <0x3f>;
-       };
-
-       pciclkgen: si52147@6b {
-               compatible = "sil,si52147";
-               reg = <0x6b>;
-       };
-};
-
-&i2c3 {
-       clock-frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c3_2>;
-       status = "okay";
-
-       accelerometer: fxos8700@1e {
-               compatible = "fsl,fxos8700";
-               reg = <0x1e>;
-       };
-
-       codec: sgtl5000@0a {
-               compatible = "fsl,sgtl5000";
-               reg = <0x0a>;
-               clocks = <&clks 169>;
-               VDDA-supply = <&sw4_reg>;
-               VDDIO-supply = <&reg_3p3v>;
-       };
-
-       hdmiin: adv7611@4c {
-               compatible = "adi,adv7611";
-               reg = <0x4c>;
-       };
-
-       touchscreen: egalax_ts@04 {
-               compatible = "eeti,egalax_ts";
-               reg = <0x04>;
-               interrupt-parent = <&gpio7>;
-               interrupts = <12 2>; /* gpio7_12 active low */
-               wakeup-gpios = <&gpio7 12 0>;
-       };
-
-       videoout: adv7393@2a {
-               compatible = "adi,adv7393";
-               reg = <0x2a>;
-       };
-
-       videoin: adv7180@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
-       };
 };
 
 &iomuxc {
        };
 };
 
-&ldb {
+&ldb {  
        status = "okay";
        lvds-channel@0 {
                crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;
        };
 };
 
-&pcie {
-       reset-gpio = <&gpio1 29 0>;
-       status = "okay";
-
-       eth1: sky2@8 { /* MAC/PHY on bus 8 */
-               compatible = "marvell,sky2";
-               /* Filled in by U-Boot */
-               mac-address = [ 00 00 00 00 00 00 ];
-       };
-};
-
 &sata {
        status = "okay";
 };
-
-&ssi1 {
-       fsl,mode = "i2s-slave";
-       status = "okay";
-};
-
-&uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1_2>;
-       status = "okay";
-};
-
-&uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2_2>;
-       status = "okay";
-};
-
-&uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart3_1>;
-       status = "okay";
-};
-
-&uart5 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart5_1>;
-       status = "okay";
-};
-
-&usbotg {
-       vbus-supply = <&reg_usb_otg_vbus>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usbotg_1>;
-       disable-over-current;
-       status = "okay";
-};
-
-&usbh1 {
-       vbus-supply = <&reg_usb_h1_vbus>;
-       status = "okay";
-};
-
-&usdhc3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usdhc3_2>;
-       cd-gpios = <&gpio7 0 0>;
-       vmmc-supply = <&reg_3p3v>;
-       status = "okay";
-};
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
new file mode 100644 (file)
index 0000000..146a337
--- /dev/null
@@ -0,0 +1,245 @@
+/*
+ * Copyright 2013 Gateworks Corporation
+ *
+ * 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
+ */
+
+/ {
+       /* these are used by bootloader for disabling nodes */
+       aliases {
+               can0 = &can1;
+               ethernet0 = &fec;
+               i2c0 = &i2c1;
+               i2c1 = &i2c2;
+               i2c2 = &i2c3;
+               led0 = &led0;
+               led1 = &led1;
+               nand = &gpmi;
+               usb0 = &usbh1;
+               usb1 = &usbotg;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led0: user1 {
+                       label = "user1";
+                       gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
+                       default-state = "on";
+                       linux,default-trigger = "heartbeat";
+               };
+
+               led1: user2 {
+                       label = "user2";
+                       gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
+                       default-state = "off";
+               };
+       };
+
+       memory {
+               reg = <0x10000000 0x20000000>;
+       };
+
+       regulators {
+               compatible = "simple-bus";
+
+               reg_3p3v: 3p3v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "3P3V";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_5p0v: 5p0v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "5P0V";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       regulator-always-on;
+               };
+
+               reg_usb_otg_vbus: usb_otg_vbus {
+                       compatible = "regulator-fixed";
+                       regulator-name = "usb_otg_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio3 22 0>;
+                       enable-active-high;
+               };
+       };
+};
+
+&fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet_1>;
+       phy-mode = "rgmii";
+       phy-reset-gpios = <&gpio1 30 0>;
+       status = "okay";
+};
+
+&gpmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gpmi_nand_2>;
+       status = "okay";
+};
+
+&i2c1 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1_1>;
+       status = "okay";
+
+       eeprom1: eeprom@50 {
+               compatible = "atmel,24c02";
+               reg = <0x50>;
+               pagesize = <16>;
+       };
+
+       eeprom2: eeprom@51 {
+               compatible = "atmel,24c02";
+               reg = <0x51>;
+               pagesize = <16>;
+       };
+
+       eeprom3: eeprom@52 {
+               compatible = "atmel,24c02";
+               reg = <0x52>;
+               pagesize = <16>;
+       };
+
+       eeprom4: eeprom@53 {
+               compatible = "atmel,24c02";
+               reg = <0x53>;
+               pagesize = <16>;
+       };
+
+       gpio: pca9555@23 {
+               compatible = "nxp,pca9555";
+               reg = <0x23>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       hwmon: gsc@29 {
+               compatible = "gw,gsp";
+               reg = <0x29>;
+       };
+
+       rtc: ds1672@68 {
+               compatible = "dallas,ds1672";
+               reg = <0x68>;
+       };
+};
+
+&i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2_2>;
+       status = "okay";
+
+       pmic: ltc3676@3c {
+               compatible = "ltc,ltc3676";
+               reg = <0x3c>;
+
+               regulators {
+                       sw1_reg: ltc3676__sw1 {
+                               regulator-min-microvolt = <1175000>;
+                               regulator-max-microvolt = <1175000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw2_reg: ltc3676__sw2 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw3_reg: ltc3676__sw3 {
+                               regulator-min-microvolt = <1175000>;
+                               regulator-max-microvolt = <1175000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw4_reg: ltc3676__sw4 {
+                               regulator-min-microvolt = <1500000>;
+                               regulator-max-microvolt = <1500000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo2_reg: ltc3676__ldo2 {
+                               regulator-min-microvolt = <2500000>;
+                               regulator-max-microvolt = <2500000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo4_reg: ltc3676__ldo4 {
+                               regulator-min-microvolt = <3000000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+               };
+       };
+};
+
+&i2c3 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3_2>;
+       status = "okay";
+
+       videoin: adv7180@20 {
+               compatible = "adi,adv7180";
+               reg = <0x20>;
+       };
+};
+
+&pcie {
+       reset-gpio = <&gpio1 0 0>;
+       status = "okay";
+};
+
+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_2>;
+       status = "okay";
+};
+
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2_3>;
+       status = "okay";
+};
+
+&uart3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart3_3>;
+       status = "okay";
+};
+
+&uart5 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart5_1>;
+       status = "okay";
+};
+
+&usbotg {
+       vbus-supply = <&reg_usb_otg_vbus>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbotg_1>;
+       disable-over-current;
+       status = "okay";
+};
+
+&usbh1 {
+       status = "okay";
+};
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
new file mode 100644 (file)
index 0000000..5524782
--- /dev/null
@@ -0,0 +1,344 @@
+/*
+ * Copyright 2013 Gateworks Corporation
+ *
+ * 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
+ */
+
+/ {
+       /* these are used by bootloader for disabling nodes */
+       aliases {
+               can0 = &can1;
+               ethernet0 = &fec;
+               i2c0 = &i2c1;
+               i2c1 = &i2c2;
+               i2c2 = &i2c3;
+               led0 = &led0;
+               led1 = &led1;
+               led2 = &led2;
+               nand = &gpmi;
+               ssi0 = &ssi1;
+               usb0 = &usbh1;
+               usb1 = &usbotg;
+               usdhc2 = &usdhc3;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led0: user1 {
+                       label = "user1";
+                       gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
+                       default-state = "on";
+                       linux,default-trigger = "heartbeat";
+               };
+
+               led1: user2 {
+                       label = "user2";
+                       gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
+                       default-state = "off";
+               };
+
+               led2: user3 {
+                       label = "user3";
+                       gpios = <&gpio4 15 1>; /* 111 - MX6_LOCLED# */
+                       default-state = "off";
+               };
+       };
+
+       memory {
+               reg = <0x10000000 0x20000000>;
+       };
+
+       regulators {
+               compatible = "simple-bus";
+
+               reg_1p0v: 1p0v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "1P0V";
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+                       regulator-always-on;
+               };
+
+               /* remove this fixed regulator once ltc3676__sw2 driver available */
+               reg_1p8v: 1p8v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "1P8V";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-always-on;
+               };
+
+               reg_3p3v: 3p3v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "3P3V";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_5p0v: 5p0v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "5P0V";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       regulator-always-on;
+               };
+
+               reg_usb_otg_vbus: usb_otg_vbus {
+                       compatible = "regulator-fixed";
+                       regulator-name = "usb_otg_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio3 22 0>;
+                       enable-active-high;
+               };
+       };
+
+       sound {
+               compatible = "fsl,imx6q-sabrelite-sgtl5000",
+                            "fsl,imx-audio-sgtl5000";
+               model = "imx6q-sabrelite-sgtl5000";
+               ssi-controller = <&ssi1>;
+               audio-codec = <&codec>;
+               audio-routing =
+                       "MIC_IN", "Mic Jack",
+                       "Mic Jack", "Mic Bias",
+                       "Headphone Jack", "HP_OUT";
+               mux-int-port = <1>;
+               mux-ext-port = <4>;
+       };
+};
+
+&audmux {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_audmux_1>;
+       status = "okay";
+};
+
+&can1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan1_1>;
+       status = "okay";
+};
+
+&fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet_1>;
+       phy-mode = "rgmii";
+       phy-reset-gpios = <&gpio1 30 0>;
+       status = "okay";
+};
+
+&gpmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gpmi_nand_2>;
+       status = "okay";
+};
+
+&i2c1 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1_1>;
+       status = "okay";
+
+       eeprom1: eeprom@50 {
+               compatible = "atmel,24c02";
+               reg = <0x50>;
+               pagesize = <16>;
+       };
+
+       eeprom2: eeprom@51 {
+               compatible = "atmel,24c02";
+               reg = <0x51>;
+               pagesize = <16>;
+       };
+
+       eeprom3: eeprom@52 {
+               compatible = "atmel,24c02";
+               reg = <0x52>;
+               pagesize = <16>;
+       };
+
+       eeprom4: eeprom@53 {
+               compatible = "atmel,24c02";
+               reg = <0x53>;
+               pagesize = <16>;
+       };
+
+       gpio: pca9555@23 {
+               compatible = "nxp,pca9555";
+               reg = <0x23>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       hwmon: gsc@29 {
+               compatible = "gw,gsp";
+               reg = <0x29>;
+       };
+
+       rtc: ds1672@68 {
+               compatible = "dallas,ds1672";
+               reg = <0x68>;
+       };
+};
+
+&i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2_2>;
+       status = "okay";
+
+       pciswitch: pex8609@3f {
+               compatible = "plx,pex8609";
+               reg = <0x3f>;
+       };
+
+       pmic: ltc3676@3c {
+               compatible = "ltc,ltc3676";
+               reg = <0x3c>;
+
+               regulators {
+                       sw1_reg: ltc3676__sw1 {
+                               regulator-min-microvolt = <1175000>;
+                               regulator-max-microvolt = <1175000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw2_reg: ltc3676__sw2 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw3_reg: ltc3676__sw3 {
+                               regulator-min-microvolt = <1175000>;
+                               regulator-max-microvolt = <1175000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw4_reg: ltc3676__sw4 {
+                               regulator-min-microvolt = <1500000>;
+                               regulator-max-microvolt = <1500000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo2_reg: ltc3676__ldo2 {
+                               regulator-min-microvolt = <2500000>;
+                               regulator-max-microvolt = <2500000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo3_reg: ltc3676__ldo3 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo4_reg: ltc3676__ldo4 {
+                               regulator-min-microvolt = <3000000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+               };
+       };
+};
+
+&i2c3 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3_2>;
+       status = "okay";
+
+       accelerometer: fxos8700@1e {
+               compatible = "fsl,fxos8700";
+               reg = <0x13>;
+       };
+
+       codec: sgtl5000@0a {
+               compatible = "fsl,sgtl5000";
+               reg = <0x0a>;
+               clocks = <&clks 169>;
+               VDDA-supply = <&reg_1p8v>;
+               VDDIO-supply = <&reg_3p3v>;
+       };
+
+       touchscreen: egalax_ts@04 {
+               compatible = "eeti,egalax_ts";
+               reg = <0x04>;
+               interrupt-parent = <&gpio7>;
+               interrupts = <12 2>; /* gpio7_12 active low */
+               wakeup-gpios = <&gpio7 12 0>;
+       };
+
+       videoin: adv7180@20 {
+               compatible = "adi,adv7180";
+               reg = <0x20>;
+       };
+};
+
+&ldb {
+       status = "okay";
+       lvds-channel@0 {
+               crtcs = <&ipu1 0>, <&ipu1 1>;
+       };
+};
+
+&pcie {
+       reset-gpio = <&gpio1 29 0>;
+       status = "okay";
+};
+
+&ssi1 {
+       fsl,mode = "i2s-slave";
+       status = "okay";
+};
+
+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_2>;
+       status = "okay";
+};
+
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2_3>;
+       status = "okay";
+};
+
+&uart5 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart5_1>;
+       status = "okay";
+};
+
+&usbotg {
+       vbus-supply = <&reg_usb_otg_vbus>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbotg_1>;
+       disable-over-current;
+       status = "okay";
+};
+
+&usbh1 {
+       status = "okay";
+};
+
+&usdhc3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc3_2>;
+       cd-gpios = <&gpio7 0 0>;
+       vmmc-supply = <&reg_3p3v>;
+       status = "okay";
+};
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
new file mode 100644 (file)
index 0000000..40e6b4e
--- /dev/null
@@ -0,0 +1,367 @@
+/*
+ * Copyright 2013 Gateworks Corporation
+ *
+ * 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
+ */
+
+/ {
+       /* these are used by bootloader for disabling nodes */
+       aliases {
+               can0 = &can1;
+               ethernet0 = &fec;
+               ethernet1 = &eth1;
+               i2c0 = &i2c1;
+               i2c1 = &i2c2;
+               i2c2 = &i2c3;
+               led0 = &led0;
+               led1 = &led1;
+               led2 = &led2;
+               nand = &gpmi;
+               sky2 = &eth1;
+               ssi0 = &ssi1;
+               usb0 = &usbh1;
+               usb1 = &usbotg;
+               usdhc2 = &usdhc3;
+       };
+
+       chosen {
+               bootargs = "console=ttymxc1,115200";
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led0: user1 {
+                       label = "user1";
+                       gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
+                       default-state = "on";
+                       linux,default-trigger = "heartbeat";
+               };
+
+               led1: user2 {
+                       label = "user2";
+                       gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
+                       default-state = "off";
+               };
+
+               led2: user3 {
+                       label = "user3";
+                       gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
+                       default-state = "off";
+               };
+       };
+
+       memory {
+               reg = <0x10000000 0x40000000>;
+       };
+
+       regulators {
+               compatible = "simple-bus";
+
+               reg_1p0v: 1p0v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "1P0V";
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+                       regulator-always-on;
+               };
+
+               /* remove this fixed regulator once ltc3676__sw2 driver available */
+               reg_1p8v: 1p8v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "1P8V";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       regulator-always-on;
+               };
+
+               reg_3p3v: 3p3v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "3P3V";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_usb_h1_vbus: usb_h1_vbus {
+                       compatible = "regulator-fixed";
+                       regulator-name = "usb_h1_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       regulator-always-on;
+               };
+
+               reg_usb_otg_vbus: usb_otg_vbus {
+                       compatible = "regulator-fixed";
+                       regulator-name = "usb_otg_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio3 22 0>;
+                       enable-active-high;
+               };
+       };
+
+       sound {
+               compatible = "fsl,imx6q-sabrelite-sgtl5000",
+                            "fsl,imx-audio-sgtl5000";
+               model = "imx6q-sabrelite-sgtl5000";
+               ssi-controller = <&ssi1>;
+               audio-codec = <&codec>;
+               audio-routing =
+                       "MIC_IN", "Mic Jack",
+                       "Mic Jack", "Mic Bias",
+                       "Headphone Jack", "HP_OUT";
+               mux-int-port = <1>;
+               mux-ext-port = <4>;
+       };
+};
+
+&audmux {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_audmux_1>;
+       status = "okay";
+};
+
+&can1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan1_1>;
+       status = "okay";
+};
+
+&fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet_1>;
+       phy-mode = "rgmii";
+       phy-reset-gpios = <&gpio1 30 0>;
+       status = "okay";
+};
+
+&gpmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gpmi_nand_2>;
+       status = "okay";
+};
+
+&i2c1 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1_1>;
+       status = "okay";
+
+       eeprom1: eeprom@50 {
+               compatible = "atmel,24c02";
+               reg = <0x50>;
+               pagesize = <16>;
+       };
+
+       eeprom2: eeprom@51 {
+               compatible = "atmel,24c02";
+               reg = <0x51>;
+               pagesize = <16>;
+       };
+
+       eeprom3: eeprom@52 {
+               compatible = "atmel,24c02";
+               reg = <0x52>;
+               pagesize = <16>;
+       };
+
+       eeprom4: eeprom@53 {
+               compatible = "atmel,24c02";
+               reg = <0x53>;
+               pagesize = <16>;
+       };
+
+       gpio: pca9555@23 {
+               compatible = "nxp,pca9555";
+               reg = <0x23>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       hwmon: gsc@29 {
+               compatible = "gw,gsp";
+               reg = <0x29>;
+       };
+
+       rtc: ds1672@68 {
+               compatible = "dallas,ds1672";
+               reg = <0x68>;
+       };
+};
+
+&i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2_2>;
+       status = "okay";
+
+       pciswitch: pex8609@3f {
+               compatible = "plx,pex8609";
+               reg = <0x3f>;
+       };
+
+       pmic: ltc3676@3c {
+               compatible = "ltc,ltc3676";
+               reg = <0x3c>;
+
+               regulators {
+                       sw1_reg: ltc3676__sw1 {
+                               regulator-min-microvolt = <1175000>;
+                               regulator-max-microvolt = <1175000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw2_reg: ltc3676__sw2 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw3_reg: ltc3676__sw3 {
+                               regulator-min-microvolt = <1175000>;
+                               regulator-max-microvolt = <1175000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw4_reg: ltc3676__sw4 {
+                               regulator-min-microvolt = <1500000>;
+                               regulator-max-microvolt = <1500000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo2_reg: ltc3676__ldo2 {
+                               regulator-min-microvolt = <2500000>;
+                               regulator-max-microvolt = <2500000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo3_reg: ltc3676__ldo3 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       ldo4_reg: ltc3676__ldo4 {
+                               regulator-min-microvolt = <3000000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+               };
+       };
+};
+
+&i2c3 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3_2>;
+       status = "okay";
+
+       accelerometer: fxos8700@1e {
+               compatible = "fsl,fxos8700";
+               reg = <0x1e>;
+       };
+
+       codec: sgtl5000@0a {
+               compatible = "fsl,sgtl5000";
+               reg = <0x0a>;
+               clocks = <&clks 169>;
+               VDDA-supply = <&reg_1p8v>;
+               VDDIO-supply = <&reg_3p3v>;
+       };
+
+       hdmiin: adv7611@4c {
+               compatible = "adi,adv7611";
+               reg = <0x4c>;
+       };
+
+       touchscreen: egalax_ts@04 {
+               compatible = "eeti,egalax_ts";
+               reg = <0x04>;
+               interrupt-parent = <&gpio7>;
+               interrupts = <12 2>; /* gpio7_12 active low */
+               wakeup-gpios = <&gpio7 12 0>;
+       };
+
+       videoout: adv7393@2a {
+               compatible = "adi,adv7393";
+               reg = <0x2a>;
+       };
+
+       videoin: adv7180@20 {
+               compatible = "adi,adv7180";
+               reg = <0x20>;
+       };
+};
+
+&ldb {
+       status = "okay";
+       lvds-channel@0 {
+               crtcs = <&ipu1 0>, <&ipu1 1>;
+       };
+};
+
+&pcie {
+       reset-gpio = <&gpio1 29 0>;
+       status = "okay";
+
+       eth1: sky2@8 { /* MAC/PHY on bus 8 */
+               compatible = "marvell,sky2";
+               /* Filled in by U-Boot */
+               mac-address = [ 00 00 00 00 00 00 ];
+       };
+};
+
+&ssi1 {
+       fsl,mode = "i2s-slave";
+       status = "okay";
+};
+
+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_2>;
+       status = "okay";
+};
+
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2_3>;
+       status = "okay";
+};
+
+&uart5 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart5_1>;
+       status = "okay";
+};
+
+&usbotg {
+       vbus-supply = <&reg_usb_otg_vbus>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbotg_1>;
+       disable-over-current;
+       status = "okay";
+};
+
+&usbh1 {
+       vbus-supply = <&reg_usb_h1_vbus>;
+       status = "okay";
+};
+
+&usdhc3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc3_2>;
+       cd-gpios = <&gpio7 0 0>;
+       vmmc-supply = <&reg_3p3v>;
+       status = "okay";
+};
diff --git a/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/target/linux/imx6/files-3.10/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
new file mode 100644 (file)
index 0000000..e27b27a
--- /dev/null
@@ -0,0 +1,408 @@
+/*
+ * Copyright 2013 Gateworks Corporation
+ *
+ * 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
+ */
+
+/ {
+       /* these are used by bootloader for disabling nodes */
+       aliases {
+               can0 = &can1;
+               ethernet0 = &fec;
+               ethernet1 = &eth1;
+               i2c0 = &i2c1;
+               i2c1 = &i2c2;
+               i2c2 = &i2c3;
+               led0 = &led0;
+               led1 = &led1;
+               led2 = &led2;
+               nand = &gpmi;
+               sky2 = &eth1;
+               ssi0 = &ssi1;
+               usb0 = &usbh1;
+               usb1 = &usbotg;
+               usdhc2 = &usdhc3;
+       };
+
+       chosen {
+               bootargs = "console=ttymxc1,115200";
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led0: user1 {
+                       label = "user1";
+                       gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
+                       default-state = "on";
+                       linux,default-trigger = "heartbeat";
+               };
+
+               led1: user2 {
+                       label = "user2";
+                       gpios = <&gpio4 7 0>; /* 103 -> MX6_PANLEDR */
+                       default-state = "off";
+               };
+
+               led2: user3 {
+                       label = "user3";
+                       gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
+                       default-state = "off";
+               };
+       };
+
+       memory {
+               reg = <0x10000000 0x40000000>;
+       };
+
+       regulators {
+               compatible = "simple-bus";
+
+               reg_1p0v: 1p0v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "1P0V";
+                       regulator-min-microvolt = <1000000>;
+                       regulator-max-microvolt = <1000000>;
+                       regulator-always-on;
+               };
+
+               reg_3p3v: 3p3v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "3P3V";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       regulator-always-on;
+               };
+
+               reg_usb_h1_vbus: usb_h1_vbus {
+                       compatible = "regulator-fixed";
+                       regulator-name = "usb_h1_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       regulator-always-on;
+               };
+
+               reg_usb_otg_vbus: usb_otg_vbus {
+                       compatible = "regulator-fixed";
+                       regulator-name = "usb_otg_vbus";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       gpio = <&gpio3 22 0>;
+                       enable-active-high;
+               };
+       };
+
+       sound {
+               compatible = "fsl,imx6q-sabrelite-sgtl5000",
+                            "fsl,imx-audio-sgtl5000";
+               model = "imx6q-sabrelite-sgtl5000";
+               ssi-controller = <&ssi1>;
+               audio-codec = <&codec>;
+               audio-routing =
+                       "MIC_IN", "Mic Jack",
+                       "Mic Jack", "Mic Bias",
+                       "Headphone Jack", "HP_OUT";
+               mux-int-port = <1>;
+               mux-ext-port = <4>;
+       };
+};
+
+&audmux {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_audmux_1>;
+       status = "okay";
+};
+
+&can1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan1_1>;
+       status = "okay";
+};
+
+&fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet_1>;
+       phy-mode = "rgmii";
+       phy-reset-gpios = <&gpio1 30 0>;
+       status = "okay";
+};
+
+&gpmi {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gpmi_nand_2>;
+       status = "okay";
+};
+
+&i2c1 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1_1>;
+       status = "okay";
+
+       eeprom1: eeprom@50 {
+               compatible = "atmel,24c02";
+               reg = <0x50>;
+               pagesize = <16>;
+       };
+
+       eeprom2: eeprom@51 {
+               compatible = "atmel,24c02";
+               reg = <0x51>;
+               pagesize = <16>;
+       };
+
+       eeprom3: eeprom@52 {
+               compatible = "atmel,24c02";
+               reg = <0x52>;
+               pagesize = <16>;
+       };
+
+       eeprom4: eeprom@53 {
+               compatible = "atmel,24c02";
+               reg = <0x53>;
+               pagesize = <16>;
+       };
+
+       gpio: pca9555@23 {
+               compatible = "nxp,pca9555";
+               reg = <0x23>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       hwmon: gsc@29 {
+               compatible = "gw,gsp";
+               reg = <0x29>;
+       };
+
+       rtc: ds1672@68 {
+               compatible = "dallas,ds1672";
+               reg = <0x68>;
+       };
+};
+
+&i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2_2>;
+       status = "okay";
+
+       pmic: pfuze100@08 {
+               compatible = "fsl,pfuze100";
+               reg = <0x08>;
+
+               regulators {
+                       sw1a_reg: sw1ab {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+
+                       sw1c_reg: sw1c {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+
+                       sw2_reg: sw2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3950000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw3a_reg: sw3a {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw3b_reg: sw3b {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw4_reg: sw4 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+
+                       swbst_reg: swbst {
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5150000>;
+                       };
+
+                       snvs_reg: vsnvs {
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <3000000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       vref_reg: vrefddr {
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       vgen1_reg: vgen1 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+
+                       vgen2_reg: vgen2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+
+                       vgen3_reg: vgen3 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+
+                       vgen4_reg: vgen4 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       vgen5_reg: vgen5 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       vgen6_reg: vgen6 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+               };
+       };
+
+       pciswitch: pex8609@3f {
+               compatible = "plx,pex8609";
+               reg = <0x3f>;
+       };
+
+       pciclkgen: si52147@6b {
+               compatible = "sil,si52147";
+               reg = <0x6b>;
+       };
+};
+
+&i2c3 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3_2>;
+       status = "okay";
+
+       accelerometer: fxos8700@1e {
+               compatible = "fsl,fxos8700";
+               reg = <0x1e>;
+       };
+
+       codec: sgtl5000@0a {
+               compatible = "fsl,sgtl5000";
+               reg = <0x0a>;
+               clocks = <&clks 169>;
+               VDDA-supply = <&sw4_reg>;
+               VDDIO-supply = <&reg_3p3v>;
+       };
+
+       hdmiin: adv7611@4c {
+               compatible = "adi,adv7611";
+               reg = <0x4c>;
+       };
+
+       touchscreen: egalax_ts@04 {
+               compatible = "eeti,egalax_ts";
+               reg = <0x04>;
+               interrupt-parent = <&gpio7>;
+               interrupts = <12 2>; /* gpio7_12 active low */
+               wakeup-gpios = <&gpio7 12 0>;
+       };
+
+       videoout: adv7393@2a {
+               compatible = "adi,adv7393";
+               reg = <0x2a>;
+       };
+
+       videoin: adv7180@20 {
+               compatible = "adi,adv7180";
+               reg = <0x20>;
+       };
+};
+
+&ldb {
+       status = "okay";
+       lvds-channel@0 {
+               crtcs = <&ipu1 0>, <&ipu1 1>;
+       };
+};
+
+&pcie {
+       reset-gpio = <&gpio1 29 0>;
+       status = "okay";
+
+       eth1: sky2@8 { /* MAC/PHY on bus 8 */
+               compatible = "marvell,sky2";
+               /* Filled in by U-Boot */
+               mac-address = [ 00 00 00 00 00 00 ];
+       };
+};
+
+&ssi1 {
+       fsl,mode = "i2s-slave";
+       status = "okay";
+};
+
+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1_2>;
+       status = "okay";
+};
+
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2_3>;
+       status = "okay";
+};
+
+&uart5 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart5_1>;
+       status = "okay";
+};
+
+&usbotg {
+       vbus-supply = <&reg_usb_otg_vbus>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbotg_1>;
+       disable-over-current;
+       status = "okay";
+};
+
+&usbh1 {
+       vbus-supply = <&reg_usb_h1_vbus>;
+       status = "okay";
+};
+
+&usdhc3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc3_2>;
+       cd-gpios = <&gpio7 0 0>;
+       vmmc-supply = <&reg_3p3v>;
+       status = "okay";
+};
diff --git a/target/linux/imx6/patches-3.10/110-gateworks-ventana.patch b/target/linux/imx6/patches-3.10/110-gateworks-ventana.patch
new file mode 100644 (file)
index 0000000..1385661
--- /dev/null
@@ -0,0 +1,263 @@
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -117,6 +117,15 @@ dtb-$(CONFIG_ARCH_MXC) += \
+       imx6dl-sabresd.dtb \
+       imx6dl-wandboard.dtb \
+       imx6q-arm2.dtb \
++      imx6q-gw51xx.dtb \
++      imx6q-gw52xx.dtb \
++      imx6q-gw53xx.dtb \
++      imx6q-gw54xx.dtb \
++      imx6q-gw5400-a.dtb \
++      imx6dl-gw51xx.dtb \
++      imx6dl-gw52xx.dtb \
++      imx6dl-gw53xx.dtb \
++      imx6dl-gw54xx.dtb \
+       imx6q-sabreauto.dtb \
+       imx6q-sabrelite.dtb \
+       imx6q-sabresd.dtb \
+--- a/arch/arm/boot/dts/imx6q.dtsi
++++ b/arch/arm/boot/dts/imx6q.dtsi
+@@ -212,6 +212,30 @@
+                                                       MX6Q_PAD_SD4_DAT0__NAND_DQS      0x00b1
+                                               >;
+                                       };
++
++                                      /* No strobe */
++                                      pinctrl_gpmi_nand_2: gpmi-nand-2 {
++                                              fsl,pins = <
++                                                      MX6Q_PAD_NANDF_CLE__NAND_CLE     0xb0b1
++                                                      MX6Q_PAD_NANDF_ALE__NAND_ALE     0xb0b1
++                                                      MX6Q_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1
++                                                      MX6Q_PAD_NANDF_RB0__NAND_READY_B 0xb000
++                                                      MX6Q_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1
++                                                      MX6Q_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1
++                                                      MX6Q_PAD_NANDF_CS2__NAND_CE2_B   0xb0b1
++                                                      MX6Q_PAD_NANDF_CS3__NAND_CE3_B   0xb0b1
++                                                      MX6Q_PAD_SD4_CMD__NAND_RE_B      0xb0b1
++                                                      MX6Q_PAD_SD4_CLK__NAND_WE_B      0xb0b1
++                                                      MX6Q_PAD_NANDF_D0__NAND_DATA00   0xb0b1
++                                                      MX6Q_PAD_NANDF_D1__NAND_DATA01   0xb0b1
++                                                      MX6Q_PAD_NANDF_D2__NAND_DATA02   0xb0b1
++                                                      MX6Q_PAD_NANDF_D3__NAND_DATA03   0xb0b1
++                                                      MX6Q_PAD_NANDF_D4__NAND_DATA04   0xb0b1
++                                                      MX6Q_PAD_NANDF_D5__NAND_DATA05   0xb0b1
++                                                      MX6Q_PAD_NANDF_D6__NAND_DATA06   0xb0b1
++                                                      MX6Q_PAD_NANDF_D7__NAND_DATA07   0xb0b1
++                                              >;
++                                      };
+                               };
+                               i2c1 {
+@@ -230,6 +254,12 @@
+                                                       MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
+                                               >;
+                                       };
++                                      pinctrl_i2c2_2: i2c2grp-2 {
++                                              fsl,pins = <
++                                                      MX6Q_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
++                                                      MX6Q_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
++                                              >;
++                                      };
+                               };
+                               i2c3 {
+@@ -239,6 +269,12 @@
+                                                       MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+                                               >;
+                                       };
++                                      pinctrl_i2c3_2: i2c3grp-2 {
++                                              fsl,pins = <
++                                                      MX6Q_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
++                                                      MX6Q_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
++                                              >;
++                                      };
+                               };
+                               uart1 {
+@@ -248,6 +284,12 @@
+                                                       MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
+                                               >;
+                                       };
++                                      pinctrl_uart1_2: uart1grp-2 {
++                                              fsl,pins = <
++                                                      MX6Q_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
++                                                      MX6Q_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
++                                              >;
++                                      };
+                               };
+                               uart2 {
+@@ -257,6 +299,21 @@
+                                                       MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
+                                               >;
+                                       };
++                                      pinctrl_uart2_3: uart2grp-3 {
++                                              fsl,pins = <
++                                                      MX6Q_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++                                                      MX6Q_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++                                              >;
++                                      };
++                              };
++
++                              uart3 {
++                                      pinctrl_uart3_3: uart3grp-3 {
++                                              fsl,pins = <
++                                                      MX6Q_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++                                                      MX6Q_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++                                              >;
++                                      };
+                               };
+                               uart4 {
+@@ -267,6 +324,15 @@
+                                               >;
+                                       };
+                               };
++
++                              uart5 {
++                                      pinctrl_uart5_1: uart5grp-1 {
++                                              fsl,pins = <
++                                                      MX6Q_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
++                                                      MX6Q_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
++                                              >;
++                                      };
++                              };
+                               usbotg {
+                                       pinctrl_usbotg_1: usbotggrp-1 {
+--- a/arch/arm/boot/dts/imx6dl.dtsi
++++ b/arch/arm/boot/dts/imx6dl.dtsi
+@@ -37,6 +37,18 @@
+                               compatible = "fsl,imx6dl-iomuxc";
+                               reg = <0x020e0000 0x4000>;
++                              /* shared pinctrl settings */
++                              audmux {
++                                      pinctrl_audmux_1: audmux-1 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_SD2_DAT0__AUD4_RXD  0x80000000
++                                                      MX6DL_PAD_SD2_DAT1__AUD4_TXFS 0x80000000
++                                                      MX6DL_PAD_SD2_DAT2__AUD4_TXD  0x80000000
++                                                      MX6DL_PAD_SD2_DAT3__AUD4_TXC  0x80000000
++                                              >;
++                                      };
++                              };
++
+                               enet {
+                                       pinctrl_enet_1: enetgrp-1 {
+                                               fsl,pins = <
+@@ -105,6 +117,59 @@
+                                       };
+                               };
++                              gpmi-nand {
++                                      /* No strobe */
++                                      pinctrl_gpmi_nand_2: gpmi-nand-2 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_NANDF_CLE__NAND_CLE     0xb0b1
++                                                      MX6DL_PAD_NANDF_ALE__NAND_ALE     0xb0b1
++                                                      MX6DL_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1
++                                                      MX6DL_PAD_NANDF_RB0__NAND_READY_B 0xb000
++                                                      MX6DL_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1
++                                                      MX6DL_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1
++                                                      MX6DL_PAD_NANDF_CS2__NAND_CE2_B   0xb0b1
++                                                      MX6DL_PAD_NANDF_CS3__NAND_CE3_B   0xb0b1
++                                                      MX6DL_PAD_SD4_CMD__NAND_RE_B      0xb0b1
++                                                      MX6DL_PAD_SD4_CLK__NAND_WE_B      0xb0b1
++                                                      MX6DL_PAD_NANDF_D0__NAND_DATA00   0xb0b1
++                                                      MX6DL_PAD_NANDF_D1__NAND_DATA01   0xb0b1
++                                                      MX6DL_PAD_NANDF_D2__NAND_DATA02   0xb0b1
++                                                      MX6DL_PAD_NANDF_D3__NAND_DATA03   0xb0b1
++                                                      MX6DL_PAD_NANDF_D4__NAND_DATA04   0xb0b1
++                                                      MX6DL_PAD_NANDF_D5__NAND_DATA05   0xb0b1
++                                                      MX6DL_PAD_NANDF_D6__NAND_DATA06   0xb0b1
++                                                      MX6DL_PAD_NANDF_D7__NAND_DATA07   0xb0b1
++                                              >;
++                                      };
++                              };
++
++                              i2c1 {
++                                      pinctrl_i2c1_1: i2c1grp-1 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
++                                                      MX6DL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
++                                              >;
++                                      };
++                              };
++
++                              i2c2 {
++                                      pinctrl_i2c2_2: i2c2grp-2 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
++                                                      MX6DL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
++                                              >;
++                                      };
++                              };
++
++                              i2c3 {
++                                      pinctrl_i2c3_2: i2c3grp-2 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
++                                                      MX6DL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
++                                              >;
++                                      };
++                              };
++
+                               uart1 {
+                                       pinctrl_uart1_1: uart1grp-1 {
+                                               fsl,pins = <
+@@ -112,6 +177,30 @@
+                                                       MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
+                                               >;
+                                       };
++                                      pinctrl_uart1_2: uart1grp-2 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
++                                                      MX6DL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
++                                              >;
++                                      };
++                              };
++
++                              uart2 {
++                                      pinctrl_uart2_3: uart2grp-3 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
++                                                      MX6DL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
++                                              >;
++                                      };
++                              };
++
++                              uart3 {
++                                      pinctrl_uart3_3: uart3grp-3 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
++                                                      MX6DL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
++                                              >;
++                                      };
+                               };
+                               uart4 {
+@@ -123,7 +212,22 @@
+                                       };
+                               };
++                              uart5 {
++                                      pinctrl_uart5_1: uart5grp-1 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
++                                                      MX6DL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
++                                              >;
++                                      };
++                              };
++
+                               usbotg {
++                                      pinctrl_usbotg_1: usbotggrp-1 {
++                                              fsl,pins = <
++                                                      MX6DL_PAD_GPIO_1__USB_OTG_ID 0x17059
++                                              >;
++                                      };
++
+                                       pinctrl_usbotg_2: usbotggrp-2 {
+                                               fsl,pins = <
+                                                       MX6DL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
diff --git a/target/linux/imx6/patches-3.10/110-gw5400-a.patch b/target/linux/imx6/patches-3.10/110-gw5400-a.patch
deleted file mode 100644 (file)
index 5a3d610..0000000
+++ /dev/null
@@ -1,135 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -117,6 +117,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
-       imx6dl-sabresd.dtb \
-       imx6dl-wandboard.dtb \
-       imx6q-arm2.dtb \
-+      imx6q-gw5400-a.dtb \
-       imx6q-sabreauto.dtb \
-       imx6q-sabrelite.dtb \
-       imx6q-sabresd.dtb \
---- a/arch/arm/boot/dts/imx6q.dtsi
-+++ b/arch/arm/boot/dts/imx6q.dtsi
-@@ -98,6 +98,14 @@
-                                                       MX6Q_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
-                                               >;
-                                       };
-+
-+                                      pinctrl_audmux_3: audmux-3 {
-+                                              fsl,pins = <
-+                                                      MX6Q_PAD_DISP0_DAT19__AUD5_RXD  0x80000000
-+                                                      MX6Q_PAD_EIM_D25__AUD5_RXC      0x80000000
-+                                                      MX6Q_PAD_DISP0_DAT18__AUD5_TXFS 0x80000000
-+                                              >;
-+                                      };
-                               };
-                               ecspi1 {
-@@ -212,6 +220,30 @@
-                                                       MX6Q_PAD_SD4_DAT0__NAND_DQS      0x00b1
-                                               >;
-                                       };
-+
-+                                      /* No strobe */
-+                                      pinctrl_gpmi_nand_2: gpmi-nand-2 {
-+                                              fsl,pins = <
-+                                                      MX6Q_PAD_NANDF_CLE__NAND_CLE     0xb0b1
-+                                                      MX6Q_PAD_NANDF_ALE__NAND_ALE     0xb0b1
-+                                                      MX6Q_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1
-+                                                      MX6Q_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+                                                      MX6Q_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1
-+                                                      MX6Q_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1
-+                                                      MX6Q_PAD_NANDF_CS2__NAND_CE2_B   0xb0b1
-+                                                      MX6Q_PAD_NANDF_CS3__NAND_CE3_B   0xb0b1
-+                                                      MX6Q_PAD_SD4_CMD__NAND_RE_B      0xb0b1
-+                                                      MX6Q_PAD_SD4_CLK__NAND_WE_B      0xb0b1
-+                                                      MX6Q_PAD_NANDF_D0__NAND_DATA00   0xb0b1
-+                                                      MX6Q_PAD_NANDF_D1__NAND_DATA01   0xb0b1
-+                                                      MX6Q_PAD_NANDF_D2__NAND_DATA02   0xb0b1
-+                                                      MX6Q_PAD_NANDF_D3__NAND_DATA03   0xb0b1
-+                                                      MX6Q_PAD_NANDF_D4__NAND_DATA04   0xb0b1
-+                                                      MX6Q_PAD_NANDF_D5__NAND_DATA05   0xb0b1
-+                                                      MX6Q_PAD_NANDF_D6__NAND_DATA06   0xb0b1
-+                                                      MX6Q_PAD_NANDF_D7__NAND_DATA07   0xb0b1
-+                                              >;
-+                                      };
-                               };
-                               i2c1 {
-@@ -230,6 +262,12 @@
-                                                       MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
-                                               >;
-                                       };
-+                                      pinctrl_i2c2_2: i2c2grp-2 {
-+                                              fsl,pins = <
-+                                                      MX6Q_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+                                                      MX6Q_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+                                              >;
-+                                      };
-                               };
-                               i2c3 {
-@@ -239,6 +277,12 @@
-                                                       MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
-                                               >;
-                                       };
-+                                      pinctrl_i2c3_2: i2c3grp-2 {
-+                                              fsl,pins = <
-+                                                      MX6Q_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
-+                                                      MX6Q_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
-+                                              >;
-+                                      };
-                               };
-                               uart1 {
-@@ -248,6 +292,12 @@
-                                                       MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
-                                               >;
-                                       };
-+                                      pinctrl_uart1_2: uart1grp-2 {
-+                                              fsl,pins = <
-+                                                      MX6Q_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+                                                      MX6Q_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-                               };
-                               uart2 {
-@@ -257,6 +307,21 @@
-                                                       MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
-                                               >;
-                                       };
-+                                      pinctrl_uart2_2: uart2grp-2 {
-+                                              fsl,pins = <
-+                                                      MX6Q_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+                                                      MX6Q_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-+                              };
-+
-+                              uart3 {
-+                                      pinctrl_uart3_1: uart3grp-1 {
-+                                              fsl,pins = <
-+                                                      MX6Q_PAD_SD4_CMD__UART3_TX_DATA 0x1b0b1
-+                                                      MX6Q_PAD_SD4_CLK__UART3_RX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-                               };
-                               uart4 {
-@@ -267,6 +332,15 @@
-                                               >;
-                                       };
-                               };
-+
-+                              uart5 {
-+                                      pinctrl_uart5_1: uart5grp-1 {
-+                                              fsl,pins = <
-+                                                      MX6Q_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
-+                                                      MX6Q_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-+                              };
-                               usbotg {
-                                       pinctrl_usbotg_1: usbotggrp-1 {
diff --git a/target/linux/imx6/patches-3.10/111-gw54xx.patch b/target/linux/imx6/patches-3.10/111-gw54xx.patch
deleted file mode 100644 (file)
index fa212ad..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -118,6 +118,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
-       imx6dl-wandboard.dtb \
-       imx6q-arm2.dtb \
-       imx6q-gw5400-a.dtb \
-+      imx6q-gw54xx.dtb \
-       imx6q-sabreauto.dtb \
-       imx6q-sabrelite.dtb \
-       imx6q-sabresd.dtb \
diff --git a/target/linux/imx6/patches-3.10/112-gw51xx.patch b/target/linux/imx6/patches-3.10/112-gw51xx.patch
deleted file mode 100644 (file)
index e222984..0000000
+++ /dev/null
@@ -1,161 +0,0 @@
---- a/arch/arm/boot/dts/imx6dl.dtsi
-+++ b/arch/arm/boot/dts/imx6dl.dtsi
-@@ -105,6 +105,95 @@
-                                       };
-                               };
-+                              gpmi-nand {
-+                                      pinctrl_gpmi_nand_1: gpmi-nand-1 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_NANDF_CLE__NAND_CLE     0xb0b1
-+                                                      MX6DL_PAD_NANDF_ALE__NAND_ALE     0xb0b1
-+                                                      MX6DL_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1
-+                                                      MX6DL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+                                                      MX6DL_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1
-+                                                      MX6DL_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1
-+                                                      MX6DL_PAD_NANDF_CS2__NAND_CE2_B   0xb0b1
-+                                                      MX6DL_PAD_NANDF_CS3__NAND_CE3_B   0xb0b1
-+                                                      MX6DL_PAD_SD4_CMD__NAND_RE_B      0xb0b1
-+                                                      MX6DL_PAD_SD4_CLK__NAND_WE_B      0xb0b1
-+                                                      MX6DL_PAD_NANDF_D0__NAND_DATA00   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D1__NAND_DATA01   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D2__NAND_DATA02   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D3__NAND_DATA03   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D4__NAND_DATA04   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D5__NAND_DATA05   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D6__NAND_DATA06   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D7__NAND_DATA07   0xb0b1
-+                                                      MX6DL_PAD_SD4_DAT0__NAND_DQS      0x00b1
-+                                              >;
-+                                      };
-+
-+                                      /* No strobe */
-+                                      pinctrl_gpmi_nand_2: gpmi-nand-2 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_NANDF_CLE__NAND_CLE     0xb0b1
-+                                                      MX6DL_PAD_NANDF_ALE__NAND_ALE     0xb0b1
-+                                                      MX6DL_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1
-+                                                      MX6DL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-+                                                      MX6DL_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1
-+                                                      MX6DL_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1
-+                                                      MX6DL_PAD_NANDF_CS2__NAND_CE2_B   0xb0b1
-+                                                      MX6DL_PAD_NANDF_CS3__NAND_CE3_B   0xb0b1
-+                                                      MX6DL_PAD_SD4_CMD__NAND_RE_B      0xb0b1
-+                                                      MX6DL_PAD_SD4_CLK__NAND_WE_B      0xb0b1
-+                                                      MX6DL_PAD_NANDF_D0__NAND_DATA00   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D1__NAND_DATA01   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D2__NAND_DATA02   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D3__NAND_DATA03   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D4__NAND_DATA04   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D5__NAND_DATA05   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D6__NAND_DATA06   0xb0b1
-+                                                      MX6DL_PAD_NANDF_D7__NAND_DATA07   0xb0b1
-+                                              >;
-+                                      };
-+                              };
-+
-+                              i2c1 {
-+                                      pinctrl_i2c1_1: i2c1grp-1 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-+                                                      MX6DL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-+                                              >;
-+                                      };
-+                              };
-+
-+                              i2c2 {
-+                                      pinctrl_i2c2_1: i2c2grp-1 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
-+                                                      MX6DL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
-+                                              >;
-+                                      };
-+                                      pinctrl_i2c2_2: i2c2grp-2 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
-+                                                      MX6DL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
-+                                              >;
-+                                      };
-+                              };
-+
-+                              i2c3 {
-+                                      pinctrl_i2c3_1: i2c3grp-1 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
-+                                                      MX6DL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
-+                                              >;
-+                                      };
-+                                      pinctrl_i2c3_2: i2c3grp-2 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
-+                                                      MX6DL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
-+                                              >;
-+                                      };
-+                              };
-+
-                               uart1 {
-                                       pinctrl_uart1_1: uart1grp-1 {
-                                               fsl,pins = <
-@@ -112,6 +201,36 @@
-                                                       MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
-                                               >;
-                                       };
-+                                      pinctrl_uart1_2: uart1grp-2 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
-+                                                      MX6DL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-+                              };
-+
-+                              uart2 {
-+                                      pinctrl_uart2_1: uart2grp-1 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+                                                      MX6DL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-+                                      pinctrl_uart2_2: uart2grp-2 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_SD4_DAT7__UART2_RX_DATA 0x1b0b1
-+                                                      MX6DL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-+                              };
-+
-+                              uart3 {
-+                                      pinctrl_uart3_1: uart3grp-1 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
-+                                                      MX6DL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-                               };
-                               uart4 {
-@@ -122,6 +241,15 @@
-                                               >;
-                                       };
-                               };
-+
-+                              uart5 {
-+                                      pinctrl_uart5_1: uart5grp-1 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
-+                                                      MX6DL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-+                              };
-                               usbotg {
-                                       pinctrl_usbotg_2: usbotggrp-2 {
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -119,6 +119,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
-       imx6q-arm2.dtb \
-       imx6q-gw5400-a.dtb \
-       imx6q-gw54xx.dtb \
-+      imx6dl-gw51xx.dtb \
-       imx6q-sabreauto.dtb \
-       imx6q-sabrelite.dtb \
-       imx6q-sabresd.dtb \
diff --git a/target/linux/imx6/patches-3.10/113-gw52xx.patch b/target/linux/imx6/patches-3.10/113-gw52xx.patch
deleted file mode 100644 (file)
index 6e48d30..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -120,6 +120,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
-       imx6q-gw5400-a.dtb \
-       imx6q-gw54xx.dtb \
-       imx6dl-gw51xx.dtb \
-+      imx6dl-gw52xx.dtb \
-       imx6q-sabreauto.dtb \
-       imx6q-sabrelite.dtb \
-       imx6q-sabresd.dtb \
---- a/arch/arm/boot/dts/imx6dl.dtsi
-+++ b/arch/arm/boot/dts/imx6dl.dtsi
-@@ -37,6 +37,18 @@
-                               compatible = "fsl,imx6dl-iomuxc";
-                               reg = <0x020e0000 0x4000>;
-+                              /* shared pinctrl settings */
-+                              audmux {
-+                                      pinctrl_audmux_1: audmux-1 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_SD2_DAT0__AUD4_RXD  0x80000000
-+                                                      MX6DL_PAD_SD2_DAT1__AUD4_TXFS 0x80000000
-+                                                      MX6DL_PAD_SD2_DAT2__AUD4_TXD  0x80000000
-+                                                      MX6DL_PAD_SD2_DAT3__AUD4_TXC  0x80000000
-+                                              >;
-+                                      };
-+                              };
-+
-                               enet {
-                                       pinctrl_enet_1: enetgrp-1 {
-                                               fsl,pins = <
-@@ -222,6 +234,12 @@
-                                                       MX6DL_PAD_SD4_DAT4__UART2_TX_DATA 0x1b0b1
-                                               >;
-                                       };
-+                                      pinctrl_uart2_3: uart2grp-3 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
-+                                                      MX6DL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
-+                                              >;
-+                                      };
-                               };
-                               uart3 {
-@@ -252,6 +270,12 @@
-                               };
-                               usbotg {
-+                                      pinctrl_usbotg_1: usbotggrp-1 {
-+                                              fsl,pins = <
-+                                                      MX6DL_PAD_GPIO_1__USB_OTG_ID 0x17059
-+                                              >;
-+                                      };
-+
-                                       pinctrl_usbotg_2: usbotggrp-2 {
-                                               fsl,pins = <
-                                                       MX6DL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
diff --git a/target/linux/imx6/patches-3.10/114-gw53xx.patch b/target/linux/imx6/patches-3.10/114-gw53xx.patch
deleted file mode 100644 (file)
index 9c31204..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -121,6 +121,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
-       imx6q-gw54xx.dtb \
-       imx6dl-gw51xx.dtb \
-       imx6dl-gw52xx.dtb \
-+      imx6dl-gw53xx.dtb \
-       imx6q-sabreauto.dtb \
-       imx6q-sabrelite.dtb \
-       imx6q-sabresd.dtb \
index 13c4359..f74e2d8 100644 (file)
@@ -40,7 +40,11 @@ VENTANA_DTS:= \
        imx6dl-gw51xx \
        imx6dl-gw52xx \
        imx6dl-gw53xx \
-       imx6q-gw5400-a \
-       imx6q-gw54xx
+       imx6dl-gw54xx \
+       imx6q-gw51xx \
+       imx6q-gw52xx \
+       imx6q-gw53xx \
+       imx6q-gw54xx \
+       imx6q-gw5400-a
 
 $(eval $(call Profile,VENTANA))