Merge remote-tracking branch 'samsung/for-next'

[karo-tx-linux.git] / arch / arm / boot / dts / imx6q-gw5400-a.dts

diff --git a/arch/arm/boot/dts/imx6q-gw5400-a.dts b/arch/arm/boot/dts/imx6q-gw5400-a.dts
index 22e6f8e657d2389f97b2c12bc14181d34d34819e..58adf176425a69fc48d16731973f93827b080bab 100644 (file)
--- a/arch/arm/boot/dts/imx6q-gw5400-a.dts
+++ b/arch/arm/boot/dts/imx6q-gw5400-a.dts
@@ -10,6 +10,7 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
 #include "imx6q.dtsi"
 
 / {
@@ -18,7 +19,6 @@
 
        /* these are used by bootloader for disabling nodes */
        aliases {
-               ethernet0 = &fec;
                ethernet1 = &eth1;
                i2c0 = &i2c1;
                i2c1 = &i2c2;
@@ -26,12 +26,10 @@
                led0 = &led0;
                led1 = &led1;
                led2 = &led2;
-               sky2 = &eth1;
                ssi0 = &ssi1;
                spi0 = &ecspi1;
                usb0 = &usbh1;
                usb1 = &usbotg;
-               usdhc2 = &usdhc3;
        };
 
        chosen {
@@ -40,23 +38,25 @@
 
        leds {
                compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpio_leds>;
 
                led0: user1 {
                        label = "user1";
-                       gpios = <&gpio4 6 0>; /* 102 -> MX6_PANLEDG */
+                       gpios = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* 102 -> MX6_PANLEDG */
                        default-state = "on";
                        linux,default-trigger = "heartbeat";
                };
 
                led1: user2 {
                        label = "user2";
-                       gpios = <&gpio4 10 0>; /* 106 -> MX6_PANLEDR */
+                       gpios = <&gpio4 10 GPIO_ACTIVE_HIGH>; /* 106 -> MX6_PANLEDR */
                        default-state = "off";
                };
 
                led2: user3 {
                        label = "user3";
-                       gpios = <&gpio4 15 1>; /* 111 -> MX6_LOCLED# */
+                       gpios = <&gpio4 15 GPIO_ACTIVE_LOW>; /* 111 -> MX6_LOCLED# */
                        default-state = "off";
                };
        };
@@ -67,7 +67,9 @@
 
        pps {
                compatible = "pps-gpio";
-               gpios = <&gpio1 5 0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpio_leds>;
+               gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
                status = "okay";
        };
 
@@ -109,7 +111,7 @@
                        regulator-name = "usb_otg_vbus";
                        regulator-min-microvolt = <5000000>;
                        regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio3 22 0>;
+                       gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
                        enable-active-high;
                };
        };
@@ -137,13 +139,13 @@
 
 &ecspi1 {
        fsl,spi-num-chipselects = <1>;
-       cs-gpios = <&gpio3 19 0>;
+       cs-gpios = <&gpio3 19 GPIO_ACTIVE_HIGH>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_ecspi1>;
        status = "okay";
 
        flash: m25p80@0 {
-               compatible = "sst,w25q256";
+               compatible = "sst,w25q256", "jedec,spi-nor";
                spi-max-frequency = <30000000>;
                reg = <0>;
        };
@@ -153,7 +155,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet>;
        phy-mode = "rgmii";
-       phy-reset-gpios = <&gpio1 30 0>;
+       phy-reset-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
        status = "okay";
 };
 
@@ -199,11 +201,6 @@
                #gpio-cells = <2>;
        };
 
-       hwmon: gsc@29 {
-               compatible = "gw,gsp";
-               reg = <0x29>;
-       };
-
        rtc: ds1672@68 {
                compatible = "dallas,ds1672";
                reg = <0x68>;
@@ -314,16 +311,6 @@
                        };
                };
        };
-
-       pciswitch: pex8609@3f {
-               compatible = "plx,pex8609";
-               reg = <0x3f>;
-       };
-
-       pciclkgen: si52147@6b {
-               compatible = "sil,si52147";
-               reg = <0x6b>;
-       };
 };
 
 &i2c3 {
@@ -345,51 +332,73 @@
                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>;
+               interrupts = <12 2>;
+               wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
        };
+};
 
-       videoout: adv7393@2a {
-               compatible = "adi,adv7393";
-               reg = <0x2a>;
-       };
+&ldb {
+       status = "okay";
+};
+
+&pcie {
+       reset-gpio = <&gpio1 29 GPIO_ACTIVE_LOW>;
+       status = "okay";
 
-       videoin: adv7180@20 {
-               compatible = "adi,adv7180";
-               reg = <0x20>;
+       eth1: sky2@8 { /* MAC/PHY on bus 8 */
+               compatible = "marvell,sky2";
        };
 };
 
-&iomuxc {
+&ssi1 {
+       status = "okay";
+};
+
+&uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1>;
+       status = "okay";
+};
+
+&uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2>;
+       status = "okay";
+};
+
+&uart5 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart5>;
+       status = "okay";
+};
+
+&usbotg {
+       vbus-supply = <&reg_usb_otg_vbus>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbotg>;
+       disable-over-current;
+       status = "okay";
+};
+
+&usbh1 {
+       vbus-supply = <&reg_usb_h1_vbus>;
+       status = "okay";
+};
+
+&usdhc3 {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_hog>;
+       pinctrl-0 = <&pinctrl_usdhc3>;
+       cd-gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
+       vmmc-supply = <&reg_3p3v>;
+       status = "okay";
+};
 
