]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ARM: dts: imx6sl: imx6sll: Align pin config nodes with bindings
authorMarek Vasut <marex@denx.de>
Thu, 17 Oct 2024 21:11:27 +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.

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts
arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts
arch/arm/boot/dts/nxp/imx/imx6sl-tolino-shine3.dts
arch/arm/boot/dts/nxp/imx/imx6sl-tolino-vision5.dts
arch/arm/boot/dts/nxp/imx/imx6sl-warp.dts
arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts
arch/arm/boot/dts/nxp/imx/imx6sll-kobo-clarahd.dts
arch/arm/boot/dts/nxp/imx/imx6sll-kobo-librah2o.dts

index 7c899291ab0dada4bdf0ed2b7a4829bc09523fae..55cdfa7ea20675a4747fb9d279c99ad904549581 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_hog>;
 
-       imx6sl-evk {
-               pinctrl_hog: hoggrp {
-                       fsl,pins = <
-                               MX6SL_PAD_KEY_ROW7__GPIO4_IO07    0x17059
-                               MX6SL_PAD_KEY_COL7__GPIO4_IO06    0x17059
-                               MX6SL_PAD_SD2_DAT7__GPIO5_IO00    0x17059
-                               MX6SL_PAD_SD2_DAT6__GPIO4_IO29    0x17059
-                               MX6SL_PAD_REF_CLK_32K__GPIO3_IO22 0x17059
-                               MX6SL_PAD_KEY_COL4__GPIO4_IO00  0x80000000
-                               MX6SL_PAD_KEY_COL5__GPIO4_IO02  0x80000000
-                               MX6SL_PAD_AUD_MCLK__AUDIO_CLK_OUT 0x4130b0
-                       >;
-               };
+       pinctrl_hog: hoggrp {
+               fsl,pins = <
+                       MX6SL_PAD_KEY_ROW7__GPIO4_IO07    0x17059
+                       MX6SL_PAD_KEY_COL7__GPIO4_IO06    0x17059
+                       MX6SL_PAD_SD2_DAT7__GPIO5_IO00    0x17059
+                       MX6SL_PAD_SD2_DAT6__GPIO4_IO29    0x17059
+                       MX6SL_PAD_REF_CLK_32K__GPIO3_IO22 0x17059
+                       MX6SL_PAD_KEY_COL4__GPIO4_IO00  0x80000000
+                       MX6SL_PAD_KEY_COL5__GPIO4_IO02  0x80000000
+                       MX6SL_PAD_AUD_MCLK__AUDIO_CLK_OUT 0x4130b0
+               >;
+       };
 
-               pinctrl_audmux3: audmux3grp {
-                       fsl,pins = <
-                               MX6SL_PAD_AUD_RXD__AUD3_RXD       0x4130b0
-                               MX6SL_PAD_AUD_TXC__AUD3_TXC       0x4130b0
-                               MX6SL_PAD_AUD_TXD__AUD3_TXD       0x4110b0
-                               MX6SL_PAD_AUD_TXFS__AUD3_TXFS     0x4130b0
-                       >;
-               };
+       pinctrl_audmux3: audmux3grp {
+               fsl,pins = <
+                       MX6SL_PAD_AUD_RXD__AUD3_RXD       0x4130b0
+                       MX6SL_PAD_AUD_TXC__AUD3_TXC       0x4130b0
+                       MX6SL_PAD_AUD_TXD__AUD3_TXD       0x4110b0
+                       MX6SL_PAD_AUD_TXFS__AUD3_TXFS     0x4130b0
+               >;
+       };
 
-               pinctrl_ecspi1: ecspi1grp {
-                       fsl,pins = <
-                               MX6SL_PAD_ECSPI1_MISO__ECSPI1_MISO      0x100b1
-                               MX6SL_PAD_ECSPI1_MOSI__ECSPI1_MOSI      0x100b1
-                               MX6SL_PAD_ECSPI1_SCLK__ECSPI1_SCLK      0x100b1
-                               MX6SL_PAD_ECSPI1_SS0__GPIO4_IO11        0x80000000
-                       >;
-               };
+       pinctrl_ecspi1: ecspi1grp {
+               fsl,pins = <
+                       MX6SL_PAD_ECSPI1_MISO__ECSPI1_MISO      0x100b1
+                       MX6SL_PAD_ECSPI1_MOSI__ECSPI1_MOSI      0x100b1
+                       MX6SL_PAD_ECSPI1_SCLK__ECSPI1_SCLK      0x100b1
+                       MX6SL_PAD_ECSPI1_SS0__GPIO4_IO11        0x80000000
+               >;
+       };
 
-               pinctrl_fec: fecgrp {
-                       fsl,pins = <
-                               MX6SL_PAD_FEC_MDC__FEC_MDC              0x1b0b0
-                               MX6SL_PAD_FEC_MDIO__FEC_MDIO            0x1b0b0
-                               MX6SL_PAD_FEC_CRS_DV__FEC_RX_DV         0x1b0b0
-                               MX6SL_PAD_FEC_RXD0__FEC_RX_DATA0        0x1b0b0
-                               MX6SL_PAD_FEC_RXD1__FEC_RX_DATA1        0x1b0b0
-                               MX6SL_PAD_FEC_TX_EN__FEC_TX_EN          0x1b0b0
-                               MX6SL_PAD_FEC_TXD0__FEC_TX_DATA0        0x1b0b0
-                               MX6SL_PAD_FEC_TXD1__FEC_TX_DATA1        0x1b0b0
-                               MX6SL_PAD_FEC_REF_CLK__FEC_REF_OUT      0x4001b0a8
-                       >;
-               };
+       pinctrl_fec: fecgrp {
+               fsl,pins = <
+                       MX6SL_PAD_FEC_MDC__FEC_MDC              0x1b0b0
+                       MX6SL_PAD_FEC_MDIO__FEC_MDIO            0x1b0b0
+                       MX6SL_PAD_FEC_CRS_DV__FEC_RX_DV         0x1b0b0
+                       MX6SL_PAD_FEC_RXD0__FEC_RX_DATA0        0x1b0b0
+                       MX6SL_PAD_FEC_RXD1__FEC_RX_DATA1        0x1b0b0
+                       MX6SL_PAD_FEC_TX_EN__FEC_TX_EN          0x1b0b0
+                       MX6SL_PAD_FEC_TXD0__FEC_TX_DATA0        0x1b0b0
+                       MX6SL_PAD_FEC_TXD1__FEC_TX_DATA1        0x1b0b0
+                       MX6SL_PAD_FEC_REF_CLK__FEC_REF_OUT      0x4001b0a8
+               >;
+       };
 
-               pinctrl_fec_sleep: fecgrp-sleep {
-                       fsl,pins = <
-                               MX6SL_PAD_FEC_MDC__GPIO4_IO23      0x3080
-                               MX6SL_PAD_FEC_CRS_DV__GPIO4_IO25   0x3080
-                               MX6SL_PAD_FEC_RXD0__GPIO4_IO17     0x3080
-                               MX6SL_PAD_FEC_RXD1__GPIO4_IO18     0x3080
-                               MX6SL_PAD_FEC_TX_EN__GPIO4_IO22    0x3080
-                               MX6SL_PAD_FEC_TXD0__GPIO4_IO24     0x3080
-                               MX6SL_PAD_FEC_TXD1__GPIO4_IO16     0x3080
-                               MX6SL_PAD_FEC_REF_CLK__GPIO4_IO26  0x3080
-                       >;
-               };
+       pinctrl_fec_sleep: fec-sleep-grp {
+               fsl,pins = <
+                       MX6SL_PAD_FEC_MDC__GPIO4_IO23      0x3080
+                       MX6SL_PAD_FEC_CRS_DV__GPIO4_IO25   0x3080
+                       MX6SL_PAD_FEC_RXD0__GPIO4_IO17     0x3080
+                       MX6SL_PAD_FEC_RXD1__GPIO4_IO18     0x3080
+                       MX6SL_PAD_FEC_TX_EN__GPIO4_IO22    0x3080
+                       MX6SL_PAD_FEC_TXD0__GPIO4_IO24     0x3080
+                       MX6SL_PAD_FEC_TXD1__GPIO4_IO16     0x3080
+                       MX6SL_PAD_FEC_REF_CLK__GPIO4_IO26  0x3080
+               >;
+       };
 
-               pinctrl_hp: hpgrp {
-                       fsl,pins = <
-                               MX6SL_PAD_FEC_RX_ER__GPIO4_IO19   0x1b0b0
-                       >;
-               };
+       pinctrl_hp: hpgrp {
+               fsl,pins = <
+                       MX6SL_PAD_FEC_RX_ER__GPIO4_IO19   0x1b0b0
+               >;
+       };
 
-               pinctrl_i2c1: i2c1grp {
-                       fsl,pins = <
-                               MX6SL_PAD_I2C1_SCL__I2C1_SCL    0x4001b8b1
-                               MX6SL_PAD_I2C1_SDA__I2C1_SDA    0x4001b8b1
-                       >;
-               };
+       pinctrl_i2c1: i2c1grp {
+               fsl,pins = <
+                       MX6SL_PAD_I2C1_SCL__I2C1_SCL    0x4001b8b1
+                       MX6SL_PAD_I2C1_SDA__I2C1_SDA    0x4001b8b1
+               >;
+       };
 
 
-               pinctrl_i2c2: i2c2grp {
-                       fsl,pins = <
-                               MX6SL_PAD_I2C2_SCL__I2C2_SCL    0x4001b8b1
-                               MX6SL_PAD_I2C2_SDA__I2C2_SDA    0x4001b8b1
-                       >;
-               };
+       pinctrl_i2c2: i2c2grp {
+               fsl,pins = <
+                       MX6SL_PAD_I2C2_SCL__I2C2_SCL    0x4001b8b1
+                       MX6SL_PAD_I2C2_SDA__I2C2_SDA    0x4001b8b1
+               >;
+       };
 
-               pinctrl_kpp: kppgrp {
-                       fsl,pins = <
-                               MX6SL_PAD_KEY_ROW0__KEY_ROW0    0x1b010
-                               MX6SL_PAD_KEY_ROW1__KEY_ROW1    0x1b010
-                               MX6SL_PAD_KEY_ROW2__KEY_ROW2    0x1b0b0
-                               MX6SL_PAD_KEY_COL0__KEY_COL0    0x110b0
-                               MX6SL_PAD_KEY_COL1__KEY_COL1    0x110b0
-                               MX6SL_PAD_KEY_COL2__KEY_COL2    0x110b0
-                       >;
-               };
+       pinctrl_kpp: kppgrp {
+               fsl,pins = <
+                       MX6SL_PAD_KEY_ROW0__KEY_ROW0    0x1b010
+                       MX6SL_PAD_KEY_ROW1__KEY_ROW1    0x1b010
+                       MX6SL_PAD_KEY_ROW2__KEY_ROW2    0x1b0b0
+                       MX6SL_PAD_KEY_COL0__KEY_COL0    0x110b0
+                       MX6SL_PAD_KEY_COL1__KEY_COL1    0x110b0
+                       MX6SL_PAD_KEY_COL2__KEY_COL2    0x110b0
+               >;
+       };
 
-               pinctrl_lcd: lcdgrp {
-                       fsl,pins = <
-                               MX6SL_PAD_LCD_DAT0__LCD_DATA00 0x1b0b0
-                               MX6SL_PAD_LCD_DAT1__LCD_DATA01 0x1b0b0
-                               MX6SL_PAD_LCD_DAT2__LCD_DATA02 0x1b0b0
-                               MX6SL_PAD_LCD_DAT3__LCD_DATA03 0x1b0b0
-                               MX6SL_PAD_LCD_DAT4__LCD_DATA04 0x1b0b0
-                               MX6SL_PAD_LCD_DAT5__LCD_DATA05 0x1b0b0
-                               MX6SL_PAD_LCD_DAT6__LCD_DATA06 0x1b0b0
-                               MX6SL_PAD_LCD_DAT7__LCD_DATA07 0x1b0b0
-                               MX6SL_PAD_LCD_DAT8__LCD_DATA08 0x1b0b0
-                               MX6SL_PAD_LCD_DAT9__LCD_DATA09 0x1b0b0
-                               MX6SL_PAD_LCD_DAT10__LCD_DATA10 0x1b0b0
-                               MX6SL_PAD_LCD_DAT11__LCD_DATA11 0x1b0b0
-                               MX6SL_PAD_LCD_DAT12__LCD_DATA12 0x1b0b0
-                               MX6SL_PAD_LCD_DAT13__LCD_DATA13 0x1b0b0
-                               MX6SL_PAD_LCD_DAT14__LCD_DATA14 0x1b0b0
-                               MX6SL_PAD_LCD_DAT15__LCD_DATA15 0x1b0b0
-                               MX6SL_PAD_LCD_DAT16__LCD_DATA16 0x1b0b0
-                               MX6SL_PAD_LCD_DAT17__LCD_DATA17 0x1b0b0
-                               MX6SL_PAD_LCD_DAT18__LCD_DATA18 0x1b0b0
-                               MX6SL_PAD_LCD_DAT19__LCD_DATA19 0x1b0b0
-                               MX6SL_PAD_LCD_DAT20__LCD_DATA20 0x1b0b0
-                               MX6SL_PAD_LCD_DAT21__LCD_DATA21 0x1b0b0
-                               MX6SL_PAD_LCD_DAT22__LCD_DATA22 0x1b0b0
-                               MX6SL_PAD_LCD_DAT23__LCD_DATA23 0x1b0b0
-                               MX6SL_PAD_LCD_CLK__LCD_CLK 0x1b0b0
-                               MX6SL_PAD_LCD_ENABLE__LCD_ENABLE 0x1b0b0
-                               MX6SL_PAD_LCD_HSYNC__LCD_HSYNC 0x1b0b0
-                               MX6SL_PAD_LCD_VSYNC__LCD_VSYNC 0x1b0b0
-                       >;
-               };
+       pinctrl_lcd: lcdgrp {
+               fsl,pins = <
+                       MX6SL_PAD_LCD_DAT0__LCD_DATA00 0x1b0b0
+                       MX6SL_PAD_LCD_DAT1__LCD_DATA01 0x1b0b0
+                       MX6SL_PAD_LCD_DAT2__LCD_DATA02 0x1b0b0
+                       MX6SL_PAD_LCD_DAT3__LCD_DATA03 0x1b0b0
+                       MX6SL_PAD_LCD_DAT4__LCD_DATA04 0x1b0b0
+                       MX6SL_PAD_LCD_DAT5__LCD_DATA05 0x1b0b0
+                       MX6SL_PAD_LCD_DAT6__LCD_DATA06 0x1b0b0
+                       MX6SL_PAD_LCD_DAT7__LCD_DATA07 0x1b0b0
+                       MX6SL_PAD_LCD_DAT8__LCD_DATA08 0x1b0b0
+                       MX6SL_PAD_LCD_DAT9__LCD_DATA09 0x1b0b0
+                       MX6SL_PAD_LCD_DAT10__LCD_DATA10 0x1b0b0
+                       MX6SL_PAD_LCD_DAT11__LCD_DATA11 0x1b0b0
+                       MX6SL_PAD_LCD_DAT12__LCD_DATA12 0x1b0b0
+                       MX6SL_PAD_LCD_DAT13__LCD_DATA13 0x1b0b0
+                       MX6SL_PAD_LCD_DAT14__LCD_DATA14 0x1b0b0
+                       MX6SL_PAD_LCD_DAT15__LCD_DATA15 0x1b0b0
+                       MX6SL_PAD_LCD_DAT16__LCD_DATA16 0x1b0b0
+                       MX6SL_PAD_LCD_DAT17__LCD_DATA17 0x1b0b0
+                       MX6SL_PAD_LCD_DAT18__LCD_DATA18 0x1b0b0
+                       MX6SL_PAD_LCD_DAT19__LCD_DATA19 0x1b0b0
+                       MX6SL_PAD_LCD_DAT20__LCD_DATA20 0x1b0b0
+                       MX6SL_PAD_LCD_DAT21__LCD_DATA21 0x1b0b0
+                       MX6SL_PAD_LCD_DAT22__LCD_DATA22 0x1b0b0
+                       MX6SL_PAD_LCD_DAT23__LCD_DATA23 0x1b0b0
+                       MX6SL_PAD_LCD_CLK__LCD_CLK 0x1b0b0
+                       MX6SL_PAD_LCD_ENABLE__LCD_ENABLE 0x1b0b0
+                       MX6SL_PAD_LCD_HSYNC__LCD_HSYNC 0x1b0b0
+                       MX6SL_PAD_LCD_VSYNC__LCD_VSYNC 0x1b0b0
+               >;
+       };
 
-               pinctrl_led: ledgrp {
-                       fsl,pins = <
-                               MX6SL_PAD_HSIC_STROBE__GPIO3_IO20 0x17059
-                       >;
-               };
+       pinctrl_led: ledgrp {
+               fsl,pins = <
+                       MX6SL_PAD_HSIC_STROBE__GPIO3_IO20 0x17059
+               >;
+       };
 
-               pinctrl_pwm1: pwmgrp {
-                       fsl,pins = <
-                               MX6SL_PAD_PWM1__PWM1_OUT 0x110b0
-                       >;
-               };
+       pinctrl_pwm1: pwmgrp {
+               fsl,pins = <
+                       MX6SL_PAD_PWM1__PWM1_OUT 0x110b0
+               >;
+       };
 
-               pinctrl_reg_lcd_3v3: reglcd3v3grp {
-                       fsl,pins = <
-                               MX6SL_PAD_KEY_ROW5__GPIO4_IO03    0x17059
-                       >;
-               };
+       pinctrl_reg_lcd_3v3: reglcd3v3grp {
+               fsl,pins = <
+                       MX6SL_PAD_KEY_ROW5__GPIO4_IO03    0x17059
+               >;
+       };
 
-               pinctrl_uart1: uart1grp {
-                       fsl,pins = <
-                               MX6SL_PAD_UART1_RXD__UART1_RX_DATA      0x1b0b1
-                               MX6SL_PAD_UART1_TXD__UART1_TX_DATA      0x1b0b1
-                       >;
-               };
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX6SL_PAD_UART1_RXD__UART1_RX_DATA      0x1b0b1
+                       MX6SL_PAD_UART1_TXD__UART1_TX_DATA      0x1b0b1
+               >;
+       };
 
