]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ARM: dts: imx6q: Align pin config nodes with bindings
authorMarek Vasut <marex@denx.de>
Thu, 17 Oct 2024 21:11:24 +0000 (23:11 +0200)
committerShawn Guo <shawnguo@kernel.org>
Fri, 1 Nov 2024 09:00:25 +0000 (17:00 +0800)
Bindings expect pin configuration nodes in pinctrl to match certain
naming and not be part of another fake node:

pinctrl@30330000: '...' does not match any of the regexes: 'grp$', 'pinctrl-[0-9]+'

Drop the wrapping node and adjust the names to have "grp" prefix.
Diff looks big but this should have no functional impact, use e.g.
git show -w to view the diff.

Reviewed-by: Alexander Stein <alexander.stein@ew.tq-group.com> # imx6q-mba6
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
12 files changed:
arch/arm/boot/dts/nxp/imx/imx6q-arm2.dts
arch/arm/boot/dts/nxp/imx/imx6q-ba16.dtsi
arch/arm/boot/dts/nxp/imx/imx6q-dmo-edmqmx6.dts
arch/arm/boot/dts/nxp/imx/imx6q-gk802.dts
arch/arm/boot/dts/nxp/imx/imx6q-h100.dts
arch/arm/boot/dts/nxp/imx/imx6q-logicpd.dts
arch/arm/boot/dts/nxp/imx/imx6q-mba6.dtsi
arch/arm/boot/dts/nxp/imx/imx6q-novena.dts
arch/arm/boot/dts/nxp/imx/imx6q-prti6q.dts
arch/arm/boot/dts/nxp/imx/imx6q-prtwd2.dts
arch/arm/boot/dts/nxp/imx/imx6q-sbc6x.dts
arch/arm/boot/dts/nxp/imx/imx6q-utilite-pro.dts

index 631d6d690959fcc9760ff24cf4cbbd74a56c5423..235148c1edf1973e23da19cfc00b126d89eacde9 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hog>;
 
-       imx6q-arm2 {
-               pinctrl_hog: hoggrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D25__GPIO3_IO25 0x80000000
-                       >;
-               };
+       pinctrl_hog: hoggrp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D25__GPIO3_IO25 0x80000000
+               >;
+       };
 
-               pinctrl_enet: enetgrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_KEY_COL1__ENET_MDIO          0x1b0b0
-                               MX6QDL_PAD_KEY_COL2__ENET_MDC           0x1b0b0
-                               MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b030
-                               MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
-                               MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
-                               MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
-                               MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
-                               MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
-                               MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
-                               MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
-                               MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b030
-                               MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b030
-                               MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
-                               MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
-                               MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b030
-                               MX6QDL_PAD_GPIO_6__ENET_IRQ             0x000b1
-                       >;
-               };
+       pinctrl_enet: enetgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_COL1__ENET_MDIO          0x1b0b0
+                       MX6QDL_PAD_KEY_COL2__ENET_MDC           0x1b0b0
+                       MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b030
+                       MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
+                       MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
+                       MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
+                       MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
+                       MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
+                       MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
+                       MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
+                       MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b030
+                       MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b030
+                       MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
+                       MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
+                       MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b030
+                       MX6QDL_PAD_GPIO_6__ENET_IRQ             0x000b1
+               >;
+       };
 
-               pinctrl_gpmi_nand: gpminandgrp {
-                       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
-                               MX6QDL_PAD_SD4_DAT0__NAND_DQS           0x00b1
-                       >;
-               };
+       pinctrl_gpmi_nand: gpminandgrp {
+               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
+                       MX6QDL_PAD_SD4_DAT0__NAND_DQS           0x00b1
+               >;
+       };
 
-               pinctrl_uart2: uart2grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D26__UART2_RX_DATA       0x1b0b1
-                               MX6QDL_PAD_EIM_D27__UART2_TX_DATA       0x1b0b1
-                               MX6QDL_PAD_EIM_D28__UART2_DTE_CTS_B     0x1b0b1
-                               MX6QDL_PAD_EIM_D29__UART2_DTE_RTS_B     0x1b0b1
-                       >;
-               };
+       pinctrl_uart2: uart2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D26__UART2_RX_DATA       0x1b0b1
+                       MX6QDL_PAD_EIM_D27__UART2_TX_DATA       0x1b0b1
+                       MX6QDL_PAD_EIM_D28__UART2_DTE_CTS_B     0x1b0b1
+                       MX6QDL_PAD_EIM_D29__UART2_DTE_RTS_B     0x1b0b1
+               >;
+       };
 
-               pinctrl_uart4: uart4grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_KEY_COL0__UART4_TX_DATA      0x1b0b1
-                               MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA      0x1b0b1
-                       >;
-               };
+       pinctrl_uart4: uart4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_COL0__UART4_TX_DATA      0x1b0b1
+                       MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA      0x1b0b1
+               >;
+       };
 