+&iomuxc {
        imx6q-gw5400-a {
-               pinctrl_hog: hoggrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D22__GPIO3_IO22    0x80000000 /* OTG_PWR_EN */
-                               MX6QDL_PAD_EIM_D19__GPIO3_IO19    0x80000000 /* SPINOR_CS0# */
-                               MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28 0x80000000 /* PCIE IRQ */
-                               MX6QDL_PAD_ENET_TXD1__GPIO1_IO29  0x80000000 /* PCIE RST */
-                               MX6QDL_PAD_GPIO_0__CCM_CLKO1      0x000130b0 /* AUD4_MCK */
-                               MX6QDL_PAD_GPIO_5__GPIO1_IO05     0x80000000 /* GPS_PPS */
-                               MX6QDL_PAD_GPIO_17__GPIO7_IO12    0x80000000 /* TOUCH_IRQ# */
-                               MX6QDL_PAD_KEY_COL0__GPIO4_IO06   0x80000000 /* user1 led */
-                               MX6QDL_PAD_KEY_COL2__GPIO4_IO10   0x80000000 /* user2 led */
-                               MX6QDL_PAD_KEY_ROW4__GPIO4_IO15   0x80000000 /* user3 led */
-                               MX6QDL_PAD_SD1_DAT0__GPIO1_IO16   0x80000000 /* USBHUB_RST# */
-                               MX6QDL_PAD_SD1_DAT3__GPIO1_IO21   0x80000000 /* MIPI_DIO */
-                        >;
-               };
 
                pinctrl_audmux: audmuxgrp {
                        fsl,pins = <
@@ -397,6 +406,7 @@
                                MX6QDL_PAD_SD2_DAT3__AUD4_TXC           0x130b0
                                MX6QDL_PAD_SD2_DAT2__AUD4_TXD           0x110b0
                                MX6QDL_PAD_SD2_DAT1__AUD4_TXFS          0x130b0
+                               MX6QDL_PAD_GPIO_0__CCM_CLKO1            0x130b0 /* AUD4_MCK */
                        >;
                };
 
@@ -405,6 +415,7 @@
                                MX6QDL_PAD_EIM_D17__ECSPI1_MISO         0x100b1
                                MX6QDL_PAD_EIM_D18__ECSPI1_MOSI         0x100b1
                                MX6QDL_PAD_EIM_D16__ECSPI1_SCLK         0x100b1
+                               MX6QDL_PAD_EIM_D19__GPIO3_IO19          0x1b0b0 /* SPINOR_CS0# */
                        >;
                };
 
@@ -429,6 +440,14 @@
                        >;
                };
 
+               pinctrl_gpio_leds: gpioledsgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_KEY_COL0__GPIO4_IO06         0x1b0b0 /* user1 led */
+                               MX6QDL_PAD_KEY_COL2__GPIO4_IO10         0x1b0b0 /* user2 led */
+                               MX6QDL_PAD_KEY_ROW4__GPIO4_IO15         0x1b0b0 /* user3 led */
+                       >;
+               };
+
                pinctrl_i2c1: i2c1grp {
                        fsl,pins = <
                                MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
@@ -450,6 +469,19 @@
                        >;
                };
 
+               pinctrl_pcie: pciegrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28       0x1b0b0 /* PCIE IRQ */
+                               MX6QDL_PAD_ENET_TXD1__GPIO1_IO29        0x1b0b0 /* PCIE RST */
+                       >;
+               };
+
+               pinctrl_pps: ppsgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_GPIO_5__GPIO1_IO05           0x1b0b0 /* GPS_PPS */
+                       >;
+               };
+
                pinctrl_uart1: uart1grp {
                        fsl,pins = <
                                MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA      0x1b0b1
@@ -474,6 +506,7 @@
                pinctrl_usbotg: usbotggrp {
                        fsl,pins = <
                                MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x17059
+                               MX6QDL_PAD_EIM_D22__GPIO3_IO22          0x1b0b0 /* OTG_PWR_EN */
                        >;
                };
 
@@ -489,59 +522,3 @@
                };
        };
 };
-
-&ldb {
-       status = "okay";
-};
-
-&pcie {
-       reset-gpio = <&gpio1 29 0>;
-       status = "okay";
-
-       eth1: sky2@8 { /* MAC/PHY on bus 8 */
-               compatible = "marvell,sky2";
-       };
-};
-
-&ssi1 {
-       status = "okay";
-};
-
-&uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart1>;
-       status = "okay";
-};
-
-&uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart2>;
-       status = "okay";
-};
-
-&uart5 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_uart5>;
-       status = "okay";
-};
-
-&usbotg {
-       vbus-supply = <&reg_usb_otg_vbus>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usbotg>;
-       disable-over-current;
-       status = "okay";
-};
-
-&usbh1 {
-       vbus-supply = <&reg_usb_h1_vbus>;
-       status = "okay";
-};
-
-&usdhc3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_usdhc3>;
-       cd-gpios = <&gpio7 0 0>;
-       vmmc-supply = <&reg_3p3v>;
-       status = "okay";
-};