ARM: dts: imx6qdl: rename pinctrl_pwm0 for consistency

[karo-tx-linux.git] / arch / arm / boot / dts / imx6qdl.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 59154dc15fe4ee441c80fd17d9c9141a16ee5e60..ea666818a90b1bf6e48ab6106d057fe4b56bbdbb 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -331,6 +331,7 @@
                                interrupts = <0 110 0x04>;
                                clocks = <&clks 108>, <&clks 109>;
                                clock-names = "ipg", "per";
+                               status = "disabled";
                        };
 
                        can2: flexcan@02094000 {
@@ -339,6 +340,7 @@
                                interrupts = <0 111 0x04>;
                                clocks = <&clks 110>, <&clks 111>;
                                clock-names = "ipg", "per";
+                               status = "disabled";
                        };
 
                        gpt: gpt@02098000 {
@@ -637,6 +639,23 @@
                                                        MX6QDL_PAD_DISP0_DAT19__AUD5_RXD  0x80000000
                                                >;
                                        };
+
+                                       pinctrl_audmux_4: audmux-4 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_EIM_D24__AUD5_RXFS     0x80000000
+                                                       MX6QDL_PAD_EIM_D25__AUD5_RXC      0x80000000
+                                                       MX6QDL_PAD_DISP0_DAT19__AUD5_RXD  0x80000000
+                                               >;
+                                       };
+
+                                       pinctrl_audmux_5: audmux-5 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_KEY_ROW1__AUD5_RXD  0x80000000
+                                                       MX6QDL_PAD_KEY_ROW0__AUD5_TXD  0x80000000
+                                                       MX6QDL_PAD_KEY_COL0__AUD5_TXC  0x80000000
+                                                       MX6QDL_PAD_KEY_COL1__AUD5_TXFS 0x80000000
+                                               >;
+                                       };
                                };
 
                                ecspi1 {
@@ -729,6 +748,20 @@
                                                        MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN     0x1b0b0
                                                >;
                                        };
+
+                                       pinctrl_enet_4: enetgrp-4 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_ENET_MDC__ENET_MDC         0x1b0b0
+                                                       MX6QDL_PAD_ENET_MDIO__ENET_MDIO       0x1b0b0
+                                                       MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0   0x1b0b0
+                                                       MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1   0x1b0b0
+                                                       MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER     0x1b0b0
+                                                       MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN     0x1b0b0
+                                                       MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0   0x1b0b0
+                                                       MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1   0x1b0b0
+                                                       MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN    0x1b0b0
+                                               >;
+                                       };
                                };
 
                                esai {
@@ -776,6 +809,13 @@
                                                        MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
                                                >;
                                        };
+
+                                       pinctrl_flexcan1_3: flexcan1grp-3 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_GPIO_7__FLEXCAN1_TX   0x80000000
+                                                       MX6QDL_PAD_GPIO_8__FLEXCAN1_RX   0x80000000
+                                               >;
+                                       };
                                };
 
                                flexcan2 {
@@ -809,6 +849,28 @@
                                                        MX6QDL_PAD_SD4_DAT0__NAND_DQS      0x00b1
                                                >;
                                        };
+
+                                       /* No Strobe */
+                                       pinctrl_gpmi_nand_2: gpmi-nand-2 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_NANDF_CLE__NAND_CLE     0xb0b1
+                                                       MX6QDL_PAD_NANDF_ALE__NAND_ALE     0xb0b1
+                                                       MX6QDL_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1
+                                                       MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
+                                                       MX6QDL_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1
+                                                       MX6QDL_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1
+                                                       MX6QDL_PAD_SD4_CMD__NAND_RE_B      0xb0b1
+                                                       MX6QDL_PAD_SD4_CLK__NAND_WE_B      0xb0b1
+                                                       MX6QDL_PAD_NANDF_D0__NAND_DATA00   0xb0b1
+                                                       MX6QDL_PAD_NANDF_D1__NAND_DATA01   0xb0b1
+                                                       MX6QDL_PAD_NANDF_D2__NAND_DATA02   0xb0b1
+                                                       MX6QDL_PAD_NANDF_D3__NAND_DATA03   0xb0b1
+                                                       MX6QDL_PAD_NANDF_D4__NAND_DATA04   0xb0b1
+                                                       MX6QDL_PAD_NANDF_D5__NAND_DATA05   0xb0b1
+                                                       MX6QDL_PAD_NANDF_D6__NAND_DATA06   0xb0b1
+                                                       MX6QDL_PAD_NANDF_D7__NAND_DATA07   0xb0b1
+                                               >;
+                                       };
                                };
 
                                hdmi_hdcp {
@@ -1012,8 +1074,8 @@
                                        };
                                };
 
-                               pwm0 {
-                                       pinctrl_pwm0_1: pwm0grp-1 {
+                               pwm1 {
+                                       pinctrl_pwm1_1: pwm1grp-1 {
                                                fsl,pins = <
                                                        MX6QDL_PAD_SD1_DAT3__PWM1_OUT 0x1b0b1
                                                >;
@@ -1056,6 +1118,13 @@
                                                        MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
                                                >;
                                        };
+
+                                       pinctrl_uart1_2: uart1grp-2 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA 0x1b0b1
+                                                       MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA 0x1b0b1
+                                               >;
+                                       };
                                };
 
                                uart2 {
@@ -1074,6 +1143,13 @@
                                                        MX6QDL_PAD_EIM_D29__UART2_DTE_RTS_B 0x1b0b1
                                                >;
                                        };
+
+                                       pinctrl_uart2_3: uart2grp-3 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA 0x1b0b1
+                                                       MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA 0x1b0b1
+                                               >;
+                                       };
                                };
 
                                uart3 {
@@ -1094,6 +1170,20 @@
                                                        MX6QDL_PAD_EIM_EB3__UART3_RTS_B   0x1b0b1
                                                >;
                                        };
+
+                                       pinctrl_uart3_3: uart3grp-3 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
+                                                       MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+                                               >;
+                                       };
+
+                                       pinctrl_uart3_rtscts_3: uart3rtscts-3 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_SD3_DAT3__UART3_CTS_B  0x1b0b1
+                                                       MX6QDL_PAD_SD3_RST__UART3_RTS_B   0x1b0b1
+                                               >;
+                                       };
                                };
 
                                uart4 {
@@ -1105,6 +1195,15 @@
                                        };
                                };
 
+                               uart5 {
+                                       pinctrl_uart5_1: uart5grp-1 {
+                                               fsl,pins = <
+                                                       MX6QDL_PAD_KEY_COL1__UART5_TX_DATA 0x1b0b1
+                                                       MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA 0x1b0b1
+                                               >;
+                                       };
+                               };
+
                                usbotg {
                                        pinctrl_usbotg_1: usbotggrp-1 {
                                                fsl,pins = <