-               pinctrl_usbotg1: usbotg1grp {
-                       fsl,pins = <
-                               MX6SL_PAD_EPDC_PWRCOM__USB_OTG1_ID      0x17059
-                       >;
-               };
+       pinctrl_usbotg1: usbotg1grp {
+               fsl,pins = <
+                       MX6SL_PAD_EPDC_PWRCOM__USB_OTG1_ID      0x17059
+               >;
+       };
 
-               pinctrl_usdhc1: usdhc1grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD1_CMD__SD1_CMD              0x17059
-                               MX6SL_PAD_SD1_CLK__SD1_CLK              0x10059
-                               MX6SL_PAD_SD1_DAT0__SD1_DATA0           0x17059
-                               MX6SL_PAD_SD1_DAT1__SD1_DATA1           0x17059
-                               MX6SL_PAD_SD1_DAT2__SD1_DATA2           0x17059
-                               MX6SL_PAD_SD1_DAT3__SD1_DATA3           0x17059
-                               MX6SL_PAD_SD1_DAT4__SD1_DATA4           0x17059
-                               MX6SL_PAD_SD1_DAT5__SD1_DATA5           0x17059
-                               MX6SL_PAD_SD1_DAT6__SD1_DATA6           0x17059
-                               MX6SL_PAD_SD1_DAT7__SD1_DATA7           0x17059
-                       >;
-               };
+       pinctrl_usdhc1: usdhc1grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD1_CMD__SD1_CMD              0x17059
+                       MX6SL_PAD_SD1_CLK__SD1_CLK              0x10059
+                       MX6SL_PAD_SD1_DAT0__SD1_DATA0           0x17059
+                       MX6SL_PAD_SD1_DAT1__SD1_DATA1           0x17059
+                       MX6SL_PAD_SD1_DAT2__SD1_DATA2           0x17059
+                       MX6SL_PAD_SD1_DAT3__SD1_DATA3           0x17059
+                       MX6SL_PAD_SD1_DAT4__SD1_DATA4           0x17059
+                       MX6SL_PAD_SD1_DAT5__SD1_DATA5           0x17059
+                       MX6SL_PAD_SD1_DAT6__SD1_DATA6           0x17059
+                       MX6SL_PAD_SD1_DAT7__SD1_DATA7           0x17059
+               >;
+       };
 