-               pinctrl_usbotg: usbotggrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x17059
-                       >;
-               };
+       pinctrl_usbotg: usbotggrp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x17059
+               >;
+       };
 
-               pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
-                               MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
-                               MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
-                               MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
-                               MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
-                               MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
-                               MX6QDL_PAD_SD3_DAT4__SD3_DATA4          0x17059
-                               MX6QDL_PAD_SD3_DAT5__SD3_DATA5          0x17059
-                               MX6QDL_PAD_SD3_DAT6__SD3_DATA6          0x17059
-                               MX6QDL_PAD_SD3_DAT7__SD3_DATA7          0x17059
-                       >;
-               };
+       pinctrl_usdhc3: usdhc3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
+                       MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
+                       MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
+                       MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
+                       MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
+                       MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
+                       MX6QDL_PAD_SD3_DAT4__SD3_DATA4          0x17059
+                       MX6QDL_PAD_SD3_DAT5__SD3_DATA5          0x17059
+                       MX6QDL_PAD_SD3_DAT6__SD3_DATA6          0x17059
+                       MX6QDL_PAD_SD3_DAT7__SD3_DATA7          0x17059
+               >;
+       };
 
-               pinctrl_usdhc3_cdwp: usdhc3cdwp {
-                       fsl,pins = <
-                               MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000
-                               MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000
-                       >;
-               };
+       pinctrl_usdhc3_cdwp: usdhc3cdwpgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000
+                       MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000
+               >;
+       };
 
-               pinctrl_usdhc4: usdhc4grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD4_CMD__SD4_CMD             0x17059
-                               MX6QDL_PAD_SD4_CLK__SD4_CLK             0x10059
-                               MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x17059
-                               MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x17059
-                               MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x17059
-                               MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x17059
-                               MX6QDL_PAD_SD4_DAT4__SD4_DATA4          0x17059
-                               MX6QDL_PAD_SD4_DAT5__SD4_DATA5          0x17059
-                               MX6QDL_PAD_SD4_DAT6__SD4_DATA6          0x17059
-                               MX6QDL_PAD_SD4_DAT7__SD4_DATA7          0x17059
-                       >;
-               };
+       pinctrl_usdhc4: usdhc4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_CMD__SD4_CMD             0x17059
+                       MX6QDL_PAD_SD4_CLK__SD4_CLK             0x10059
+                       MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x17059
+                       MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x17059
+                       MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x17059
+                       MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x17059
+                       MX6QDL_PAD_SD4_DAT4__SD4_DATA4          0x17059
+                       MX6QDL_PAD_SD4_DAT5__SD4_DATA5          0x17059
+                       MX6QDL_PAD_SD4_DAT6__SD4_DATA6          0x17059
+                       MX6QDL_PAD_SD4_DAT7__SD4_DATA7          0x17059
+               >;
        };
 };
 
index 09d9ca0cb3324384fb6fa6fbf817d59bf1bfae4f..d77472519086bd749be6394282ad1a49a8b14064 100644 (file)
                >;
        };
 
-       pinctrl_usdhc3_reset: usdhc3grp-reset {
+       pinctrl_usdhc3_reset: usdhc3-resetgrp {
                fsl,pins = <
                        MX6QDL_PAD_SD3_RST__SD3_RESET   0x170F9
                >;
index 9f7ac7158c465eb1cfa710cb3e1790d554927644..c5525b2c1dbd594ba79c6c95e9dfc6b64a87670d 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hog>;
 
-       imx6q-dmo-edmqmx6 {
-               pinctrl_hog: hoggrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x80000000
-                               MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000
-                       >;
-               };
+       pinctrl_hog: hoggrp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_A16__GPIO2_IO22 0x80000000
+                       MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000
+               >;
+       };
 
-               pinctrl_can1: can1grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX        0x1b0b0
-                               MX6QDL_PAD_GPIO_7__FLEXCAN1_TX          0x1b0b0
-                       >;
-               };
+       pinctrl_can1: can1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX        0x1b0b0
+                       MX6QDL_PAD_GPIO_7__FLEXCAN1_TX          0x1b0b0
+               >;
+       };
 
-               pinctrl_ecspi5: ecspi5rp-1 {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD1_DAT0__ECSPI5_MISO        0x80000000
-                               MX6QDL_PAD_SD1_CMD__ECSPI5_MOSI         0x80000000
-                               MX6QDL_PAD_SD1_CLK__ECSPI5_SCLK         0x80000000
-                               MX6QDL_PAD_SD2_DAT3__GPIO1_IO12         0x80000000
-                       >;
-               };
+       pinctrl_ecspi5: ecspi5rp-1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD1_DAT0__ECSPI5_MISO        0x80000000
+                       MX6QDL_PAD_SD1_CMD__ECSPI5_MOSI         0x80000000
+                       MX6QDL_PAD_SD1_CLK__ECSPI5_SCLK         0x80000000
+                       MX6QDL_PAD_SD2_DAT3__GPIO1_IO12         0x80000000
+               >;
+       };
 
