ARM: dts: Unify pinctrl-single pin group nodes for ti81xx

We want to unify the pinctrl-single pin group nodes to use naming "pins".
Otherwise non-standad pin group names will add make dtbs checks errors
when the pinctrl-single yaml binding gets merged.

Cc: Conor Dooley <conor+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/boot/dts/am3874-iceboard.dts b/arch/arm/boot/dts/am3874-iceboard.dts
index 791478e..ac082e8 100644 (file)
--- a/arch/arm/boot/dts/am3874-iceboard.dts
+++ b/arch/arm/boot/dts/am3874-iceboard.dts
@@ -285,7 +285,7 @@
 };
 
 &pincntl {
-       mmc2_pins: pinmux_mmc2_pins {
+       mmc2_pins: mmc2-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0800, PIN_INPUT | 0x1)   /* SD1_CLK */
                        DM814X_IOPAD(0x0804, PIN_INPUT_PULLUP | 0x1)    /* SD1_CMD */
@@ -299,19 +299,19 @@
                        >;
        };
 
-       usb0_pins: pinmux_usb0_pins {
+       usb0_pins: usb0-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1)  /* USB0_DRVVBUS */
                        >;
        };
 
-       usb1_pins: pinmux_usb1_pins {
+       usb1_pins: usb1-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0834, PIN_OUTPUT | 0x80) /* USB1_DRVVBUS */
                        >;
        };
 
-       gpio1_pins: pinmux_gpio1_pins {
+       gpio1_pins: gpio1-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x081c, PIN_OUTPUT | 0x80) /* PROGRAM_B */
                        DM814X_IOPAD(0x0820, PIN_INPUT | 0x80)  /* INIT_B */
@@ -336,7 +336,7 @@
                        >;
        };
 
-       gpio2_pins: pinmux_gpio2_pins {
+       gpio2_pins: gpio2-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x090c, PIN_INPUT_PULLUP | 0x80) /* PHY A IRQ */
                        DM814X_IOPAD(0x0910, PIN_INPUT_PULLUP | 0x80) /* PHY A RESET */
@@ -349,7 +349,7 @@
                >;
        };
 
-       gpio4_pins: pinmux_gpio4_pins {
+       gpio4_pins: gpio4-pins {
                pinctrl-single,pins = <
                        /* The PLL doesn't react well to the SPI controller reset, so
                         * we force the CS lines to pull up as GPIOs until we're ready.
@@ -364,14 +364,14 @@
                >;
        };
 
-       spi2_pins: pinmux_spi2_pins {
+       spi2_pins: spi2-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0950, PIN_INPUT_PULLUP | 0x80) /* PLL SPI CS1 as GPIO */
                        DM814X_IOPAD(0x0818, PIN_INPUT_PULLUP | 0x80) /* PLL SPI CS2 as GPIO */
                >;
        };
 
-       spi4_pins: pinmux_spi4_pins {
+       spi4_pins: spi4-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0a7c, 0x20)
                        DM814X_IOPAD(0x0b74, 0x20)

diff --git a/arch/arm/boot/dts/dm8148-evm.dts b/arch/arm/boot/dts/dm8148-evm.dts
index fe3f9a9..ae8d9fa 100644 (file)
--- a/arch/arm/boot/dts/dm8148-evm.dts
+++ b/arch/arm/boot/dts/dm8148-evm.dts
@@ -116,7 +116,7 @@
 };
 
 &pincntl {
-       sd1_pins: pinmux_sd1_pins {
+       sd1_pins: sd1-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0800, PIN_INPUT | 0x1)   /* SD1_CLK */
                        DM814X_IOPAD(0x0804, PIN_INPUT_PULLUP |  0x1)   /* SD1_CMD */
@@ -129,13 +129,13 @@
                        >;
        };
 
-       usb0_pins: pinmux_usb0_pins {
+       usb0_pins: usb0-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1)  /* USB0_DRVVBUS */
                        >;
        };
 
-       usb1_pins: pinmux_usb1_pins {
+       usb1_pins: usb1-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0834, PIN_OUTPUT | 0x80) /* USB1_DRVVBUS */
                        >;