-               pinctrl_usdhc1_100mhz: usdhc1-100mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD1_CMD__SD1_CMD              0x170b9
-                               MX6SL_PAD_SD1_CLK__SD1_CLK              0x100b9
-                               MX6SL_PAD_SD1_DAT0__SD1_DATA0           0x170b9
-                               MX6SL_PAD_SD1_DAT1__SD1_DATA1           0x170b9
-                               MX6SL_PAD_SD1_DAT2__SD1_DATA2           0x170b9
-                               MX6SL_PAD_SD1_DAT3__SD1_DATA3           0x170b9
-                               MX6SL_PAD_SD1_DAT4__SD1_DATA4           0x170b9
-                               MX6SL_PAD_SD1_DAT5__SD1_DATA5           0x170b9
-                               MX6SL_PAD_SD1_DAT6__SD1_DATA6           0x170b9
-                               MX6SL_PAD_SD1_DAT7__SD1_DATA7           0x170b9
-                       >;
-               };
+       pinctrl_usdhc1_100mhz: usdhc1-100mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD1_CMD__SD1_CMD              0x170b9
+                       MX6SL_PAD_SD1_CLK__SD1_CLK              0x100b9
+                       MX6SL_PAD_SD1_DAT0__SD1_DATA0           0x170b9
+                       MX6SL_PAD_SD1_DAT1__SD1_DATA1           0x170b9
+                       MX6SL_PAD_SD1_DAT2__SD1_DATA2           0x170b9
+                       MX6SL_PAD_SD1_DAT3__SD1_DATA3           0x170b9
+                       MX6SL_PAD_SD1_DAT4__SD1_DATA4           0x170b9
+                       MX6SL_PAD_SD1_DAT5__SD1_DATA5           0x170b9
+                       MX6SL_PAD_SD1_DAT6__SD1_DATA6           0x170b9
+                       MX6SL_PAD_SD1_DAT7__SD1_DATA7           0x170b9
+               >;
+       };
 