-               pinctrl_enet: enetgrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
-                               MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b030
-                               MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b030
-                               MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
-                               MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
-                               MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b030
-                               MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b030
-                               MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
-                               MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
-                               MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
-                               MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
-                               MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
-                               MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
-                               MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
-                               MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
-                               MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25      0x1b0b0
-                               MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0x4001b0a8
-                       >;
-               };
+       pinctrl_enet: enetgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
+                       MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b030
+                       MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b030
+                       MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
+                       MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
+                       MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b030
+                       MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b030
+                       MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
+                       MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
+                       MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
+                       MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
+                       MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
+                       MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
+                       MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
+                       MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
+                       MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25      0x1b0b0
+                       MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0x4001b0a8
+               >;
+       };
 
-               pinctrl_i2c1: i2c1grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
-                               MX6QDL_PAD_EIM_D28__I2C1_SDA            0x4001b8b1
-                       >;
-               };
+       pinctrl_i2c1: i2c1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
+                       MX6QDL_PAD_EIM_D28__I2C1_SDA            0x4001b8b1
+               >;
+       };
 
-               pinctrl_i2c2: i2c2grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_EB2__I2C2_SCL            0x4001b8b1
-                               MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
-                       >;
-               };
+       pinctrl_i2c2: i2c2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_EB2__I2C2_SCL            0x4001b8b1
+                       MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
+               >;
+       };
 
-               pinctrl_i2c3: i2c3grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D17__I2C3_SCL            0x4001b8b1
-                               MX6QDL_PAD_GPIO_6__I2C3_SDA             0x4001b8b1
-                       >;
-               };
+       pinctrl_i2c3: i2c3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D17__I2C3_SCL            0x4001b8b1
+                       MX6QDL_PAD_GPIO_6__I2C3_SDA             0x4001b8b1
+               >;
+       };
 
-               pinctrl_pcie: pciegrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_KEY_COL1__GPIO4_IO08         0x100b1
-                       >;
-               };
+       pinctrl_pcie: pciegrp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_COL1__GPIO4_IO08         0x100b1
+               >;
+       };
 
-               pinctrl_pfuze: pfuze100grp1 {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D20__GPIO3_IO20          0x80000000
-                       >;
-               };
+       pinctrl_pfuze: pfuze100grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D20__GPIO3_IO20          0x80000000
+               >;
+       };
 
-               pinctrl_stmpe1: stmpe1grp {
-                       fsl,pins = <MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000>;
-               };
+       pinctrl_stmpe1: stmpe1grp {
+               fsl,pins = <MX6QDL_PAD_EIM_D30__GPIO3_IO30 0x80000000>;
+       };
 
-               pinctrl_stmpe2: stmpe2grp {
-                       fsl,pins = <MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000>;
-               };
+       pinctrl_stmpe2: stmpe2grp {
+               fsl,pins = <MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000>;
+       };
 
-               pinctrl_uart1: uart1grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA      0x1b0b1
-                               MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA      0x1b0b1
-                       >;
-               };
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA      0x1b0b1
+                       MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA      0x1b0b1
+               >;
+       };
 
-               pinctrl_uart2: uart2grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D26__UART2_TX_DATA       0x1b0b1
-                               MX6QDL_PAD_EIM_D27__UART2_RX_DATA       0x1b0b1
-                       >;
-               };
+       pinctrl_uart2: uart2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D26__UART2_TX_DATA       0x1b0b1
+                       MX6QDL_PAD_EIM_D27__UART2_RX_DATA       0x1b0b1
+               >;
+       };
 
-               pinctrl_usbotg: usbotggrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID       0x17059
-                       >;
-               };
+       pinctrl_usbotg: usbotggrp {
+               fsl,pins = <
+                       MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID       0x17059
+               >;
+       };
 
-               pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
-                               MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
-                               MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
-                               MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
-                               MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
-                               MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
-                       >;
-               };
+       pinctrl_usdhc3: usdhc3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
+                       MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
+                       MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
+                       MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
+                       MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
+                       MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
+               >;
+       };
 