diff --git a/arch/arm/boot/dts/dm8148-t410.dts b/arch/arm/boot/dts/dm8148-t410.dts
index 79ccdd4..f3e2ecf 100644 (file)
--- a/arch/arm/boot/dts/dm8148-t410.dts
+++ b/arch/arm/boot/dts/dm8148-t410.dts
@@ -71,7 +71,7 @@
 };
 
 &pincntl {
-       sd2_pins: pinmux_sd2_pins {
+       sd2_pins: sd2-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x09c0, PIN_INPUT_PULLUP | 0x1)    /* SD2_DAT[7] */
                        DM814X_IOPAD(0x09c4, PIN_INPUT_PULLUP | 0x1)    /* SD2_DAT[6] */
@@ -87,13 +87,13 @@
                        >;
        };
 
-       usb0_pins: pinmux_usb0_pins {
+       usb0_pins: usb0-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1)  /* USB0_DRVVBUS */
                        >;
        };
 
-       usb1_pins: pinmux_usb1_pins {
+       usb1_pins: usb1-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0834, PIN_OUTPUT | 0x80) /* USB1_DRVVBUS */
                        >;

diff --git a/arch/arm/boot/dts/dm8168-evm.dts b/arch/arm/boot/dts/dm8168-evm.dts
index 244a957..1d80288 100644 (file)
--- a/arch/arm/boot/dts/dm8168-evm.dts
+++ b/arch/arm/boot/dts/dm8168-evm.dts
@@ -30,7 +30,7 @@
 };
 
 &dm816x_pinmux {
-       mcspi1_pins: pinmux_mcspi1_pins {
+       mcspi1_pins: mcspi1-pins {
                pinctrl-single,pins = <
                        DM816X_IOPAD(0x0a94, MUX_MODE0)                 /* SPI_SCLK */
                        DM816X_IOPAD(0x0a98, MUX_MODE0)                 /* SPI_SCS0 */
@@ -39,7 +39,7 @@
                >;
        };
 
-       mmc_pins: pinmux_mmc_pins {
+       mmc_pins: mmc-pins {
                pinctrl-single,pins = <
                        DM816X_IOPAD(0x0a70, MUX_MODE0)                 /* SD_POW */
                        DM816X_IOPAD(0x0a74, MUX_MODE0)                 /* SD_CLK */
@@ -53,19 +53,19 @@
                >;
        };
 
-       usb0_pins: pinmux_usb0_pins {
+       usb0_pins: usb0-pins {
                pinctrl-single,pins = <
                        DM816X_IOPAD(0x0d04, MUX_MODE0)                 /* USB0_DRVVBUS */
                >;
        };
 
-       usb1_pins: pinmux_usb1_pins {
+       usb1_pins: usb1-pins {
                pinctrl-single,pins = <
                        DM816X_IOPAD(0x0d08, MUX_MODE0)                 /* USB1_DRVVBUS */
                >;
        };
 
-       nandflash_pins: nandflash_pins {
+       nandflash_pins: nandflash-pins {
                pinctrl-single,pins = <
                        DM816X_IOPAD(0x0b38, PULL_UP | MUX_MODE0)               /* PINCTRL207 GPMC_CS0*/
                        DM816X_IOPAD(0x0b60, PULL_ENA | MUX_MODE0)              /* PINCTRL217 GPMC_ADV_ALE */

diff --git a/arch/arm/boot/dts/dra62x-j5eco-evm.dts b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
index 577114c..2f6ac26 100644 (file)
--- a/arch/arm/boot/dts/dra62x-j5eco-evm.dts
+++ b/arch/arm/boot/dts/dra62x-j5eco-evm.dts
@@ -108,7 +108,7 @@
 };
 
 &pincntl {
-       sd1_pins: pinmux_sd1_pins {
+       sd1_pins: sd1-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0800, PIN_INPUT | 0x1)   /* SD1_CLK */
                        DM814X_IOPAD(0x0804, PIN_INPUT_PULLUP |  0x1)   /* SD1_CMD */
@@ -121,7 +121,7 @@
                        >;
        };
 
-       usb0_pins: pinmux_usb0_pins {
+       usb0_pins: usb0-pins {
                pinctrl-single,pins = <
                        DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1)  /* USB0_DRVVBUS */
                        >;