-               pinctrl_usdhc1_200mhz: usdhc1-200mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD1_CMD__SD1_CMD              0x170f9
-                               MX6SL_PAD_SD1_CLK__SD1_CLK              0x100f9
-                               MX6SL_PAD_SD1_DAT0__SD1_DATA0           0x170f9
-                               MX6SL_PAD_SD1_DAT1__SD1_DATA1           0x170f9
-                               MX6SL_PAD_SD1_DAT2__SD1_DATA2           0x170f9
-                               MX6SL_PAD_SD1_DAT3__SD1_DATA3           0x170f9
-                               MX6SL_PAD_SD1_DAT4__SD1_DATA4           0x170f9
-                               MX6SL_PAD_SD1_DAT5__SD1_DATA5           0x170f9
-                               MX6SL_PAD_SD1_DAT6__SD1_DATA6           0x170f9
-                               MX6SL_PAD_SD1_DAT7__SD1_DATA7           0x170f9
-                       >;
-               };
+       pinctrl_usdhc1_200mhz: usdhc1-200mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD1_CMD__SD1_CMD              0x170f9
+                       MX6SL_PAD_SD1_CLK__SD1_CLK              0x100f9
+                       MX6SL_PAD_SD1_DAT0__SD1_DATA0           0x170f9
+                       MX6SL_PAD_SD1_DAT1__SD1_DATA1           0x170f9
+                       MX6SL_PAD_SD1_DAT2__SD1_DATA2           0x170f9
+                       MX6SL_PAD_SD1_DAT3__SD1_DATA3           0x170f9
+                       MX6SL_PAD_SD1_DAT4__SD1_DATA4           0x170f9
+                       MX6SL_PAD_SD1_DAT5__SD1_DATA5           0x170f9
+                       MX6SL_PAD_SD1_DAT6__SD1_DATA6           0x170f9
+                       MX6SL_PAD_SD1_DAT7__SD1_DATA7           0x170f9
+               >;
+       };
 