-               pinctrl_usdhc4: usdhc4grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD4_CMD__SD4_CMD             0x17059
-                               MX6QDL_PAD_SD4_CLK__SD4_CLK             0x10059
-                               MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x17059
-                               MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x17059
-                               MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x17059
-                               MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x17059
-                               MX6QDL_PAD_SD4_DAT4__SD4_DATA4          0x17059
-                               MX6QDL_PAD_SD4_DAT5__SD4_DATA5          0x17059
-                               MX6QDL_PAD_SD4_DAT6__SD4_DATA6          0x17059
-                               MX6QDL_PAD_SD4_DAT7__SD4_DATA7          0x17059
-                       >;
-               };
+       pinctrl_usdhc4: usdhc4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_CMD__SD4_CMD             0x17059
+                       MX6QDL_PAD_SD4_CLK__SD4_CLK             0x10059
+                       MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x17059
+                       MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x17059
+                       MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x17059
+                       MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x17059
+                       MX6QDL_PAD_SD4_DAT4__SD4_DATA4          0x17059
+                       MX6QDL_PAD_SD4_DAT5__SD4_DATA5          0x17059
+                       MX6QDL_PAD_SD4_DAT6__SD4_DATA6          0x17059
+                       MX6QDL_PAD_SD4_DAT7__SD4_DATA7          0x17059
+               >;
        };
 };
 
index ce55c9558679b80728731d180e683d9b7f08739e..e0d29b07fbb1ff72d62f611709c1cdb5c10d263b 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hog>;
 
-       imx6q-gk802 {
-               pinctrl_hog: hoggrp {
-                       fsl,pins = <
-                               /* Recovery button, active-low */
-                               MX6QDL_PAD_EIM_D16__GPIO3_IO16  0x100b1
-                               /* RTL8192CU enable GPIO, active-low */
-                               MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x1b0b0
-                       >;
-               };
+       pinctrl_hog: hoggrp {
+               fsl,pins = <
+                       /* Recovery button, active-low */
+                       MX6QDL_PAD_EIM_D16__GPIO3_IO16  0x100b1
+                       /* RTL8192CU enable GPIO, active-low */
+                       MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x1b0b0
+               >;
+       };
 
-               pinctrl_i2c2: i2c2grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_KEY_COL3__I2C2_SCL           0x4001b8b1
-                               MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
-                       >;
-               };
+       pinctrl_i2c2: i2c2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_COL3__I2C2_SCL           0x4001b8b1
+                       MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
+               >;
+       };
 
-               pinctrl_i2c3: i2c3grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_GPIO_5__I2C3_SCL             0x4001b8b1
-                               MX6QDL_PAD_GPIO_16__I2C3_SDA            0x4001b8b1
-                       >;
-               };
+       pinctrl_i2c3: i2c3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_5__I2C3_SCL             0x4001b8b1
+                       MX6QDL_PAD_GPIO_16__I2C3_SDA            0x4001b8b1
+               >;
+       };
 
-               pinctrl_uart4: uart4grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_KEY_COL0__UART4_TX_DATA      0x1b0b1
-                               MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA      0x1b0b1
-                       >;
-               };
+       pinctrl_uart4: uart4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_COL0__UART4_TX_DATA      0x1b0b1
+                       MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA      0x1b0b1
+               >;
+       };
 
-               pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
-                               MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
-                               MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
-                               MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
-                               MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
-                               MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
-                       >;
-               };
+       pinctrl_usdhc3: usdhc3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
+                       MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
+                       MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
+                       MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
+                       MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
+                       MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
+               >;
+       };
 
-               pinctrl_usdhc4: usdhc4grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD4_CMD__SD4_CMD             0x17059
-                               MX6QDL_PAD_SD4_CLK__SD4_CLK             0x10059
-                               MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x17059
-                               MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x17059
-                               MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x17059
-                               MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x17059
-                       >;
-               };
+       pinctrl_usdhc4: usdhc4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_CMD__SD4_CMD             0x17059
+                       MX6QDL_PAD_SD4_CLK__SD4_CLK             0x10059
+                       MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x17059
+                       MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x17059
+                       MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x17059
+                       MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x17059
+               >;
        };
 };
 
index a603562ea49af6d7107927566b7ba13856cfc5cb..46e011a363e8827e84008dead0390a5e9548ffd0 100644 (file)
 };
 
 &iomuxc {
-       h100 {
-               pinctrl_h100_hdmi: h100-hdmi {
-                       fsl,pins = <
-                               MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE   0x1f8b0
-                       >;
-               };
+       pinctrl_h100_hdmi: h100-hdmigrp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE   0x1f8b0
+               >;
+       };
 
-               pinctrl_h100_i2c1: h100-i2c1 {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
-                               MX6QDL_PAD_EIM_D28__I2C1_SDA            0x4001b8b1
-                       >;
-               };
+       pinctrl_h100_i2c1: h100-i2c1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
+                       MX6QDL_PAD_EIM_D28__I2C1_SDA            0x4001b8b1
+               >;
+       };
 
-               pinctrl_h100_i2c2: h100-i2c2 {
-                       fsl,pins = <
-                               MX6QDL_PAD_KEY_COL3__I2C2_SCL           0x4001b8b1
-                               MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
-                       >;
-               };
+       pinctrl_h100_i2c2: h100-i2c2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_COL3__I2C2_SCL           0x4001b8b1
+                       MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
+               >;
+       };
 
