Merge tag 'rockchip-for-v2019.07-rc5' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / dts / imx6ull-colibri.dts

diff --git a/arch/arm/dts/imx6ull-colibri.dts b/arch/arm/dts/imx6ull-colibri.dts
index 2f8865c29cca179917f1b795ffe82649840c27d4..6c847ab7921b90f9a66f078fff056ccbe10280db 100644 (file)
--- a/arch/arm/dts/imx6ull-colibri.dts
+++ b/arch/arm/dts/imx6ull-colibri.dts
@@ -9,7 +9,7 @@
 
 / {
        model = "Toradex Colibri iMX6ULL";
-       compatible = "toradex,imx6ull-colibri", "fsl,imx6ull";
+       compatible = "toradex,colibri-imx6ull", "fsl,imx6ull";
 
        aliases {
                mmc0 = &usdhc1;
@@ -100,6 +100,7 @@
        };
 };
 
+/* NAND */
 &gpmi {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpmi_nand>;
@@ -110,21 +111,28 @@
        status = "okay";
 };
 
+/*
+ * I2C3_SDA/SCL on SODIMM 194/196 (e.g. RTC on carrier board)
+ */
 &i2c1 {
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c1>;
        pinctrl-1 = <&pinctrl_i2c1_gpio>;
-       sda-gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
-       scl-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
+       sda-gpios = <&gpio1 29 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       scl-gpios = <&gpio1 28 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
        status = "okay";
 };
 
+/*
+ * PWR_I2C: power I2C to audio codec, PMIC, temperature sensor and
+ * touch screen controller
+ */
 &i2c2 {
        pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c2>;
        pinctrl-1 = <&pinctrl_i2c2_gpio>;
-       sda-gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
-       scl-gpios = <&gpio1 30 GPIO_ACTIVE_LOW>;
+       sda-gpios = <&gpio1 31 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
+       scl-gpios = <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
        status = "okay";
 
        ad7879@2c {
@@ -150,24 +158,28 @@
                     &pinctrl_lcdif_ctrl>;
 };
 
+/* PWM <A> */
 &pwm4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm4>;
        #pwm-cells = <3>;
 };
 
+/* PWM <B> */
 &pwm5 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm5>;
        #pwm-cells = <3>;
 };
 
+/* PWM <C> */
 &pwm6 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm6>;
        #pwm-cells = <3>;
 };
 
+/* PWM <D> */
 &pwm7 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm7>;
@@ -182,21 +194,24 @@
        status = "disabled";
 };
 
+/* Colibri UART_A */
 &uart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart1 &pinctrl_uart1_ctrl1>;
-       fsl,uart-has-rtscts;
+       uart-has-rtscts;
        fsl,dte-mode;
        status = "okay";
 };
 
+/* Colibri UART_B */
 &uart2 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart2>;
-       fsl,uart-has-rtscts;
+       uart-has-rtscts;
        fsl,dte-mode;
 };
 
+/* Colibri UART_C */
 &uart5 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart5>;
@@ -205,7 +220,7 @@
 
 /* Colibri USBC */
 &usbotg1 {
-       dr_mode = "otg";
+       dr_mode = "host";
        srp-disable;
        hnp-disable;
        adp-disable;
@@ -234,6 +249,13 @@
 };
 
 &iomuxc {
+       pinctrl_can_int: canint-grp {
+               fsl,pins = <
+                       /* SODIMM 73 */
+                       MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04    0X14
+               >;
+       };
+
        pinctrl_enet2: enet2-grp {
                fsl,pins = <
                        MX6UL_PAD_GPIO1_IO06__ENET2_MDIO        0x1b0b0
@@ -249,6 +271,33 @@
                >;
        };
 
+       pinctrl_ecspi1_cs: ecspi1-cs-grp {
+               fsl,pins = <
+                       MX6UL_PAD_LCD_DATA21__GPIO3_IO26        0x000a0
+               >;
+       };
+
+       pinctrl_ecspi1: ecspi1-grp {
+               fsl,pins = <
+                       MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK       0x000a0
+                       MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI       0x000a0
+                       MX6UL_PAD_LCD_DATA23__ECSPI1_MISO       0x100a0
+               >;
+       };
+
+       pinctrl_flexcan2: flexcan2-grp {
+               fsl,pins = <
+                       MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX   0x1b020
+                       MX6UL_PAD_ENET1_RX_EN__FLEXCAN2_TX      0x1b020
+               >;
+       };
+
+       pinctrl_gpio_bl_on: gpio-bl-on-grp {
+               fsl,pins = <
+                       MX6UL_PAD_JTAG_TMS__GPIO1_IO11          0x000a0
+               >;
+       };
+
        pinctrl_gpio1: gpio1-grp {
                fsl,pins = <
                        MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00    0x74 /* SODIMM 55 */
@@ -305,39 +354,6 @@
                >;
        };
 
-       pinctrl_can_int: canint-grp {
-               fsl,pins = <
-                       MX6UL_PAD_ENET1_TX_DATA1__GPIO2_IO04    0X14 /* SODIMM 73 */
-               >;
-       };
-
-       pinctrl_ecspi1_cs: ecspi1-cs-grp {
-               fsl,pins = <
-                       MX6UL_PAD_LCD_DATA21__GPIO3_IO26        0x000a0
-               >;
-       };
-
-       pinctrl_ecspi1: ecspi1-grp {
-               fsl,pins = <
-                       MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK       0x000a0
-                       MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI       0x000a0
-                       MX6UL_PAD_LCD_DATA23__ECSPI1_MISO       0x100a0
-               >;
-       };
-
-       pinctrl_flexcan2: flexcan2-grp {
-               fsl,pins = <
-                       MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX   0x1b020
-                       MX6UL_PAD_ENET1_RX_EN__FLEXCAN2_TX      0x1b020
-               >;
-       };
-
-       pinctrl_gpio_bl_on: gpio-bl-on-grp {
-               fsl,pins = <
-                       MX6UL_PAD_JTAG_TMS__GPIO1_IO11          0x000a0
-               >;
-       };
-
        pinctrl_gpmi_nand: gpmi-nand-grp {
                fsl,pins = <
                        MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00   0x100a9
@@ -521,6 +537,8 @@
                        MX6UL_PAD_CSI_DATA03__USDHC2_DATA3      0x17059
                        MX6UL_PAD_CSI_HSYNC__USDHC2_CMD         0x17059
                        MX6UL_PAD_CSI_VSYNC__USDHC2_CLK         0x17059
+
+                       MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT    0x14
                >;
        };
 };
@@ -548,7 +566,7 @@
                >;
        };
 
-       pinctrl_snvs_ad7879_int: snvs-ad7879-int { /* TOUCH Interrupt */
+       pinctrl_snvs_ad7879_int: snvs-ad7879-int-grp { /* TOUCH Interrupt */
                fsl,pins = <
                        MX6ULL_PAD_SNVS_TAMPER7__GPIO5_IO07     0x1b0b0
                >;