-               pinctrl_usdhc2: usdhc2grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD2_CMD__SD2_CMD              0x17059
-                               MX6SL_PAD_SD2_CLK__SD2_CLK              0x10059
-                               MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x17059
-                               MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x17059
-                               MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x17059
-                               MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x17059
-                       >;
-               };
+       pinctrl_usdhc2: usdhc2grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD2_CMD__SD2_CMD              0x17059
+                       MX6SL_PAD_SD2_CLK__SD2_CLK              0x10059
+                       MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x17059
+                       MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x17059
+                       MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x17059
+                       MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x17059
+               >;
+       };
 
-               pinctrl_usdhc2_100mhz: usdhc2-100mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD2_CMD__SD2_CMD              0x170b9
-                               MX6SL_PAD_SD2_CLK__SD2_CLK              0x100b9
-                               MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x170b9
-                               MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x170b9
-                               MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x170b9
-                               MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x170b9
-                       >;
-               };
+       pinctrl_usdhc2_100mhz: usdhc2-100mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD2_CMD__SD2_CMD              0x170b9
+                       MX6SL_PAD_SD2_CLK__SD2_CLK              0x100b9
+                       MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x170b9
+                       MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x170b9
+                       MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x170b9
+                       MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x170b9
+               >;
+       };
 
-               pinctrl_usdhc2_200mhz: usdhc2-200mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD2_CMD__SD2_CMD              0x170f9
-                               MX6SL_PAD_SD2_CLK__SD2_CLK              0x100f9
-                               MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x170f9
-                               MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x170f9
-                               MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x170f9
-                               MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x170f9
-                       >;
-               };
+       pinctrl_usdhc2_200mhz: usdhc2-200mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD2_CMD__SD2_CMD              0x170f9
+                       MX6SL_PAD_SD2_CLK__SD2_CLK              0x100f9
+                       MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x170f9
+                       MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x170f9
+                       MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x170f9
+                       MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x170f9
+               >;
+       };
 
-               pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD3_CMD__SD3_CMD              0x17059
-                               MX6SL_PAD_SD3_CLK__SD3_CLK              0x10059
-                               MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x17059
-                               MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x17059
-                               MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x17059
-                               MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x17059
-                       >;
-               };
+       pinctrl_usdhc3: usdhc3grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD3_CMD__SD3_CMD              0x17059
+                       MX6SL_PAD_SD3_CLK__SD3_CLK              0x10059
+                       MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x17059
+                       MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x17059
+                       MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x17059
+                       MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x17059
+               >;
+       };
 
-               pinctrl_usdhc3_100mhz: usdhc3-100mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD3_CMD__SD3_CMD              0x170b9
-                               MX6SL_PAD_SD3_CLK__SD3_CLK              0x100b9
-                               MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x170b9
-                               MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x170b9
-                               MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x170b9
-                               MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x170b9
-                       >;
-               };
+       pinctrl_usdhc3_100mhz: usdhc3-100mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD3_CMD__SD3_CMD              0x170b9
+                       MX6SL_PAD_SD3_CLK__SD3_CLK              0x100b9
+                       MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x170b9
+                       MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x170b9
+                       MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x170b9
+                       MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x170b9
+               >;
+       };
 
-               pinctrl_usdhc3_200mhz: usdhc3-200mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD3_CMD__SD3_CMD              0x170f9
-                               MX6SL_PAD_SD3_CLK__SD3_CLK              0x100f9
-                               MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x170f9
-                               MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x170f9
-                               MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x170f9
-                               MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x170f9
-                       >;
-               };
+       pinctrl_usdhc3_200mhz: usdhc3-200mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD3_CMD__SD3_CMD              0x170f9
+                       MX6SL_PAD_SD3_CLK__SD3_CLK              0x100f9
+                       MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x170f9
+                       MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x170f9
+                       MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x170f9
+                       MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x170f9
+               >;
        };
 };
 
index 03d6965f014957a9ac7a9799554620fd4ae5e392..56040da0bd25d162823536af1210a3fe8be7d314 100644 (file)
                >;
        };
 
-       pinctrl_i2c1_sleep: i2c1grp-sleep {
+       pinctrl_i2c1_sleep: i2c1sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_I2C1_SCL__I2C1_SCL     0x400108b1
                        MX6SL_PAD_I2C1_SDA__I2C1_SDA     0x400108b1
                >;
        };
 
-       pinctrl_i2c2_sleep: i2c2grp-sleep {
+       pinctrl_i2c2_sleep: i2c2sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_I2C2_SCL__I2C2_SCL     0x400108b1
                        MX6SL_PAD_I2C2_SDA__I2C2_SDA     0x400108b1
                >;
        };
 
-       pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
+       pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
                fsl,pins = <
                        MX6SL_PAD_SD2_CMD__SD2_CMD              0x170b9
                        MX6SL_PAD_SD2_CLK__SD2_CLK              0x130b9
                >;
        };
 
-       pinctrl_usdhc2_200mhz: usdhc2grp-200mhz {
+       pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
                fsl,pins = <
                        MX6SL_PAD_SD2_CMD__SD2_CMD              0x170f9
                        MX6SL_PAD_SD2_CLK__SD2_CLK              0x130f9
                >;
        };
 
-       pinctrl_usdhc2_sleep: usdhc2grp-sleep {
+       pinctrl_usdhc2_sleep: usdhc2sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_SD2_CMD__GPIO5_IO04           0x100f9
                        MX6SL_PAD_SD2_CLK__GPIO5_IO05           0x100f9
                >;
        };
 
-       pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
+       pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
                fsl,pins = <
                        MX6SL_PAD_SD3_CMD__SD3_CMD      0x170b9
                        MX6SL_PAD_SD3_CLK__SD3_CLK      0x170b9
                >;
        };
 
-       pinctrl_usdhc3_200mhz: usdhc3grp-200mhz {
+       pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
                fsl,pins = <
                        MX6SL_PAD_SD3_CMD__SD3_CMD      0x170f9
                        MX6SL_PAD_SD3_CLK__SD3_CLK      0x170f9
                >;
        };
 