-               pinctrl_h100_leds: pinctrl-h100-leds {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_DA0__GPIO3_IO00          0x1b0b0
-                               MX6QDL_PAD_EIM_EB1__GPIO2_IO29          0x1b0b0
-                               MX6QDL_PAD_EIM_EB0__GPIO2_IO28          0x1b0b0
-                       >;
-               };
+       pinctrl_h100_leds: pinctrl-h100-ledsgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_DA0__GPIO3_IO00          0x1b0b0
+                       MX6QDL_PAD_EIM_EB1__GPIO2_IO29          0x1b0b0
+                       MX6QDL_PAD_EIM_EB0__GPIO2_IO28          0x1b0b0
+               >;
+       };
 
-               pinctrl_h100_reg_hdmi: h100-reg-hdmi {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_A18__GPIO2_IO20          0x1b0b0
-                       >;
-               };
+       pinctrl_h100_reg_hdmi: h100-reg-hdmigrp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_A18__GPIO2_IO20          0x1b0b0
+               >;
+       };
 
-               pinctrl_h100_sgtl5000: h100-sgtl5000 {
-                       fsl,pins = <
-                               MX6QDL_PAD_DISP0_DAT19__AUD5_RXD        0x130b0
-                               MX6QDL_PAD_KEY_COL0__AUD5_TXC           0x130b0
-                               MX6QDL_PAD_KEY_ROW0__AUD5_TXD           0x110b0
-                               MX6QDL_PAD_KEY_COL1__AUD5_TXFS          0x130b0
-                               MX6QDL_PAD_GPIO_5__CCM_CLKO1            0x130b0
-                       >;
-               };
+       pinctrl_h100_sgtl5000: h100-sgtl5000grp {
+               fsl,pins = <
+                       MX6QDL_PAD_DISP0_DAT19__AUD5_RXD        0x130b0
+                       MX6QDL_PAD_KEY_COL0__AUD5_TXC           0x130b0
+                       MX6QDL_PAD_KEY_ROW0__AUD5_TXD           0x110b0
+                       MX6QDL_PAD_KEY_COL1__AUD5_TXFS          0x130b0
+                       MX6QDL_PAD_GPIO_5__CCM_CLKO1            0x130b0
+               >;
+       };
 
-               pinctrl_h100_tc358743: h100-tc358743 {
-                       fsl,pins = <
-                               MX6QDL_PAD_NANDF_CS2__GPIO6_IO15        0x1b0b0
-                       >;
-               };
+       pinctrl_h100_tc358743: h100-tc358743grp {
+               fsl,pins = <
+                       MX6QDL_PAD_NANDF_CS2__GPIO6_IO15        0x1b0b0
+               >;
+       };
 
-               pinctrl_h100_uart2: h100-uart2 {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA      0x1b0b1
-                               MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA      0x1b0b1
-                       >;
-               };
+       pinctrl_h100_uart2: h100-uart2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA      0x1b0b1
+                       MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA      0x1b0b1
+               >;
+       };
 
-               pinctrl_h100_usbh1_vbus: hummingboard-usbh1-vbus {
-                       fsl,pins = <
-                               MX6QDL_PAD_GPIO_0__GPIO1_IO00           0x1b0b0
-                       >;
-               };
+       pinctrl_h100_usbh1_vbus: hummingboard-usbh1-vbusgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_0__GPIO1_IO00           0x1b0b0
+               >;
+       };
 
-               pinctrl_h100_usbotg_id: hummingboard-usbotg-id {
-                       fsl,pins = <
-                               MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x13059
-                       >;
-               };
+       pinctrl_h100_usbotg_id: hummingboard-usbotg-idgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x13059
+               >;
+       };
 
-               pinctrl_h100_usbotg_vbus: hummingboard-usbotg-vbus {
-                       fsl,pins = <
-                               MX6QDL_PAD_EIM_D22__GPIO3_IO22          0x1b0b0
-                       >;
-               };
+       pinctrl_h100_usbotg_vbus: hummingboard-usbotg-vbusgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D22__GPIO3_IO22          0x1b0b0
+               >;
+       };
 
-               pinctrl_h100_usdhc2: h100-usdhc2 {
-                       fsl,pins = <
-                               MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x1f071
-                               MX6QDL_PAD_SD2_CMD__SD2_CMD             0x17059
-                               MX6QDL_PAD_SD2_CLK__SD2_CLK             0x10059
-                               MX6QDL_PAD_SD2_DAT0__SD2_DATA0          0x17059
-                               MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x17059
-                               MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x17059
-                               MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x13059
-                               MX6QDL_PAD_KEY_ROW1__SD2_VSELECT        0x1b0b0
-                       >;
-               };
+       pinctrl_h100_usdhc2: h100-usdhc2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x1f071
+                       MX6QDL_PAD_SD2_CMD__SD2_CMD             0x17059
+                       MX6QDL_PAD_SD2_CLK__SD2_CLK             0x10059
+                       MX6QDL_PAD_SD2_DAT0__SD2_DATA0          0x17059
+                       MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x17059
+                       MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x17059
+                       MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x13059
+                       MX6QDL_PAD_KEY_ROW1__SD2_VSELECT        0x1b0b0
+               >;
+       };
 