-       pinctrl_usdhc3_sleep: usdhc3grp-sleep {
+       pinctrl_usdhc3_sleep: usdhc3sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_SD3_CMD__GPIO5_IO21   0x100c1
                        MX6SL_PAD_SD3_CLK__GPIO5_IO18   0x100c1
index db5d8509935f16d6e0a2b9c7132cd18c1f86718e..5ba6f15e9ed5aa80bfbb3c0ad6b962b71d50404f 100644 (file)
                >;
        };
 
-       pinctrl_i2c1_sleep: i2c1grp-sleep {
+       pinctrl_i2c1_sleep: i2c1sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_I2C1_SCL__I2C1_SCL     0x400108b1
                        MX6SL_PAD_I2C1_SDA__I2C1_SDA     0x400108b1
                >;
        };
 
-       pinctrl_i2c2_sleep: i2c2grp-sleep {
+       pinctrl_i2c2_sleep: i2c2sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_I2C2_SCL__I2C2_SCL     0x400108b1
                        MX6SL_PAD_I2C2_SDA__I2C2_SDA     0x400108b1
                >;
        };
 
-       pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
+       pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
                fsl,pins = <
                        MX6SL_PAD_SD2_CMD__SD2_CMD              0x170b9
                        MX6SL_PAD_SD2_CLK__SD2_CLK              0x130b9
                >;
        };
 
-       pinctrl_usdhc2_200mhz: usdhc2grp-200mhz {
+       pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
                fsl,pins = <
                        MX6SL_PAD_SD2_CMD__SD2_CMD              0x170f9
                        MX6SL_PAD_SD2_CLK__SD2_CLK              0x130f9
                >;
        };
 
-       pinctrl_usdhc2_sleep: usdhc2grp-sleep {
+       pinctrl_usdhc2_sleep: usdhc2sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_SD2_CMD__GPIO5_IO04           0x100f9
                        MX6SL_PAD_SD2_CLK__GPIO5_IO05           0x100f9
                >;
        };
 
-       pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
+       pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
                fsl,pins = <
                        MX6SL_PAD_SD3_CMD__SD3_CMD      0x170b9
                        MX6SL_PAD_SD3_CLK__SD3_CLK      0x170b9
                >;
        };
 
-       pinctrl_usdhc3_200mhz: usdhc3grp-200mhz {
+       pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
                fsl,pins = <
                        MX6SL_PAD_SD3_CMD__SD3_CMD      0x170f9
                        MX6SL_PAD_SD3_CLK__SD3_CLK      0x170f9
                >;
        };
 
-       pinctrl_usdhc3_sleep: usdhc3grp-sleep {
+       pinctrl_usdhc3_sleep: usdhc3sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_SD3_CMD__GPIO5_IO21   0x100c1
                        MX6SL_PAD_SD3_CLK__GPIO5_IO18   0x100c1
index 6bc342035e2b6f3bdd68ed42f7c4682dd470fd21..a2534c422a52293fb36a9558cbeb568eb5c115dd 100644 (file)
                >;
        };
 
-       pinctrl_i2c1_sleep: i2c1grp-sleep {
+       pinctrl_i2c1_sleep: i2c1sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_I2C1_SCL__I2C1_SCL     0x400108b1
                        MX6SL_PAD_I2C1_SDA__I2C1_SDA     0x400108b1
                >;
        };
 
-       pinctrl_i2c2_sleep: i2c2grp-sleep {
+       pinctrl_i2c2_sleep: i2c2sleep-grp {
                fsl,pins = <
                        MX6SL_PAD_I2C2_SCL__I2C2_SCL     0x400108b1
                        MX6SL_PAD_I2C2_SDA__I2C2_SDA     0x400108b1
index 2545c0fe47c82851807d36427e6a10e12af48b27..a5d48c38231467cbb6ecbfaae47c17b68b7d46cb 100644 (file)
 };
 
 &iomuxc {
-       imx6sl-warp {
-               pinctrl_uart1: uart1grp {
-                       fsl,pins = <
-                               MX6SL_PAD_UART1_RXD__UART1_RX_DATA      0x41b0b1
-                               MX6SL_PAD_UART1_TXD__UART1_TX_DATA      0x41b0b1
-                       >;
-               };
-
-
-               pinctrl_uart3: uart3grp {
-                       fsl,pins = <
-                               MX6SL_PAD_AUD_RXC__UART3_RX_DATA        0x41b0b1
-                               MX6SL_PAD_AUD_RXC__UART3_TX_DATA        0x41b0b1
-                       >;
-               };
-
-               pinctrl_uart5: uart5grp {
-                       fsl,pins = <
-                               MX6SL_PAD_ECSPI1_SCLK__UART5_RX_DATA    0x41b0b1
-                               MX6SL_PAD_ECSPI1_MOSI__UART5_TX_DATA    0x41b0b1
-                               MX6SL_PAD_ECSPI1_MISO__UART5_RTS_B      0x4130b1
-                               MX6SL_PAD_ECSPI1_SS0__UART5_CTS_B       0x4130b1
-                       >;
-               };
-
-               pinctrl_usdhc2: usdhc2grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD2_CMD__SD2_CMD              0x417059
-                               MX6SL_PAD_SD2_CLK__SD2_CLK              0x410059
-                               MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x417059
-                               MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x417059
-                               MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x417059
-                               MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x417059
-                               MX6SL_PAD_SD2_DAT4__SD2_DATA4           0x417059
-                               MX6SL_PAD_SD2_DAT5__SD2_DATA5           0x417059
-                               MX6SL_PAD_SD2_DAT6__SD2_DATA6           0x417059
-                               MX6SL_PAD_SD2_DAT7__SD2_DATA7           0x417059
-                               MX6SL_PAD_SD2_RST__SD2_RESET            0x417059
-                       >;
-               };
-
-               pinctrl_usdhc2_100mhz: usdhc2-100mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD2_CMD__SD2_CMD              0x4170b9
-                               MX6SL_PAD_SD2_CLK__SD2_CLK              0x4100b9
-                               MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x4170b9
-                               MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x4170b9
-                               MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x4170b9
-                               MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x4170b9
-                               MX6SL_PAD_SD2_DAT4__SD2_DATA4           0x4170b9
-                               MX6SL_PAD_SD2_DAT5__SD2_DATA5           0x4170b9
-                               MX6SL_PAD_SD2_DAT6__SD2_DATA6           0x4170b9
-                               MX6SL_PAD_SD2_DAT7__SD2_DATA7           0x4170b9
-                               MX6SL_PAD_SD2_RST__SD2_RESET            0x4170b9
-                       >;
-               };
-
-               pinctrl_usdhc2_200mhz: usdhc2-200mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD2_CMD__SD2_CMD              0x4170f9
-                               MX6SL_PAD_SD2_CLK__SD2_CLK              0x4100f9
-                               MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x4170f9
-                               MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x4170f9
-                               MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x4170f9
-                               MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x4170f9
-                               MX6SL_PAD_SD2_DAT4__SD2_DATA4           0x4170f9
-                               MX6SL_PAD_SD2_DAT5__SD2_DATA5           0x4170f9
-                               MX6SL_PAD_SD2_DAT6__SD2_DATA6           0x4170f9
-                               MX6SL_PAD_SD2_DAT7__SD2_DATA7           0x4170f9
-                               MX6SL_PAD_SD2_RST__SD2_RESET            0x4170f9
-                       >;
-               };
-
-               pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD3_CMD__SD3_CMD              0x417059
-                               MX6SL_PAD_SD3_CLK__SD3_CLK              0x410059
-                               MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x417059
-                               MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x417059
-                               MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x417059
-                               MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x417059
-                       >;
-               };
-
-               pinctrl_usdhc3_100mhz: usdhc3-100mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD3_CMD__SD3_CMD              0x4170b9
-                               MX6SL_PAD_SD3_CLK__SD3_CLK              0x4100b9
-                               MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x4170b9
-                               MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x4170b9
-                               MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x4170b9
-                               MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x4170b9
-                       >;
-               };
-
-               pinctrl_usdhc3_200mhz: usdhc3-200mhz-grp {
-                       fsl,pins = <
-                               MX6SL_PAD_SD3_CMD__SD3_CMD              0x4170f9
-                               MX6SL_PAD_SD3_CLK__SD3_CLK              0x4100f9
-                               MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x4170f9
-                               MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x4170f9
-                               MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x4170f9
-                               MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x4170f9
-                       >;
-               };
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX6SL_PAD_UART1_RXD__UART1_RX_DATA      0x41b0b1
+                       MX6SL_PAD_UART1_TXD__UART1_TX_DATA      0x41b0b1
+               >;
+       };
+
+
+       pinctrl_uart3: uart3grp {
+               fsl,pins = <
+                       MX6SL_PAD_AUD_RXC__UART3_RX_DATA        0x41b0b1
+                       MX6SL_PAD_AUD_RXC__UART3_TX_DATA        0x41b0b1
+               >;
+       };
+
+       pinctrl_uart5: uart5grp {
+               fsl,pins = <
+                       MX6SL_PAD_ECSPI1_SCLK__UART5_RX_DATA    0x41b0b1
+                       MX6SL_PAD_ECSPI1_MOSI__UART5_TX_DATA    0x41b0b1
+                       MX6SL_PAD_ECSPI1_MISO__UART5_RTS_B      0x4130b1
+                       MX6SL_PAD_ECSPI1_SS0__UART5_CTS_B       0x4130b1
+               >;
+       };
+
+       pinctrl_usdhc2: usdhc2grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD2_CMD__SD2_CMD              0x417059
+                       MX6SL_PAD_SD2_CLK__SD2_CLK              0x410059
+                       MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x417059
+                       MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x417059
+                       MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x417059
+                       MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x417059
+                       MX6SL_PAD_SD2_DAT4__SD2_DATA4           0x417059
+                       MX6SL_PAD_SD2_DAT5__SD2_DATA5           0x417059
+                       MX6SL_PAD_SD2_DAT6__SD2_DATA6           0x417059
+                       MX6SL_PAD_SD2_DAT7__SD2_DATA7           0x417059
+                       MX6SL_PAD_SD2_RST__SD2_RESET            0x417059
+               >;
+       };
+
+       pinctrl_usdhc2_100mhz: usdhc2-100mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD2_CMD__SD2_CMD              0x4170b9
+                       MX6SL_PAD_SD2_CLK__SD2_CLK              0x4100b9
+                       MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x4170b9
+                       MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x4170b9
+                       MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x4170b9
+                       MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x4170b9
+                       MX6SL_PAD_SD2_DAT4__SD2_DATA4           0x4170b9
+                       MX6SL_PAD_SD2_DAT5__SD2_DATA5           0x4170b9
+                       MX6SL_PAD_SD2_DAT6__SD2_DATA6           0x4170b9
+                       MX6SL_PAD_SD2_DAT7__SD2_DATA7           0x4170b9
+                       MX6SL_PAD_SD2_RST__SD2_RESET            0x4170b9
+               >;
+       };
+
+       pinctrl_usdhc2_200mhz: usdhc2-200mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD2_CMD__SD2_CMD              0x4170f9
+                       MX6SL_PAD_SD2_CLK__SD2_CLK              0x4100f9
+                       MX6SL_PAD_SD2_DAT0__SD2_DATA0           0x4170f9
+                       MX6SL_PAD_SD2_DAT1__SD2_DATA1           0x4170f9
+                       MX6SL_PAD_SD2_DAT2__SD2_DATA2           0x4170f9
+                       MX6SL_PAD_SD2_DAT3__SD2_DATA3           0x4170f9
+                       MX6SL_PAD_SD2_DAT4__SD2_DATA4           0x4170f9
+                       MX6SL_PAD_SD2_DAT5__SD2_DATA5           0x4170f9
+                       MX6SL_PAD_SD2_DAT6__SD2_DATA6           0x4170f9
+                       MX6SL_PAD_SD2_DAT7__SD2_DATA7           0x4170f9
+                       MX6SL_PAD_SD2_RST__SD2_RESET            0x4170f9
+               >;
+       };
+
+       pinctrl_usdhc3: usdhc3grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD3_CMD__SD3_CMD              0x417059
+                       MX6SL_PAD_SD3_CLK__SD3_CLK              0x410059
+                       MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x417059
+                       MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x417059
+                       MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x417059
+                       MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x417059
+               >;
+       };
+
+       pinctrl_usdhc3_100mhz: usdhc3-100mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD3_CMD__SD3_CMD              0x4170b9
+                       MX6SL_PAD_SD3_CLK__SD3_CLK              0x4100b9
+                       MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x4170b9
+                       MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x4170b9
+                       MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x4170b9
+                       MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x4170b9
+               >;
+       };
+
+       pinctrl_usdhc3_200mhz: usdhc3-200mhz-grp {
+               fsl,pins = <
+                       MX6SL_PAD_SD3_CMD__SD3_CMD              0x4170f9
+                       MX6SL_PAD_SD3_CLK__SD3_CLK              0x4100f9
+                       MX6SL_PAD_SD3_DAT0__SD3_DATA0           0x4170f9
+                       MX6SL_PAD_SD3_DAT1__SD3_DATA1           0x4170f9
+                       MX6SL_PAD_SD3_DAT2__SD3_DATA2           0x4170f9
+                       MX6SL_PAD_SD3_DAT3__SD3_DATA3           0x4170f9
+               >;
        };
 };