-               pinctrl_h100_usdhc2_100mhz: h100-usdhc2-100mhz {
-                       fsl,pins = <
-                               MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x1f071
-                               MX6QDL_PAD_SD2_CMD__SD2_CMD             0x170b9
-                               MX6QDL_PAD_SD2_CLK__SD2_CLK             0x100b9
-                               MX6QDL_PAD_SD2_DAT0__SD2_DATA0          0x170b9
-                               MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x170b9
-                               MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x170b9
-                               MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x170b9
-                               MX6QDL_PAD_KEY_ROW1__SD2_VSELECT        0x1b0b0
-                       >;
-               };
+       pinctrl_h100_usdhc2_100mhz: h100-usdhc2-100mhzgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x1f071
+                       MX6QDL_PAD_SD2_CMD__SD2_CMD             0x170b9
+                       MX6QDL_PAD_SD2_CLK__SD2_CLK             0x100b9
+                       MX6QDL_PAD_SD2_DAT0__SD2_DATA0          0x170b9
+                       MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x170b9
+                       MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x170b9
+                       MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x170b9
+                       MX6QDL_PAD_KEY_ROW1__SD2_VSELECT        0x1b0b0
+               >;
+       };
 
-               pinctrl_h100_usdhc2_200mhz: h100-usdhc2-200mhz {
-                       fsl,pins = <
-                               MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x1f071
-                               MX6QDL_PAD_SD2_CMD__SD2_CMD             0x170f9
-                               MX6QDL_PAD_SD2_CLK__SD2_CLK             0x100f9
-                               MX6QDL_PAD_SD2_DAT0__SD2_DATA0          0x170f9
-                               MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x170f9
-                               MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x170f9
-                               MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x170f9
-                               MX6QDL_PAD_KEY_ROW1__SD2_VSELECT        0x1b0b0
-                       >;
-               };
+       pinctrl_h100_usdhc2_200mhz: h100-usdhc2-200mhzgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_4__GPIO1_IO04           0x1f071
+                       MX6QDL_PAD_SD2_CMD__SD2_CMD             0x170f9
+                       MX6QDL_PAD_SD2_CLK__SD2_CLK             0x100f9
+                       MX6QDL_PAD_SD2_DAT0__SD2_DATA0          0x170f9
+                       MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x170f9
+                       MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x170f9
+                       MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x170f9
+                       MX6QDL_PAD_KEY_ROW1__SD2_VSELECT        0x1b0b0
+               >;
        };
 };
 
index 46a4ddedb4236d324f45a8701f326de6d6fdb360..86b813a57c1e4507ed303016e7e6e18511f4eb14 100644 (file)
 };
 
 &iomuxc {
-       pinctrl_lcd_reg: lcdreg {
+       pinctrl_lcd_reg: lcdreggrp {
                fsl,pins = <
                        MX6QDL_PAD_DI0_PIN15__GPIO4_IO17        0x100b0 /* R_LCD_PANEL_PWR */
                >;
        };
 
-       pinctrl_lcd_reset: lcdreset {
+       pinctrl_lcd_reset: lcdresetgrp {
                fsl,pins = <
                        MX6QDL_PAD_EIM_A25__GPIO5_IO02  0x100b0 /* LCD_nRESET */
                >;
index 0d7be456729162eeaab4f1bd1c924e87f2e9af23..1e5eb837fd80d824fa65086c2067023fe3592066 100644 (file)
@@ -32,7 +32,7 @@
 };
 
 &iomuxc {
-       pinctrl_ecspi5_mba6x: ecspi5grp-mba6x {
+       pinctrl_ecspi5_mba6x: ecspi5-mba6xgrp {
                fsl,pins = <
                        /* HYS, SPEED = MED, 100k up, DSE = 011, SRE_FAST */
                        MX6QDL_PAD_SD1_DAT0__ECSPI5_MISO 0x1b099
index d392b5bd2eea8375711995baa433735e1998b621..8c3a9ea8d5b34aa395b3e8a5f34896a91eff7749 100644 (file)
 };
 
 &iomuxc {
-       pinctrl_audmux_novena: audmuxgrp-novena {
+       pinctrl_audmux_novena: audmux-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_CSI0_DAT7__AUD3_RXD          0x130b0
                        MX6QDL_PAD_CSI0_DAT4__AUD3_TXC          0x130b0
                >;
        };
 
-       pinctrl_backlight_novena: backlightgrp-novena {
+       pinctrl_backlight_novena: backlight-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_DISP0_DAT8__PWM1_OUT         0x1b0b0
                        MX6QDL_PAD_CSI0_DAT10__GPIO5_IO28       0x1b0b1
                >;
        };
 
-       pinctrl_ecspi3_novena: ecspi3grp-novena {
+       pinctrl_ecspi3_novena: ecspi3-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO      0x100b1
                        MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI      0x100b1
                >;
        };
 
-       pinctrl_enet_novena: enetgrp-novena {
+       pinctrl_enet_novena: enet-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
                        MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
                >;
        };
 
-       pinctrl_fpga_gpio: fpgagpiogrp-novena {
+       pinctrl_fpga_gpio: fpgagpio-novenagrp {
                fsl,pins = <
                        /* FPGA power */
                        MX6QDL_PAD_SD1_DAT1__GPIO1_IO17         0x1b0b1
                >;
        };
 
-       pinctrl_fpga_eim: fpgaeimgrp-novena {
+       pinctrl_fpga_eim: fpgaeim-novenagrp {
                fsl,pins = <
                        /* FPGA power */
                        MX6QDL_PAD_SD1_DAT1__GPIO1_IO17         0x1b0b1
                >;
        };
 
-       pinctrl_gpio_keys_novena: gpiokeysgrp-novena {
+       pinctrl_gpio_keys_novena: gpiokeys-novenagrp {
                fsl,pins = <
                        /* User button */
                        MX6QDL_PAD_KEY_COL4__GPIO4_IO14         0x1b0b0
                >;
        };
 
-       pinctrl_hdmi_novena: hdmigrp-novena {
+       pinctrl_hdmi_novena: hdmi-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE   0x1f8b0
                        MX6QDL_PAD_EIM_A24__GPIO5_IO04          0x1b0b1
                >;
        };
 
-       pinctrl_i2c1_novena: i2c1grp-novena {
+       pinctrl_i2c1_novena: i2c1-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_EIM_D21__I2C1_SCL            0x4001b8b1
                        MX6QDL_PAD_EIM_D28__I2C1_SDA            0x4001b8b1
                >;
        };
 
-       pinctrl_i2c2_novena: i2c2grp-novena {
+       pinctrl_i2c2_novena: i2c2-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_EIM_EB2__I2C2_SCL            0x4001b8b1
                        MX6QDL_PAD_EIM_D16__I2C2_SDA            0x4001b8b1
                >;
        };
 
-       pinctrl_i2c3_novena: i2c3grp-novena {
+       pinctrl_i2c3_novena: i2c3-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_EIM_D17__I2C3_SCL            0x4001b8b1
                        MX6QDL_PAD_EIM_D18__I2C3_SDA            0x4001b8b1
                >;
        };
 
-       pinctrl_kpp_novena: kppgrp-novena {
+       pinctrl_kpp_novena: kpp-novenagrp {
                fsl,pins = <
                        /* Front panel button */
                        MX6QDL_PAD_KEY_ROW1__KEY_ROW1           0x1b0b1
                >;
        };
 
-       pinctrl_leds_novena: ledsgrp-novena {
+       pinctrl_leds_novena: leds-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_SD1_DAT3__GPIO1_IO21         0x1b0b1
                >;
        };
 
-       pinctrl_pcie_novena: pciegrp-novena {
+       pinctrl_pcie_novena: pcie-novenagrp {
                fsl,pins = <
                        /* Reset */
                        MX6QDL_PAD_EIM_D29__GPIO3_IO29          0x1b0b1
                >;
        };
 
-       pinctrl_sata_novena: satagrp-novena {
+       pinctrl_sata_novena: sata-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_EIM_D30__GPIO3_IO30          0x1b0b1
                >;
        };
 
-       pinctrl_senoko_novena: senokogrp-novena {
+       pinctrl_senoko_novena: senoko-novenagrp {
                fsl,pins = <
                        /* Senoko IRQ line */
                        MX6QDL_PAD_SD1_CLK__GPIO1_IO20          0x13048
                >;
        };
 
-       pinctrl_sound_novena: soundgrp-novena {
+       pinctrl_sound_novena: sound-novenagrp {
                fsl,pins = <
                        /* Audio power regulator */
                        MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17      0x1b0b1
                >;
        };
 
-       pinctrl_stmpe_novena: stmpegrp-novena {
+       pinctrl_stmpe_novena: stmpe-novenagrp {
                fsl,pins = <
                        /* Touchscreen interrupt */
                        MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13      0x1b0b1
                >;
        };
 
-       pinctrl_uart2_novena: uart2grp-novena {
+       pinctrl_uart2_novena: uart2-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_EIM_D26__UART2_TX_DATA       0x1b0b1
                        MX6QDL_PAD_EIM_D27__UART2_RX_DATA       0x1b0b1
                >;
        };
 
-       pinctrl_uart3_novena: uart3grp-novena {
+       pinctrl_uart3_novena: uart3-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_EIM_D24__UART3_TX_DATA       0x1b0b1
                        MX6QDL_PAD_EIM_D25__UART3_RX_DATA       0x1b0b1
                >;
        };
 
-       pinctrl_uart4_novena: uart4grp-novena {
+       pinctrl_uart4_novena: uart4-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA    0x1b0b1
                        MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA    0x1b0b1
                >;
        };
 
-       pinctrl_usbotg_novena: usbotggrp-novena {
+       pinctrl_usbotg_novena: usbotg-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID       0x17059
                >;
        };
 
-       pinctrl_usdhc2_novena: usdhc2grp-novena {
+       pinctrl_usdhc2_novena: usdhc2-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_SD2_CMD__SD2_CMD             0x170f9
                        MX6QDL_PAD_SD2_CLK__SD2_CLK             0x100f9
                >;
        };
 
-       pinctrl_usdhc3_novena: usdhc3grp-novena {
+       pinctrl_usdhc3_novena: usdhc3-novenagrp {
                fsl,pins = <
                        MX6QDL_PAD_SD3_CMD__SD3_CMD             0x170f9
                        MX6QDL_PAD_SD3_CLK__SD3_CLK             0x100f9
index 8d2b608e0b90fcc8e75c19575da972fa6232114c..fb81bd8ba035165525337a35acfe67f155bb7e46 100644 (file)
                >;
        };
 
-       pinctrl_wifi_npd: wifinpd {
+       pinctrl_wifi_npd: wifinpdgrp {
                fsl,pins = <
                        MX6QDL_PAD_ENET_RXD1__GPIO1_IO26        0x1b8b0
                >;
index 792b8903d3451c2fc079242cd67cb57a674d3d56..0e02e448db1085e7f508e55cd55d4441d2f51a54 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usb_eth_chg>;
 
-       pinctrl_can1phy: can1phy {
+       pinctrl_can1phy: can1phygrp {
                fsl,pins = <
                        /* CAN1_SR */
                        MX6QDL_PAD_KEY_COL3__GPIO4_IO12 0x13070
                >;
        };
 
-       pinctrl_wifi_npd: wifinpd {
+       pinctrl_wifi_npd: wifinpdgrp {
                fsl,pins = <
                        /* WL_REG_ON */
                        MX6QDL_PAD_NANDF_RB0__GPIO6_IO10        0x13069
index 9054c1d58b9d1af922821129fb1973fdde09568b..84fbcd1291796490094d8b8f9bfcbbdd3f44f544 100644 (file)
 };
 
 &iomuxc {
-       imx6q-sbc6x {
-               pinctrl_enet: enetgrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
-                               MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
-                               MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b030
-                               MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
-                               MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
-                               MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
-                               MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
-                               MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
-                               MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
-                               MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
-                               MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b030
-                               MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b030
-                               MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
-                               MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
-                               MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b030
-                               MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0x4001b0a8
-                       >;
-               };
+       pinctrl_enet: enetgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
+                       MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
+                       MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b030
+                       MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
+                       MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
+                       MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
+                       MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
+                       MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
+                       MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
+                       MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
+                       MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b030
+                       MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b030
+                       MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
+                       MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
+                       MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b030
+                       MX6QDL_PAD_GPIO_16__ENET_REF_CLK        0x4001b0a8
+               >;
+       };
 
-               pinctrl_uart1: uart1grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA    0x1b0b1
-                               MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA    0x1b0b1
-                       >;
-               };
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA    0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA    0x1b0b1
+               >;
+       };
 
-               pinctrl_usbotg: usbotggrp {
-                       fsl,pins = <
-                               MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x17059
-                       >;
-               };
+       pinctrl_usbotg: usbotggrp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_1__USB_OTG_ID           0x17059
+               >;
+       };
 
-               pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <
-                               MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
-                               MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
-                               MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
-                               MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
-                               MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
-                               MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
-                       >;
-               };
+       pinctrl_usdhc3: usdhc3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17059
+                       MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10059
+                       MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17059
+                       MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17059
+                       MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17059
+                       MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17059
+               >;
        };
 };
 
index ad59b23ef27a084b80015e53c9cb5588dfc74b9a..aae81feee00dba2761f140fc2a76a828f69a8308 100644 (file)
                >;
        };
 
-       pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
+       pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
                fsl,pins = <
                        MX6QDL_PAD_SD3_CMD__SD3_CMD     0x170B9
                        MX6QDL_PAD_SD3_CLK__SD3_CLK     0x100B9
                >;
        };
 
-       pinctrl_usdhc3_200mhz: usdhc3grp-200mhz {
+       pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
                fsl,pins = <
                        MX6QDL_PAD_SD3_CMD__SD3_CMD     0x170F9
                        MX6QDL_PAD_SD3_CLK__SD3_CLK     0x100F9