index febc2dd9967de69e109bbd3d5d92217b6cbea13f..05d6827ea2af3fe62035d5aeedbc79432df02184 100644 (file)
                >;
        };
 
-       pinctrl_usdhc1_100mhz: usdhc1grp-100mhz {
+       pinctrl_usdhc1_100mhz: usdhc1-100mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD1_CMD__SD1_CMD     0x170b9
                        MX6SLL_PAD_SD1_CLK__SD1_CLK     0x130b9
                >;
        };
 
-       pinctrl_usdhc1_200mhz: usdhc1grp-200mhz {
+       pinctrl_usdhc1_200mhz: usdhc1-200mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD1_CMD__SD1_CMD     0x170f9
                        MX6SLL_PAD_SD1_CLK__SD1_CLK     0x130f9
                >;
        };
 
-       pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
+       pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD2_CMD__SD2_CMD             0x170b9
                        MX6SLL_PAD_SD2_CLK__SD2_CLK             0x130b9
                >;
        };
 
-       pinctrl_usdhc2_200mhz: usdhc2grp-200mhz {
+       pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD2_CMD__SD2_CMD             0x170f9
                        MX6SLL_PAD_SD2_CLK__SD2_CLK             0x130f9
                >;
        };
 
-       pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
+       pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD3_CMD__SD3_CMD             0x170a1
                        MX6SLL_PAD_SD3_CLK__SD3_CLK             0x130a1
                >;
        };
 
-       pinctrl_usdhc3_200mhz: usdhc3grp-200mhz {
+       pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD3_CMD__SD3_CMD             0x170e9
                        MX6SLL_PAD_SD3_CLK__SD3_CLK             0x130f9
index c7cfe0b70f04e593b4a4cf30c9c6857c43abf54a..18c9ac8f7560ee144dad980f8beaf308fbca8c97 100644 (file)
                >;
        };
 
-       pinctrl_i2c1_sleep: i2c1grp-sleep {
+       pinctrl_i2c1_sleep: i2c1sleep-grp {
                fsl,pins = <
                        MX6SLL_PAD_I2C1_SCL__I2C1_SCL   0x400108b1
                        MX6SLL_PAD_I2C1_SDA__I2C1_SDA   0x400108b1
                >;
        };
 
-       pinctrl_i2c2_sleep: i2c2grp-sleep {
+       pinctrl_i2c2_sleep: i2c2sleep-grp {
                fsl,pins = <
                        MX6SLL_PAD_I2C2_SCL__I2C2_SCL   0x400108b1
                        MX6SLL_PAD_I2C2_SDA__I2C2_SDA   0x400108b1
                >;
        };
 
-       pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
+       pinctrl_usdhc2_100mhz: usdhc2-100mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD2_CMD__SD2_CMD             0x170b9
                        MX6SLL_PAD_SD2_CLK__SD2_CLK             0x130b9
                >;
        };
 
-       pinctrl_usdhc2_200mhz: usdhc2grp-200mhz {
+       pinctrl_usdhc2_200mhz: usdhc2-200mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD2_CMD__SD2_CMD             0x170f9
                        MX6SLL_PAD_SD2_CLK__SD2_CLK             0x130f9
                >;
        };
 
-       pinctrl_usdhc2_sleep: usdhc2grp-sleep {
+       pinctrl_usdhc2_sleep: usdhc2sleep-grp {
                fsl,pins = <
                        MX6SLL_PAD_SD2_CMD__GPIO5_IO04          0x100f9
                        MX6SLL_PAD_SD2_CLK__GPIO5_IO05          0x100f9
                >;
        };
 
-       pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
+       pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD3_CMD__SD3_CMD     0x170b9
                        MX6SLL_PAD_SD3_CLK__SD3_CLK     0x170b9
                >;
        };
 
-       pinctrl_usdhc3_200mhz: usdhc3grp-200mhz {
+       pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
                fsl,pins = <
                        MX6SLL_PAD_SD3_CMD__SD3_CMD     0x170f9
                        MX6SLL_PAD_SD3_CLK__SD3_CLK     0x170f9
                >;
        };
 
-       pinctrl_usdhc3_sleep: usdhc3grp-sleep {
+       pinctrl_usdhc3_sleep: usdhc3sleep-grp {
                fsl,pins = <
                        MX6SLL_PAD_SD3_CMD__GPIO5_IO21  0x100c1
                        MX6SLL_PAD_SD3_CLK__GPIO5_IO18  0x100c1
index 7e4f38dd11e20b456c7685b70c48c74d2f3e1003..660620d226f717010951fcd44e953b0ae2855307 100644 (file)
                >;
        };
 
-       pinctrl_i2c1_sleep: i2c1grp-sleep {
+       pinctrl_i2c1_sleep: i2c1sleep-grp {
                fsl,pins = <
                        MX6SLL_PAD_I2C1_SCL__I2C1_SCL   0x400108b1
                        MX6SLL_PAD_I2C1_SDA__I2C1_SDA   0x400108b1
                >;
        };
 
-       pinctrl_i2c2_sleep: i2c2grp-sleep {
+       pinctrl_i2c2_sleep: i2c2sleep-grp {
                fsl,pins = <
                        MX6SLL_PAD_I2C2_SCL__I2C2_SCL   0x400108b1
                        MX6SLL_PAD_I2C2_SDA__I2C2_SDA   0x400108b1