ARM: dts: Unify pinctrl-single pin group nodes for am33xx
authorTony Lindgren <tony@atomide.com>
Wed, 17 May 2023 09:25:03 +0000 (12:25 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 23 May 2023 07:59:45 +0000 (10:59 +0300)
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>
45 files changed:
arch/arm/boot/dts/am335x-baltos-ir2110.dts
arch/arm/boot/dts/am335x-baltos-ir3220.dts
arch/arm/boot/dts/am335x-baltos-ir5221.dts
arch/arm/boot/dts/am335x-baltos-leds.dtsi
arch/arm/boot/dts/am335x-baltos.dtsi
arch/arm/boot/dts/am335x-base0033.dts
arch/arm/boot/dts/am335x-bone-common.dtsi
arch/arm/boot/dts/am335x-boneblack-hdmi.dtsi
arch/arm/boot/dts/am335x-boneblack-wireless.dts
arch/arm/boot/dts/am335x-boneblue.dts
arch/arm/boot/dts/am335x-bonegreen-common.dtsi
arch/arm/boot/dts/am335x-bonegreen-wireless.dts
arch/arm/boot/dts/am335x-chiliboard.dts
arch/arm/boot/dts/am335x-chilisom.dtsi
arch/arm/boot/dts/am335x-cm-t335.dts
arch/arm/boot/dts/am335x-evm.dts
arch/arm/boot/dts/am335x-evmsk.dts
arch/arm/boot/dts/am335x-guardian.dts
arch/arm/boot/dts/am335x-icev2.dts
arch/arm/boot/dts/am335x-igep0033.dtsi
arch/arm/boot/dts/am335x-lxm.dts
arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
arch/arm/boot/dts/am335x-moxa-uc-2101.dts
arch/arm/boot/dts/am335x-moxa-uc-8100-common.dtsi
arch/arm/boot/dts/am335x-myirtech-myc.dtsi
arch/arm/boot/dts/am335x-myirtech-myd.dts
arch/arm/boot/dts/am335x-nano.dts
arch/arm/boot/dts/am335x-netcan-plus-1xx.dts
arch/arm/boot/dts/am335x-netcom-plus-2xx.dts
arch/arm/boot/dts/am335x-netcom-plus-8xx.dts
arch/arm/boot/dts/am335x-osd3358-sm-red.dts
arch/arm/boot/dts/am335x-pcm-953.dtsi
arch/arm/boot/dts/am335x-pdu001.dts
arch/arm/boot/dts/am335x-pepper.dts
arch/arm/boot/dts/am335x-phycore-som.dtsi
arch/arm/boot/dts/am335x-pocketbeagle.dts
arch/arm/boot/dts/am335x-regor.dtsi
arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi
arch/arm/boot/dts/am335x-sancloud-bbe-extended-wifi.dts
arch/arm/boot/dts/am335x-sancloud-bbe-lite.dts
arch/arm/boot/dts/am335x-sancloud-bbe.dts
arch/arm/boot/dts/am335x-sbc-t335.dts
arch/arm/boot/dts/am335x-shc.dts
arch/arm/boot/dts/am335x-sl50.dts
arch/arm/boot/dts/am335x-wega.dtsi

index 75992ee..ea5882e 100644 (file)
@@ -18,7 +18,7 @@
 };
 
 &am33xx_pinmux {
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT, MUX_MODE0)
@@ -31,7 +31,7 @@
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT, MUX_MODE7)     /* MMC1 CD */
                >;
index 087e084..ea4f8dd 100644 (file)
 };
 
 &am33xx_pinmux {
-       tca6416_pins: pinmux_tca6416_pins {
+       tca6416_pins: tca6416-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_INPUT_PULLUP, MUX_MODE7)      /* xdma_event_intr1.gpio0[20] tca6416 stuff */
                >;
        };
 
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT, MUX_MODE0)
@@ -37,7 +37,7 @@
                >;
        };
 
-       uart2_pins: pinmux_uart2_pins {
+       uart2_pins: uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE1)      /* spi0_sclk.uart2_rxd_mux3 */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE1)      /* spi0_d0.uart2_txd_mux3 */
@@ -52,7 +52,7 @@
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT, MUX_MODE7)     /* MMC1 CD */
                >;
index faeb39a..ec914f2 100644 (file)
 };
 
 &am33xx_pinmux {
-       tca6416_pins: pinmux_tca6416_pins {
+       tca6416_pins: tca6416-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_INPUT_PULLUP, MUX_MODE7)      /* xdma_event_intr1.gpio0[20] tca6416 stuff */
                >;
        };
 
 
-       dcan1_pins: pinmux_dcan1_pins {
+       dcan1_pins: dcan1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT, MUX_MODE2)      /* uart0_ctsn.dcan1_tx_mux0 */
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT, MUX_MODE2)      /* uart0_rtsn.dcan1_rx_mux0 */
                >;
        };
 
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT, MUX_MODE0)
@@ -45,7 +45,7 @@
                >;
        };
 
-       uart2_pins: pinmux_uart2_pins {
+       uart2_pins: uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE1)      /* spi0_sclk.uart2_rxd_mux3 */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE1)      /* spi0_d0.uart2_txd_mux3 */
@@ -60,7 +60,7 @@
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT, MUX_MODE7)     /* MMC1 CD */
                >;
index 0250146..6a52e42 100644 (file)
@@ -37,7 +37,7 @@
 };
 
 &am33xx_pinmux {
-       user_leds: pinmux_user_leds {
+       user_leds: user-leds-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_COL, PIN_OUTPUT_PULLDOWN, MUX_MODE7)     /* mii1_col.gpio3_0 PWR LED */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_OUTPUT_PULLDOWN, MUX_MODE7)    /* mii1_txd3.gpio0_16 WLAN LED */
index 6161c89..c560870 100644 (file)
@@ -48,7 +48,7 @@
 };
 
 &am33xx_pinmux {
-       mmc2_pins: pinmux_mmc2_pins {
+       mmc2_pins: mmc2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD8, PIN_INPUT_PULLUP, MUX_MODE2)      /* gpmc_ad8.mmc1_dat0_mux0 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD9, PIN_INPUT_PULLUP, MUX_MODE2)      /* gpmc_ad9.mmc1_dat1_mux0 */
                >;
        };
 
-       wl12xx_gpio: pinmux_wl12xx_gpio {
+       wl12xx_gpio: wl12xx-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_EMU1, PIN_OUTPUT_PULLUP, MUX_MODE7)      /* emu1.gpio3[8] */
                >;
        };
 
-       tps65910_pins: pinmux_tps65910_pins {
+       tps65910_pins: tps65910-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_BEN1, PIN_INPUT_PULLUP, MUX_MODE7)      /* gpmc_ben1.gpio1[28] */
                >;
        };
 
-       i2c1_pins: pinmux_i2c1_pins {
+       i2c1_pins: i2c1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT, MUX_MODE2)      /* spi0_d1.i2c1_sda_mux3 */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT, MUX_MODE2)      /* spi0_cs0.i2c1_scl_mux3 */
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE1)       /* mii1_crs.rmii1_crs_dv */
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)    /* mdio_data.mdio_data */
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       nandflash_pins_s0: nandflash_pins_s0 {
+       nandflash_pins_s0: nandflash-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE0)        /* gpmc_ad0.gpmc_ad0 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE0)        /* gpmc_ad1.gpmc_ad1 */
index 89c00ce..eba843e 100644 (file)
@@ -41,7 +41,7 @@
 };
 
 &am33xx_pinmux {
-       nxp_hdmi_pins: pinmux_nxp_hdmi_pins {
+       nxp_hdmi_pins: nxp-hdmi-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT, MUX_MODE3)      /* xdma_event_intr0.clkout1 */
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_OUTPUT, MUX_MODE0)
                >;
        };
-       nxp_hdmi_off_pins: pinmux_nxp_hdmi_off_pins {
+       nxp_hdmi_off_pins: nxp-hdmi-off-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT, MUX_MODE3)      /* xdma_event_intr0.clkout1 */
                >;
        };
 
-       leds_base_pins: pinmux_leds_base_pins {
+       leds_base_pins: leds-base-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7)      /* gpmc_a5.gpio1_21 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN3, PIN_OUTPUT_PULLDOWN, MUX_MODE7)    /* gpmc_csn3.gpio2_0 */
index 02e04a1..0b073f2 100644 (file)
@@ -66,7 +66,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&clkout2_pin>;
 
-       user_leds_s0: user_leds_s0 {
+       user_leds_s0: user-leds-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7)      /* gpmc_a5.gpio1_21 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A6, PIN_OUTPUT_PULLUP, MUX_MODE7)        /* gpmc_a6.gpio1_22 */
                >;
        };
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)        /* i2c0_sda.i2c0_sda */
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)        /* i2c0_scl.i2c0_scl */
                >;
        };
 
-       i2c2_pins: pinmux_i2c2_pins {
+       i2c2_pins: i2c2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLUP, MUX_MODE3)      /* uart1_ctsn.i2c2_sda */
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLUP, MUX_MODE3)      /* uart1_rtsn.i2c2_scl */
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       clkout2_pin: pinmux_clkout2_pin {
+       clkout2_pin: clkout2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_OUTPUT_PULLDOWN, MUX_MODE3)     /* xdma_event_intr1.clkout2 */
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE7)               /* spio0_cs1.gpio0_6 */
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT0, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       emmc_pins: pinmux_emmc_pins {
+       emmc_pins: emmc-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn1.mmc1_clk */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
index 486f24d..109f08f 100644 (file)
@@ -7,7 +7,7 @@
 #include <dt-bindings/interrupt-controller/irq.h>
 
 &am33xx_pinmux {
-       nxp_hdmi_bonelt_pins: nxp_hdmi_bonelt_pins {
+       nxp_hdmi_bonelt_pins: nxp-hdmi-bonelt-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT_PULLDOWN, MUX_MODE3)
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
                >;
        };
 
-       nxp_hdmi_bonelt_off_pins: nxp_hdmi_bonelt_off_pins {
+       nxp_hdmi_bonelt_off_pins: nxp-hdmi-bonelt-off-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT_PULLDOWN, MUX_MODE3)
                >;
        };
 
-       mcasp0_pins: mcasp0_pins {
+       mcasp0_pins: mcasp0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_INPUT_PULLUP, MUX_MODE0) /* mcasp0_ahcklx.mcasp0_ahclkx */
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKR, PIN_OUTPUT_PULLDOWN, MUX_MODE2) /* mcasp0_ahclkr.mcasp0_axr2*/
index 207d2b6..b4b4b80 100644 (file)
 };
 
 &am33xx_pinmux {
-       bt_pins: pinmux_bt_pins {
+       bt_pins: bt-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLUP, MUX_MODE7)      /* gmii1_txd0.gpio0_28 - BT_EN */
                >;
        };
 
-       mmc3_pins: pinmux_mmc3_pins {
+       mmc3_pins: mmc3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLUP, MUX_MODE6 ) /* (L15) gmii1_rxd1.mmc2_clk */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLUP, MUX_MODE6 ) /* (J16) gmii1_txen.mmc2_cmd */
@@ -45,7 +45,7 @@
                >;
        };
 
-       uart3_pins: pinmux_uart3_pins {
+       uart3_pins: uart3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLUP, MUX_MODE1)       /* gmii1_rxd3.uart3_rxd */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE1)    /* gmii1_rxd2.uart3_txd */
@@ -54,7 +54,7 @@
                >;
        };
 
-       wl18xx_pins: pinmux_wl18xx_pins {
+       wl18xx_pins: wl18xx-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE7)  /* gmii1_txclk.gpio3_9 WL_EN */
                        AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_INPUT_PULLDOWN, MUX_MODE7) /* rmii1_refclk.gpio0_29 WL_IRQ */
index 34579e9..b78e38f 100644 (file)
 };
 
 &am33xx_pinmux {
-       user_leds_s0: user_leds_s0 {
+       user_leds_s0: user-leds-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT, MUX_MODE7) /* (V15) gpmc_a5.gpio1[21] - USR_LED_0 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A6, PIN_OUTPUT, MUX_MODE7) /* (U15) gpmc_a6.gpio1[22] - USR_LED_1 */
                >;
        };
 
-       i2c2_pins: pinmux_i2c2_pins {
+       i2c2_pins: i2c2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLUP, MUX_MODE3)      /* (D18) uart1_ctsn.I2C2_SDA */
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLUP, MUX_MODE3)      /* (D17) uart1_rtsn.I2C2_SCL */
        };
 
        /* UT0 */
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
        };
 
        /* UT1 */
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
        };
 
        /* GPS */
-       uart2_pins: pinmux_uart2_pins {
+       uart2_pins: uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLUP, MUX_MODE1)       /* (A17) spi0_sclk.uart2_rxd */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT_PULLDOWN, MUX_MODE1)      /* (B17) spi0_d0.uart2_txd */
        };
 
        /* DSM2 */
-       uart4_pins: pinmux_uart4_pins {
+       uart4_pins: uart4-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE6)      /* (T17) gpmc_wait0.uart4_rxd */
                >;
        };
 
        /* UT5 */
-       uart5_pins: pinmux_uart5_pins {
+       uart5_pins: uart5-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA9, PIN_INPUT_PULLUP, MUX_MODE4)       /* (U2) lcd_data9.uart5_rxd */
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA8, PIN_OUTPUT_PULLDOWN, MUX_MODE4)    /* (U1) lcd_data8.uart5_txd */
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE7)               /* (C15) spi0_cs1.gpio0[6] */
                >;
        };
 
-       mmc2_pins: pinmux_mmc2_pins {
+       mmc2_pins: mmc2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT_PULLUP, MUX_MODE2)       /* (U9) gpmc_csn1.mmc1_clk */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_INPUT_PULLUP, MUX_MODE2)       /* (V9) gpmc_csn2.mmc1_cmd */
                >;
        };
 
-       mmc3_pins: pinmux_mmc3_pins {
+       mmc3_pins: mmc3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD1, PIN_INPUT_PULLUP, MUX_MODE6)       /* (L15) gmii1_rxd1.mmc2_clk */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLUP, MUX_MODE6)      /* (J16) gmii1_txen.mmc2_cmd */
                >;
        };
 
-       bt_pins: pinmux_bt_pins {
+       bt_pins: bt-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TXD0, PIN_OUTPUT_PULLUP, MUX_MODE7)      /* (K17) gmii1_txd0.gpio0[28] - BT_EN */
                >;
        };
 
-       uart3_pins: pinmux_uart3_pins {
+       uart3_pins: uart3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLUP, MUX_MODE1)       /* (L17) gmii1_rxd3.uart3_rxd */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE1)    /* (L16) gmii1_rxd2.uart3_txd */
                >;
        };
 
-       wl18xx_pins: pinmux_wl18xx_pins {
+       wl18xx_pins: wl18xx-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE7)  /* (K18) gmii1_txclk.gpio3[9] - WL_EN */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TXD1, PIN_INPUT_PULLDOWN, MUX_MODE7)     /* (K16) gmii1_txd1.gpio0[21] - WL_IRQ */
        };
 
        /* DCAN */
-       dcan1_pins: pinmux_dcan1_pins {
+       dcan1_pins: dcan1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT, MUX_MODE2)             /* (E17) uart0_rtsn.dcan1_rx */
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT, MUX_MODE2)            /* (E18) uart0_ctsn.dcan1_tx */
        };
 
        /* E1 */
-       eqep0_pins: pinmux_eqep0_pins {
+       eqep0_pins: eqep0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_AXR0, PIN_INPUT, MUX_MODE1)            /* (B12) mcasp0_aclkr.eQEP0A_in */
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_FSR, PIN_INPUT, MUX_MODE1)             /* (C13) mcasp0_fsr.eQEP0B_in */
        };
 
        /* E2 */
-       eqep1_pins: pinmux_eqep1_pins {
+       eqep1_pins: eqep1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT, MUX_MODE2)             /* (V2) lcd_data12.eQEP1A_in */
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_INPUT, MUX_MODE2)             /* (V3) lcd_data13.eQEP1B_in */
        };
 
        /* E3 */
-       eqep2_pins: pinmux_eqep2_pins {
+       eqep2_pins: eqep2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT, MUX_MODE4)              /* (T12) gpmc_ad12.eQEP2A_in */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT, MUX_MODE4)              /* (R12) gpmc_ad13.eQEP2B_in */
index 9f7fb63..383beed 100644 (file)
@@ -22,7 +22,7 @@
 };
 
 &am33xx_pinmux {
-       uart2_pins: uart2_pins {
+       uart2_pins: uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE1)      /* spi0_sclk.uart2_rxd */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE1)       /* spi0_d0.uart2_txd */
index d388cff..a4f5b52 100644 (file)
 };
 
 &am33xx_pinmux {
-       bt_pins: pinmux_bt_pins {
+       bt_pins: bt-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_BEN1, PIN_OUTPUT_PULLUP, MUX_MODE7)      /* gpmc_ad12.gpio1_28 BT_EN */
                >;
        };
 
-       mmc3_pins: pinmux_mmc3_pins {
+       mmc3_pins: mmc3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT_PULLUP, MUX_MODE3)       /* gpmc_ad12.mmc2_dat0 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT_PULLUP, MUX_MODE3)       /* gpmc_ad13.mmc2_dat1 */
@@ -44,7 +44,7 @@
                >;
        };
 
-       uart3_pins: pinmux_uart3_pins {
+       uart3_pins: uart3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLUP, MUX_MODE1)       /* gmii1_rxd3.uart3_rxd */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE1)    /* gmii1_rxd2.uart3_txd */
@@ -53,7 +53,7 @@
                >;
        };
 
-       wl18xx_pins: pinmux_wl18xx_pins {
+       wl18xx_pins: wl18xx-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD10, PIN_OUTPUT_PULLDOWN, MUX_MODE7)    /* gpmc_ad10.gpio0_26 WL_EN */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD11, PIN_INPUT_PULLDOWN, MUX_MODE7)     /* gpmc_ad11.gpio0_27 WL_IRQ */
index a223cdd..648e97f 100644 (file)
 };
 
 &am33xx_pinmux {
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE1)
@@ -57,7 +57,7 @@
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE7)
@@ -72,7 +72,7 @@
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* mdio_data.mdio_data */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
@@ -81,7 +81,7 @@
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       usb1_drvvbus: usb1_drvvbus {
+       usb1_drvvbus: usb1-drvvbus-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_USB1_DRVVBUS, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       sd_pins: pinmux_sd_card {
+       sd_pins: sd-card-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT, MUX_MODE0)
                >;
        };
 
-       led_gpio_pins: led_gpio_pins {
+       led_gpio_pins: led-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_EMU0, PIN_OUTPUT, MUX_MODE7) /* emu0.gpio3_7 */
                        AM33XX_PADCONF(AM335X_PIN_EMU1, PIN_OUTPUT, MUX_MODE7) /* emu1.gpio3_8 */
index 43b61e4..51021d5 100644 (file)
 &am33xx_pinmux {
        pinctrl-names = "default";
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       nandflash_pins: nandflash_pins {
+       nandflash_pins: nandflash-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLDOWN, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLDOWN, MUX_MODE0)
index 993b134..72990e7 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&bluetooth_pins>;
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       i2c1_pins: pinmux_i2c1_pins {
+       i2c1_pins: i2c1-pins {
                pinctrl-single,pins = <
                        /* uart0_ctsn.i2c1_sda */
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLUP, MUX_MODE2)
                >;
        };
 
-       gpio_led_pins: pinmux_gpio_led_pins {
+       gpio_led_pins: gpio-led-pins {
                pinctrl-single,pins = <
                        /* gpmc_csn3.gpio2_0 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN3, PIN_OUTPUT, MUX_MODE7)
                >;
        };
 
-       nandflash_pins: pinmux_nandflash_pins {
+       nandflash_pins: nandflash-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       dcan0_pins: pinmux_dcan0_pins {
+       dcan0_pins: dcan0-pins {
                pinctrl-single,pins = <
                        /* uart1_ctsn.dcan0_tx */
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_OUTPUT, MUX_MODE2)
                >;
        };
 
-       dcan1_pins: pinmux_dcan1_pins {
+       dcan1_pins: dcan1-pins {
                pinctrl-single,pins = <
                        /* uart1_rxd.dcan1_tx */
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_OUTPUT, MUX_MODE2)
                >;
        };
 
-       ecap0_pins: pinmux_ecap0_pins {
+       ecap0_pins: ecap0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, 0x0, MUX_MODE0)
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        /* mii1_tx_en.rgmii1_tctl */
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       spi0_pins: pinmux_spi0_pins {
+       spi0_pins: spi0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT_PULLUP, MUX_MODE0)
        };
 
        /* wl1271 bluetooth */
-       bluetooth_pins: pinmux_bluetooth_pins {
+       bluetooth_pins: bluetooth-pins {
                pinctrl-single,pins = <
                        /* XDMA_EVENT_INTR0.gpio0_19 - bluetooth enable */
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_OUTPUT_PULLUP, MUX_MODE7)
        };
 
        /* TLV320AIC23B codec */
-       mcasp1_pins: pinmux_mcasp1_pins {
+       mcasp1_pins: mcasp1-pins {
                pinctrl-single,pins = <
                        /* MII1_CRS.mcasp1_aclkx */
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE4)
        };
 
        /* wl1271 WiFi */
-       wifi_pins: pinmux_wifi_pins {
+       wifi_pins: wifi-pins {
                pinctrl-single,pins = <
                        /* EMU1.gpio3_8 - WiFi IRQ */
                        AM33XX_PADCONF(AM335X_PIN_EMU1, PIN_INPUT_PULLUP, MUX_MODE7)
index 5beabaa..6560db1 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&matrix_keypad_s0 &volume_keys_s0 &clkout2_pin>;
 
-       matrix_keypad_s0: matrix_keypad_s0 {
+       matrix_keypad_s0: matrix-keypad-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7)      /* gpmc_a5.gpio1_21 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A6, PIN_OUTPUT_PULLDOWN, MUX_MODE7)      /* gpmc_a6.gpio1_22 */
                >;
        };
 
-       volume_keys_s0: volume_keys_s0 {
+       volume_keys_s0: volume-keys-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLDOWN, MUX_MODE7)     /* spi0_sclk.gpio0_2 */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT_PULLDOWN, MUX_MODE7)       /* spi0_d0.gpio0_3 */
                >;
        };
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)        /* i2c0_sda.i2c0_sda */
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)        /* i2c0_scl.i2c0_scl */
                >;
        };
 
-       i2c1_pins: pinmux_i2c1_pins {
+       i2c1_pins: i2c1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT_PULLUP, MUX_MODE2) /* spi0_d1.i2c1_sda */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLUP, MUX_MODE2)        /* spi0_cs0.i2c1_scl */
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       clkout2_pin: pinmux_clkout2_pin {
+       clkout2_pin: clkout2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_OUTPUT_PULLDOWN, MUX_MODE3)     /* xdma_event_intr1.clkout2 */
                >;
        };
 
-       nandflash_pins_s0: nandflash_pins_s0 {
+       nandflash_pins_s0: nandflash-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       ecap0_pins: backlight_pins {
+       ecap0_pins: backlight-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, 0x0, MUX_MODE0)
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2)   /* mii1_txen.rgmii1_tctl */
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE7)               /* spi0_cs1.gpio0_6 */
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT0, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       mmc3_pins: pinmux_mmc3_pins {
+       mmc3_pins: mmc3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLUP, MUX_MODE3) /* gpmc_a1.mmc2_dat0, INPUT_PULLUP | MODE3 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A2, PIN_INPUT_PULLUP, MUX_MODE3) /* gpmc_a2.mmc2_dat1, INPUT_PULLUP | MODE3 */
                >;
        };
 
-       wlan_pins: pinmux_wlan_pins {
+       wlan_pins: wlan-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A0, PIN_OUTPUT_PULLDOWN, MUX_MODE7)      /* gpmc_a0.gpio1_16 */
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKR, PIN_INPUT, MUX_MODE7)          /* mcasp0_ahclkr.gpio3_17 */
                >;
        };
 
-       lcd_pins_s0: lcd_pins_s0 {
+       lcd_pins_s0: lcd-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD8, PIN_OUTPUT, MUX_MODE1)              /* gpmc_ad8.lcd_data23 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD9, PIN_OUTPUT, MUX_MODE1)              /* gpmc_ad9.lcd_data22 */
                >;
        };
 
-       mcasp1_pins: mcasp1_pins {
+       mcasp1_pins: mcasp1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */
                >;
        };
 
-       mcasp1_pins_sleep: mcasp1_pins_sleep {
+       mcasp1_pins_sleep: mcasp1-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       dcan1_pins_default: dcan1_pins_default {
+       dcan1_pins_default: dcan1-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT, MUX_MODE2) /* uart0_ctsn.d_can1_tx */
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLDOWN, MUX_MODE2) /* uart0_rtsn.d_can1_rx */
index 5b3278c..332f6c8 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>;
 
-       lcd_pins_default: lcd_pins_default {
+       lcd_pins_default: lcd-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD8, PIN_OUTPUT, MUX_MODE1)      /* gpmc_ad8.lcd_data23 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD9, PIN_OUTPUT, MUX_MODE1)      /* gpmc_ad9.lcd_data22 */
                >;
        };
 
-       lcd_pins_sleep: lcd_pins_sleep {
+       lcd_pins_sleep: lcd-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD8, PIN_INPUT_PULLDOWN, MUX_MODE7)      /* gpmc_ad8.lcd_data23 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD9, PIN_INPUT_PULLDOWN, MUX_MODE7)      /* gpmc_ad9.lcd_data22 */
        };
 
 
-       user_leds_s0: user_leds_s0 {
+       user_leds_s0: user-leds-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD4, PIN_OUTPUT_PULLDOWN, MUX_MODE7)     /* gpmc_ad4.gpio1_4 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD5, PIN_OUTPUT_PULLDOWN, MUX_MODE7)     /* gpmc_ad5.gpio1_5 */
                >;
        };
 
-       gpio_keys_s0: gpio_keys_s0 {
+       gpio_keys_s0: gpio-keys-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_OEN_REN, PIN_INPUT_PULLDOWN, MUX_MODE7)  /* gpmc_oen_ren.gpio2_3 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_ADVN_ALE, PIN_INPUT_PULLDOWN, MUX_MODE7) /* gpmc_advn_ale.gpio2_2 */
                >;
        };
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       clkout2_pin: pinmux_clkout2_pin {
+       clkout2_pin: clkout2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_OUTPUT_PULLDOWN, MUX_MODE3)     /* xdma_event_intr1.clkout2 */
                >;
        };
 
-       ecap2_pins: backlight_pins {
+       ecap2_pins: backlight-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKR, 0x0, MUX_MODE4)        /* mcasp0_ahclkr.ecap2_in_pwm2_out */
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2)   /* mii1_txen.rgmii1_tctl */
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE7)               /* spi0_cs1.gpio0_6 */
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT0, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       mcasp1_pins: mcasp1_pins {
+       mcasp1_pins: mcasp1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE4) /* mii1_crs.mcasp1_aclkx */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */
                >;
        };
 
-       mcasp1_pins_sleep: mcasp1_pins_sleep {
+       mcasp1_pins_sleep: mcasp1-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       mmc2_pins: pinmux_mmc2_pins {
+       mmc2_pins: mmc2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_wpn.gpio0_31 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn1.mmc1_clk */
                >;
        };
 
-       wl12xx_gpio: pinmux_wl12xx_gpio {
+       wl12xx_gpio: wl12xx-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN0, PIN_OUTPUT_PULLUP, MUX_MODE7) /* gpmc_csn0.gpio1_29 */
                >;
index b357364..3031fc9 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&clkout2_pin &guardian_interface_pins>;
 
-       clkout2_pin: pinmux_clkout2_pin {
+       clkout2_pin: clkout2-pins {
                pinctrl-single,pins = <
                        /* xdma_event_intr1.clkout2 */
                        AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3)
                >;
        };
 
-       guardian_interface_pins: pinmux_interface_pins {
+       guardian_interface_pins: interface-pins {
                pinctrl-single,pins = <
                        /* ADC_BATSENSE_EN */
                        /* (A14) MCASP0_AHCLKx.gpio3[21] */
                >;
        };
 
-       guardian_beeper_pins: pinmux_dmtimer7_pins {
+       guardian_beeper_pins: dmtimer7-pins {
                pinctrl-single,pins = <
                        AM33XX_IOPAD(0x968, PIN_OUTPUT | MUX_MODE5) /* (E18) timer7 */
                >;
        };
 
-       guardian_button_pins: pinmux_guardian_button_pins {
+       guardian_button_pins: guardian-button-pins {
                pinctrl-single,pins = <
                        AM33XX_IOPAD(0x940, PIN_INPUT | MUX_MODE7) /* (M16) gmii1_rxd0.gpio2[21] */
                        AM33XX_IOPAD(0x884, PIN_INPUT | MUX_MODE7) /* (V9)  gpmc_csn2.gpio1[31] */
        };
 
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_IOPAD(0x988, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */
                        AM33XX_IOPAD(0x98c, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */
                >;
        };
 
-       led_bl_pins: gpio_led_bl_pins {
+       led_bl_pins: gpio-led-bl-pins {
                pinctrl-single,pins = <
                        /* P9_14, gpmc_a[2].GPIO1[18] (backlight control) */
                        AM33XX_IOPAD(0x848, PIN_OUTPUT | MUX_MODE7)
                >;
        };
 
-       lcd_disen_pins: pinmux_lcd_disen_pins {
+       lcd_disen_pins: lcd-disen-pins {
                pinctrl-single,pins = <
                        /* P9_27, mcasp0_fsr.gpio3[19] (lcd_disen) */
                        AM33XX_IOPAD(0x9a4, PIN_OUTPUT_PULLUP | SLEWCTRL_SLOW | MUX_MODE7)
                >;
        };
 
-       lcd_pins_default: pinmux_lcd_pins_default {
+       lcd_pins_default: lcd-default-pins {
                pinctrl-single,pins = <
                        /* (U10) gpmc_ad8.lcd_data23 */
                        AM33XX_IOPAD(0x820, PIN_OUTPUT | SLEWCTRL_SLOW | MUX_MODE1)
                >;
        };
 
-       lcd_pins_sleep: pinmux_lcd_pins_sleep {
+       lcd_pins_sleep: lcd-sleep-pins {
                pinctrl-single,pins = <
                        /* lcd_data0.lcd_data0 */
                        AM33XX_IOPAD(0x8a0, PULL_DISABLE | SLEWCTRL_SLOW | MUX_MODE7)
                >;
        };
 
-       guardian_led_pins: pinmux_guardian_led_pins {
+       guardian_led_pins: guardian-led-pins {
                pinctrl-single,pins = <
                        AM33XX_IOPAD(0x868, PIN_OUTPUT | MUX_MODE7) /* (T16) gpmc_a10.gpio1[26] */
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_IOPAD(0x8f0, PIN_INPUT_PULLUP | MUX_MODE0)  /* mmc0_dat3.mmc0_dat3 */
                        AM33XX_IOPAD(0x8f4, PIN_INPUT_PULLUP | MUX_MODE0)  /* mmc0_dat2.mmc0_dat2 */
                >;
        };
 
-       spi0_pins: pinmux_spi0_pins {
+       spi0_pins: spi0-pins {
                pinctrl-single,pins = <
                        /* SPI0_CLK  - spi0_clk.spi */
                        AM33XX_IOPAD(0x950, PIN_OUTPUT_PULLDOWN | MUX_MODE0)
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        /* uart0_rxd.uart0_rxd */
                        AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)
                >;
        };
 
-       uart2_pins: pinmux_uart2_pins {
+       uart2_pins: uart2-pins {
                pinctrl-single,pins = <
                        /* K18 uart2_rxd.mirx_txd */
                        AM33XX_IOPAD(0x92c, PIN_INPUT_PULLUP | MUX_MODE1)
                >;
        };
 
-       nandflash_pins: pinmux_nandflash_pins {
+       nandflash_pins: nandflash-pins {
                pinctrl-single,pins = <
                        /* (U7) gpmc_ad0.gpmc_ad0 */
                        AM33XX_IOPAD(0x800, PIN_INPUT | MUX_MODE0)
index 5835c0c..7ed2321 100644 (file)
 };
 
 &am33xx_pinmux {
-       user_leds: user_leds {
+       user_leds: user-leds-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TXD3, PIN_OUTPUT, MUX_MODE7) /* (J18) gmii1_txd3.gpio0[16] */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TXD2, PIN_OUTPUT, MUX_MODE7) /* (K15) gmii1_txd2.gpio0[17] */
                >;
        };
 
-       mmc0_pins_default: mmc0_pins_default {
+       mmc0_pins_default: mmc0-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       i2c0_pins_default: i2c0_pins_default {
+       i2c0_pins_default: i2c0-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT, MUX_MODE0)
                >;
        };
 
-       spi0_pins_default: spi0_pins_default {
+       spi0_pins_default: spi0-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       uart3_pins_default: uart3_pins_default {
+       uart3_pins_default: uart3-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLUP, MUX_MODE1) /* (L17) gmii1_rxd3.uart3_rxd */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_OUTPUT_PULLUP, MUX_MODE1) /* (L16) gmii1_rxd2.uart3_txd */
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1, RMII mode */
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLUP, MUX_MODE1)        /* mii1_crs.rmii1_crs_dv */
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
index 3fddf80..4aed736 100644 (file)
 };
 
 &am33xx_pinmux {
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       nandflash_pins: pinmux_nandflash_pins {
+       nandflash_pins: nandflash-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       leds_pins: pinmux_leds_pins {
+       leds_pins: leds-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A7, PIN_OUTPUT_PULLDOWN, MUX_MODE7)      /* gpmc_a7.gpio1_23 */
                >;
index 1282dae..008be69 100644 (file)
@@ -41,7 +41,7 @@
 };
 
 &am33xx_pinmux {
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT, MUX_MODE0)
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A9, PIN_INPUT_PULLDOWN, MUX_MODE7)       /* rmii1_int */
@@ -85,7 +85,7 @@
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A9, PIN_INPUT_PULLDOWN, MUX_MODE7)       /* rmii1_int */
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       emmc_pins: pinmux_emmc_pins {
+       emmc_pins: emmc-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn1.mmc1_clk */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_INPUT_PULLUP, MUX_MODE2) /* gpmc_csn2.mmc1_cmd */
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
index 49e280b..b8730aa 100644 (file)
 &am33xx_pinmux {
        pinctrl-names = "default";
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       push_button_pins: pinmux_push_button {
+       push_button_pins: push-button-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_HSYNC, PIN_INPUT_PULLDOWN, MUX_MODE7)     /* lcd_hsync.gpio2_23 */
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
@@ -59,7 +59,7 @@
                >;
        };
 
-       mmc1_pins_default: pinmux_mmc1_pins {
+       mmc1_pins_default: mmc1-pins {
                pinctrl-single,pins = <
                        /* eMMC */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE1)        /* gpmc_ad12.mmc1_dat0 */
@@ -75,7 +75,7 @@
                >;
        };
 
-       spi0_pins: pinmux_spi0 {
+       spi0_pins: spi0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLUP, MUX_MODE0)
index 1cc513e..e986945 100644 (file)
@@ -28,7 +28,7 @@
 &am33xx_pinmux {
        pinctrl-names = "default";
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE1)      /* mii1_crs.rmii1_crs_dv */
@@ -42,7 +42,7 @@
                >;
        };
 
-       spi1_pins: pinmux_spi1 {
+       spi1_pins: spi1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, PIN_INPUT_PULLUP, MUX_MODE4)        /* ecap0_in_pwm0_out.spi1_sclk */
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLUP, MUX_MODE4)       /* uart1_ctsn.spi1_cs0 */
index 7d00e8b..c16f3cf 100644 (file)
@@ -38,7 +38,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&minipcie_pins>;
 
-       minipcie_pins: pinmux_minipcie {
+       minipcie_pins: minipcie-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_PCLK, PIN_INPUT_PULLDOWN, MUX_MODE7)      /* lcd_pclk.gpio2_24 */
                        AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)        /* lcd_ac_bias_en.gpio2_25 */
                >;
        };
 
-       push_button_pins: pinmux_push_button {
+       push_button_pins: push-button-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_INPUT_PULLDOWN, MUX_MODE7) /* mcasp0_ahcklx.gpio3_21 */
                >;
        };
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)
        };
 
 
-       i2c1_pins: pinmux_i2c1_pins {
+       i2c1_pins: i2c1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLUP, MUX_MODE3)      /* uart0_ctsn.i2c1_sda */
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLUP, MUX_MODE3)      /* uart0_rtsn.i2c1_scl */
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
@@ -83,7 +83,7 @@
                >;
        };
 
-       uart2_pins: pinmux_uart2_pins {
+       uart2_pins: uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA14, PIN_INPUT, MUX_MODE6)             /* lcd_data14.uart5_ctsn */
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA15, PIN_OUTPUT_PULLDOWN, MUX_MODE6)  /* lcd_data15.uart5_rtsn */
@@ -92,7 +92,7 @@
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE1)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                >;
        };
 
-       mmc0_pins_default: pinmux_mmc0_pins {
+       mmc0_pins_default: mmc0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       mmc2_pins_default: pinmux_mmc2_pins {
+       mmc2_pins_default: mmc2-pins {
                pinctrl-single,pins = <
                        /* eMMC */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT_PULLUP, MUX_MODE3)       /* gpmc_ad12.mmc2_dat0 */
                >;
        };
 
-       spi0_pins: pinmux_spi0 {
+       spi0_pins: spi0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLUP, MUX_MODE0)
index 6eea18b..c721707 100644 (file)
 };
 
 &am33xx_pinmux {
-       mdio_pins_default: pinmux_mdio_pins_default {
+       mdio_pins_default: mdio-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)    /* mdio_data */
                        AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)                    /* mdio_clk */
                >;
        };
 
-       mdio_pins_sleep: pinmux_mdio_pins_sleep {
+       mdio_pins_sleep: mdio-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       eth_slave1_pins_default: pinmux_eth_slave1_pins_default {
+       eth_slave1_pins_default: eth-slave1-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2)           /* rgmii1_tctl */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE2)            /* rgmii1_rctl */
                >;
        };
 
-       eth_slave1_pins_sleep: pinmux_eth_slave1_pins_sleep {
+       eth_slave1_pins_sleep: eth-slave1-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       i2c0_pins_default: pinmux_i2c0_pins_default {
+       i2c0_pins_default: i2c0-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT | SLEWCTRL_FAST, MUX_MODE0)       /* I2C0_SDA */
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT | SLEWCTRL_FAST, MUX_MODE0)       /* I2C0_SCL */
                >;
        };
 
-       i2c0_pins_gpio: pinmux_i2c0_pins_gpio {
+       i2c0_pins_gpio: i2c0-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT, MUX_MODE7)                       /* gpio3[5] */
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT, MUX_MODE7)                       /* gpio3[6] */
                >;
        };
 
-       i2c0_pins_sleep: pinmux_i2c0_pins_sleep {
+       i2c0_pins_sleep: i2c0-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       led_mod_pins: pinmux_led_mod_pins {
+       led_mod_pins: led-mod-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_OUTPUT_PULLDOWN, MUX_MODE7)         /* gpio3[18] */
                >;
        };
 
-       nand_pins_default: pinmux_nand_pins_default {
+       nand_pins_default: nand-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE0)                /* gpmc_ad0 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE0)                /* gpmc_ad1 */
                >;
        };
 
-       nand_pins_sleep: pinmux_nand_pins_sleep {
+       nand_pins_sleep: nand-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLDOWN, MUX_MODE7)
index 425ad9b..d3bba79 100644 (file)
 };
 
 &am33xx_pinmux {
-       dcan0_pins_default: pinmux_dcan0_pins_default {
+       dcan0_pins_default: dcan0-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_OUTPUT, MUX_MODE2)                    /* dcan0_tx_mux2 */
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT, MUX_MODE2)                     /* dcan0_rx_mux2 */
                >;
        };
 
-       dcan0_pins_sleep: pinmux_dcan0_pins_sleep {
+       dcan0_pins_sleep: dcan0-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       dcan1_pins_default: pinmux_dcan1_pins_default {
+       dcan1_pins_default: dcan1-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT, MUX_MODE2)                    /* dcan1_tx_mux0 */
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT, MUX_MODE2)                     /* dcan1_rx_mux0 */
                >;
        };
 
-       dcan1_pins_sleep: pinmux_dcan1_pins_sleep {
+       dcan1_pins_sleep: dcan1-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       ehrpwm0_pins_default: pinmux_ehrpwm0_pins_default {
+       ehrpwm0_pins_default: ehrpwm0-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_OUTPUT, MUX_MODE3)                     /* ehrpwm0A_mux1 */
                >;
        };
 
-       ehrpwm0_pins_sleep: pinmux_ehrpwm0_pins_sleep {
+       ehrpwm0_pins_sleep: ehrpwm0-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       eth_slave2_pins_default: pinmux_eth_slave2_pins_default {
+       eth_slave2_pins_default: eth-slave2-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A0, PIN_OUTPUT_PULLDOWN, MUX_MODE2)              /* rgmii2_tctl */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLDOWN, MUX_MODE2)               /* rgmii2_rctl */
                >;
        };
 
-       eth_slave2_pins_sleep: pinmux_eth_slave2_pins_sleep {
+       eth_slave2_pins_sleep: eth-slave2-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A0, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       gpio_buttons_pins: pinmux_gpio_buttons_pins {
+       gpio_buttons_pins: gpio-buttons-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_COL, PIN_INPUT_PULLDOWN, MUX_MODE7)              /* gpio3[0] */
                        AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_INPUT, MUX_MODE7)                  /* gpio0[29] */
                >;
        };
 
-       i2c1_pins_default: pinmux_i2c1_pins_default {
+       i2c1_pins_default: i2c1-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT | SLEWCTRL_FAST, MUX_MODE2)        /* I2C1_SDA_mux3 */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT | SLEWCTRL_FAST, MUX_MODE2)       /* I2C1_SCL_mux3 */
                >;
        };
 
-       i2c1_pins_gpio: pinmux_i2c1_pins_gpio {
+       i2c1_pins_gpio: i2c1-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT, MUX_MODE7)                        /* gpio0[4] */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT, MUX_MODE7)                       /* gpio0[5] */
                >;
        };
 
-       i2c1_pins_sleep: pinmux_i2c1_pins_sleep {
+       i2c1_pins_sleep: i2c1-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       lcdc_pins_default: pinmux_lcdc_pins_default {
+       lcdc_pins_default: lcdc-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)                     /* lcd_data0 */
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0)                     /* lcd_data1 */
                >;
        };
 
-       lcdc_pins_sleep: pinmux_lcdc_pins_sleep {
+       lcdc_pins_sleep: lcdc-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PULL_DISABLE, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PULL_DISABLE, MUX_MODE7)
                >;
        };
 
-       leds_pins: pinmux_leds_pins {
+       leds_pins: leds-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD11, PIN_OUTPUT, MUX_MODE7)                     /* gpio0[27] */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE7)                       /* gpio0[3] */
                >;
        };
 
-       mcasp0_pins_default: pinmux_mcasp0_pins_default {
+       mcasp0_pins_default: mcasp0-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKX, PIN_INPUT_PULLDOWN, MUX_MODE0)          /* mcasp0_aclkx_mux0 */
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_INPUT_PULLDOWN, MUX_MODE0)            /* mcasp0_fsx_mux0 */
                >;
        };
 
-       mcasp0_pins_sleep: pinmux_mcasp0_pins_sleep {
+       mcasp0_pins_sleep: mcasp0-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKX, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       mmc1_pins_default: pinmux_mmc1_pins_default {
+       mmc1_pins_default: mmc1-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)               /* mmc0_dat3 */
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)               /* mmc0_dat2 */
                >;
        };
 
-       mmc1_pins_sleep: pinmux_mmc1_pins_sleep {
+       mmc1_pins_sleep: mmc1-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLDOWN, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)               /* uart0_rxd */
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)            /* uart0_txd */
                >;
        };
 
-       uart1_pins_default: pinmux_uart1_pins_default {
+       uart1_pins_default: uart1-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0)               /* uart1_rxd */
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)            /* uart1_txd */
                >;
        };
 
-       uart1_pins_sleep: pinmux_uart1_pins_sleep {
+       uart1_pins_sleep: uart1-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       uart2_pins_default: pinmux_uart2_pins_default {
+       uart2_pins_default: uart2-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT, MUX_MODE6)                       /* uart2_rxd_mux1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_OUTPUT, MUX_MODE6)                    /* uart2_txd_mux1 */
                >;
        };
 
-       uart2_pins_sleep: pinmux_uart2_pins_sleep {
+       uart2_pins_sleep: uart2-sleep-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       usb_pins: pinmux_usb_pins {
+       usb_pins: usb-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_USB0_DRVVBUS, PIN_OUTPUT_PULLDOWN, MUX_MODE0)         /* USB0_DRVVBUS */
                        AM33XX_PADCONF(AM335X_PIN_USB1_DRVVBUS, PIN_OUTPUT_PULLDOWN, MUX_MODE0)         /* USB1_DRVVBUS */
index c447aeb..9305ba9 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&misc_pins>;
 
-       misc_pins: misc_pins {
+       misc_pins: misc-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_OUTPUT, MUX_MODE7)      /* spi0_cs0.gpio0_5 */
                >;
        };
 
-       gpmc_pins: gpmc_pins {
+       gpmc_pins: gpmc-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       i2c0_pins: i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLDOWN, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart0_pins: uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT, MUX_MODE0)
                >;
        };
 
-       uart1_pins: uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_OUTPUT, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT, MUX_MODE7)
                >;
        };
 
-       uart2_pins: uart2_pins {
+       uart2_pins: uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA8, PIN_INPUT_PULLUP, MUX_MODE7)       /* lcd_data8.gpio2[14] */
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA9, PIN_OUTPUT, MUX_MODE7)             /* lcd_data9.gpio2[15] */
                >;
        };
 
-       uart3_pins: uart3_pins {
+       uart3_pins: uart3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA10, PIN_INPUT_PULLUP, MUX_MODE7)      /* lcd_data10.gpio2[16] */
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA11, PIN_OUTPUT, MUX_MODE7)            /* lcd_data11.gpio2[17] */
                >;
        };
 
-       uart4_pins: uart4_pins {
+       uart4_pins: uart4-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA12, PIN_INPUT_PULLUP, MUX_MODE7)      /* lcd_data12.gpio0[8] */
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA13, PIN_OUTPUT, MUX_MODE7)            /* lcd_data13.gpio0[9] */
                >;
        };
 
-       uart5_pins: uart5_pins {
+       uart5_pins: uart5-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA14, PIN_INPUT, MUX_MODE4)             /* lcd_data14.uart5_rxd */
                        AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_OUTPUT, MUX_MODE3)         /* rmiii1_refclk.uart5_txd */
                >;
        };
 
-       mmc1_pins: mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
index 2e04948..f7fad48 100644 (file)
 };
 
 &am33xx_pinmux {
-       user_leds_s0: user_leds_s0 {
+       user_leds_s0: user-leds-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_OUTPUT_PULLDOWN, MUX_MODE7)    /* CAN Data LED */
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE7)    /* CAN Error LED */
                >;
        };
 
-       dcan1_pins: pinmux_dcan1_pins {
+       dcan1_pins: dcan1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT, MUX_MODE2)    /* CAN TX */
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT, MUX_MODE2)     /* CAN RX */
index 6ed886c..76751a3 100644 (file)
@@ -18,7 +18,7 @@
 };
 
 &am33xx_pinmux {
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT, MUX_MODE0)                      /* RX */
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT, MUX_MODE0)                      /* TX */
@@ -31,7 +31,7 @@
                >;
        };
 
-       uart2_pins: pinmux_uart2_pins {
+       uart2_pins: uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE1)              /* RX */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE1)               /* TX */
index ad3adc7..5a9fcec 100644 (file)
@@ -20,7 +20,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&dip_switches>;
 
-       dip_switches: pinmux_dip_switches {
+       dip_switches: dip-switches-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT_PULLDOWN, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       tca6416_pins: pinmux_tca6416_pins {
+       tca6416_pins: tca6416-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
-       i2c2_pins: pinmux_i2c2_pins {
+       i2c2_pins: i2c2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE3)
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLDOWN, MUX_MODE3)
index b2846cd..d28d397 100644 (file)
                >;
        };
 
-       flash_enable: flash-enable {
+       flash_enable: flash-enable-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE7)        /* rmii1_ref_clk.gpio0_29 */
                >;
        };
 
-       imu_interrupt: imu-interrupt {
+       imu_interrupt: imu-interrupt-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE7)    /* mii1_rx_er.gpio3_2 */
                >;
        };
 
-       ethernet_interrupt: ethernet-interrupt{
+       ethernet_interrupt: ethernet-interrupt-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_COL, PIN_INPUT_PULLDOWN, MUX_MODE7)      /* mii1_col.gpio3_0 */
                >;
        };
 
-       user_leds_s0: user-leds-s0 {
+       user_leds_s0: user-leds-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT_PULLDOWN, MUX_MODE7)      /* gpmc_a5.gpio1_21 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A6, PIN_OUTPUT_PULLUP, MUX_MODE7)        /* gpmc_a6.gpio1_22 */
                >;
        };
 
-       clkout2_pin: pinmux-clkout2-pin {
+       clkout2_pin: pinmux-clkout2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_OUTPUT_PULLDOWN, MUX_MODE3)     /* xdma_event_intr1.clkout2 */
                >;
        };
 
-       cpsw_default: cpsw-default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2)   /* mii1_txen.rgmii1_tctl */
                >;
        };
 
-       cpsw_sleep: cpsw-sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       davinci_mdio_default: davinci-mdio-default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_sleep: davinci-mdio-sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
index 67c7fcc..75efe1c 100644 (file)
 };
 
 &am33xx_pinmux {
-       user_buttons_pins: pinmux-user-buttons {
+       user_buttons_pins: pinmux-user-buttons-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_EMU0, PIN_INPUT_PULLDOWN, MUX_MODE7)  /* emu0.gpio3_7 */
                        AM33XX_PADCONF(AM335X_PIN_EMU1, PIN_INPUT_PULLDOWN, MUX_MODE7)  /* emu1.gpio3_8 */
                >;
        };
 
-       user_leds_pins: pinmux-user-leds {
+       user_leds_pins: pinmux-user-leds-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_OUTPUT_PULLDOWN, MUX_MODE7)    /* gpmc_csn1.gpio1_30 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_OUTPUT_PULLDOWN, MUX_MODE7)    /* gpmc_csn2.gpio1_31 */
@@ -85,7 +85,7 @@
 
 /* CAN */
 &am33xx_pinmux {
-       dcan1_pins: pinmux-dcan1 {
+       dcan1_pins: pinmux-dcan1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_OUTPUT_PULLUP, MUX_MODE2)      /* uart1_rxd.dcan1_tx_mux2 */
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_INPUT_PULLUP, MUX_MODE2)       /* uart1_txd.dcan1_rx_mux2 */
 
 /* Ethernet */
 &am33xx_pinmux {
-       ethernet1_pins: pinmux_ethernet1 {
+       ethernet1_pins: ethernet1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A0, PIN_OUTPUT_PULLDOWN, MUX_MODE2)      /* gpmc_a0.rgmii2_tctl */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLDOWN, MUX_MODE2)       /* gpmc_a1.rgmii2_rctl */
        pinctrl-names = "default";
        pinctrl-0 = <&cb_gpio_pins>;
 
-       cb_gpio_pins: pinmux-cb-gpio {
+       cb_gpio_pins: pinmux-cb-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE7)   /* uart0_ctsn.gpio1_8 */
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE7)   /* uart0_rtsn.gpio1_9 */
 
 /* UARTs */
 &am33xx_pinmux {
-       uart0_pins: pinmux-uart0 {
+       uart0_pins: pinmux-uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart1_pins: pinmux-uart1 {
+       uart1_pins: pinmux-uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart2_pins: pinmux-uart2 {
+       uart2_pins: pinmux-uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLUP, MUX_MODE1)     /* mii1_tx_clk.uart2_rxd */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE1)  /* mii1_rx_clk.uart2_txd */
                >;
        };
 
-       uart3_pins: pinmux-uart3 {
+       uart3_pins: pinmux-uart3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT_PULLUP, MUX_MODE1)       /* mii1_rxd3.uart3_rxd */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RXD2, PIN_OUTPUT_PULLDOWN, MUX_MODE1)    /* mii1_rxd2.uart3_txd */
index ce6cc2b..92a1d5f 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&clkout2_pin>;
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       i2c1_pins: pinmux_i2c1_pins {
+       i2c1_pins: i2c1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT_PULLUP, MUX_MODE2) /* spi0_d1.i2c1_sda */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLUP, MUX_MODE2)        /* spi0_cs0.i2c1_scl */
                >;
        };
 
-       i2c2_pins: pinmux_i2c2_pins {
+       i2c2_pins: i2c2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLUP, MUX_MODE2)       /* spi0_clk.i2c2_sda */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT_PULLUP, MUX_MODE2) /* spi0_d0.i2c2_scl */
                >;
        };
 
-       spi1_pins: pinmux_spi1_pins {
+       spi1_pins: spi1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKX, PIN_OUTPUT, MUX_MODE3)          /* mcasp0_aclkx.spi1_sclk */
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_OUTPUT, MUX_MODE3)            /* mcasp0_fsx.spi1_d0 */
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_OUTPUT, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart3_pins: pinmux_uart3_pins {
+       uart3_pins: uart3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT_PULLUP, MUX_MODE1)        /* spi0_cs1.uart3_rxd */
                        AM33XX_PADCONF(AM335X_PIN_ECAP0_IN_PWM0_OUT, PIN_OUTPUT_PULLDOWN, MUX_MODE1)    /* ecap0_in_pwm0_out.uart3_txd */
                >;
        };
 
-       clkout2_pin: pinmux_clkout2_pin {
+       clkout2_pin: clkout2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_OUTPUT_PULLDOWN, MUX_MODE3)     /* xdma_event_intr1.clkout2 */
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Port 1 (emac0) */
                        AM33XX_PADCONF(AM335X_PIN_MII1_COL, PIN_INPUT, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                /* eMMC */
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       mmc2_pins: pinmux_mmc2_pins {
+       mmc2_pins: mmc2-pins {
                /* SD cardcage */
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD3, PIN_INPUT_PULLUP, MUX_MODE1)        /* gpmc_ad3.mmc1_dat3 */
                >;
        };
 
-       lcd_pins_s0: lcd_pins_s0 {
+       lcd_pins_s0: lcd-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0)
                >;
        };
 
-       dcan0_pins: pinmux_dcan0_pins {
+       dcan0_pins: dcan0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_OUTPUT, MUX_MODE2)            /* uart1_ctsn.d_can0_tx */
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLDOWN, MUX_MODE2)    /* uart1_rtsn.d_can0_rx */
index a4509e9..5a87b25 100644 (file)
@@ -26,7 +26,7 @@
                compatible = "gpio-keys";
        };
 
-       leds: user_leds {
+       leds: user-leds-pins {
                compatible = "gpio-leds";
        };
 
 };
 
 &am33xx_pinmux {
-       i2c0_pins: pinmux_i2c0 {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
-       i2c1_pins: pinmux_i2c1 {
+       i2c1_pins: i2c1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLUP, MUX_MODE3)        /* mii1_crs,i2c1_sda */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLUP, MUX_MODE3)      /* mii1_rxerr,i2c1_scl */
 };
 
 &am33xx_pinmux {
-       accel_pins: pinmux_accel {
+       accel_pins: accel-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_WEN, PIN_INPUT, MUX_MODE7)   /* gpmc_wen.gpio2_4 */
                >;
 };
 
 &am33xx_pinmux {
-       audio_pins: pinmux_audio {
+       audio_pins: audio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_INPUT_PULLDOWN, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_INPUT_PULLDOWN, MUX_MODE0)
 };
 
 &am33xx_pinmux {
-       lcd_pins: pinmux_lcd {
+       lcd_pins: lcd-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0)
 };
 
 &am33xx_pinmux {
-       ethernet_pins: pinmux_ethernet {
+       ethernet_pins: ethernet-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2)   /* mii1_txen.rgmii1_tctl */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_DV, PIN_INPUT_PULLUP, MUX_MODE2)      /* mii1_rxdv.rgmii1_rctl */
                >;
        };
 
-       mdio_pins: pinmux_mdio {
+       mdio_pins: mdio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
 
 
 &am33xx_pinmux {
-       sd_pins: pinmux_sd_card {
+       sd_pins: sd-card-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE7)               /* spi0_cs1.gpio0_6 */
                >;
        };
-       emmc_pins: pinmux_emmc {
+       emmc_pins: emmc-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT_PULLUP, MUX_MODE2)       /* gpmc_csn1.mmc1_clk */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_INPUT_PULLUP, MUX_MODE2)       /* gpmc_csn2.mmc1_cmd */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_OUTPUT_PULLUP, MUX_MODE7)       /* gpmc_wpn.gpio0_31 */
                >;
        };
-       wireless_pins: pinmux_wireless {
+       wireless_pins: wireless-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLUP, MUX_MODE3) /* gpmc_a1.mmc2_dat0 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A2, PIN_INPUT_PULLUP, MUX_MODE3) /* gpmc_a2.mmc2_dat1 */
 };
 
 &am33xx_pinmux {
-       spi0_pins: pinmux_spi0 {
+       spi0_pins: spi0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS0, PIN_INPUT_PULLUP, MUX_MODE0)
 };
 
 &am33xx_pinmux {
-       uart0_pins: pinmux_uart0 {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
-       uart1_pins: pinmux_uart1 {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
 };
 
 &am33xx_pinmux {
-       usb_pins: pinmux_usb {
+       usb_pins: usb-pins {
                pinctrl-single,pins = <
                        /* USB0 Over-Current (active low) */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A9, PIN_INPUT, MUX_MODE7)        /* gpmc_a9.gpio1_25 */
 };
 
 &am33xx_pinmux {
-       user_leds_pins: pinmux_user_leds {
+       user_leds_pins: user-leds-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A4, PIN_OUTPUT, MUX_MODE7)       /* gpmc_a4.gpio1_20 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT, MUX_MODE7)       /* gpmc_a5.gpio1_21 */
                >;
        };
 
-       user_buttons_pins: pinmux_user_buttons {
+       user_buttons_pins: user-buttons-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A6, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_a6.gpio1_22 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A7, PIN_INPUT_PULLUP, MUX_MODE7) /* gpmc_a7.gpio1_21 */
index 034dc51..feb3f4c 100644 (file)
@@ -76,7 +76,7 @@
 
 /* Ethernet */
 &am33xx_pinmux {
-       ethernet0_pins: pinmux_ethernet0 {
+       ethernet0_pins: ethernet0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_CRS, PIN_INPUT_PULLDOWN, MUX_MODE1)
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE1)
@@ -89,7 +89,7 @@
                >;
        };
 
-       mdio_pins: pinmux_mdio {
+       mdio_pins: mdio-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
 
 /* I2C Busses */
 &am33xx_pinmux {
-       i2c0_pins: pinmux-i2c0 {
+       i2c0_pins: pinmux-i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT, MUX_MODE0)
 
 /* NAND memory */
 &am33xx_pinmux {
-               nandflash_pins: pinmux-nandflash {
+               nandflash_pins: pinmux-nandflash-pins {
                        pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD0, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD1, PIN_INPUT_PULLUP, MUX_MODE0)
 
 /* SPI Busses */
 &am33xx_pinmux {
-       spi0_pins: pinmux-spi0 {
+       spi0_pins: pinmux-spi0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT_PULLDOWN, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT_PULLDOWN, MUX_MODE0)
index 0ba4883..5dfe4d4 100644 (file)
                        &P2_17_gpio >;
 
        /* P2_03 (ZCZ ball T10) gpio0_23 0x824 PIN 9 */
-       P2_03_gpio: pinmux_P2_03_gpio {
+       P2_03_gpio: P2-03-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD9, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P1_34 (ZCZ ball T11) gpio0_26 0x828 PIN 10 */
-       P1_34_gpio: pinmux_P1_34_gpio {
+       P1_34_gpio: P1-34-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD10, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_19 (ZCZ ball U12) gpio0_27 0x82c PIN 11 */
-       P2_19_gpio: pinmux_P2_19_gpio {
+       P2_19_gpio: P2-19-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD11, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_24 (ZCZ ball T12) gpio1_12 0x830 PIN 12 */
-       P2_24_gpio: pinmux_P2_24_gpio {
+       P2_24_gpio: P2-24-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_33 (ZCZ ball R12) gpio1_13 0x834 PIN 13 */
-       P2_33_gpio: pinmux_P2_33_gpio {
+       P2_33_gpio: P2-33-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_22 (ZCZ ball V13) gpio1_14 0x838 PIN 14 */
-       P2_22_gpio: pinmux_P2_22_gpio {
+       P2_22_gpio: P2-22-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD14, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_18 (ZCZ ball U13) gpio1_15 0x83c PIN 15 */
-       P2_18_gpio: pinmux_P2_18_gpio {
+       P2_18_gpio: P2-18-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_10 (ZCZ ball R14) gpio1_20 0x850 PIN 20 */
-       P2_10_gpio: pinmux_P2_10_gpio {
+       P2_10_gpio: P2-10-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A4, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_06 (ZCZ ball U16) gpio1_25 0x864 PIN 25 */
-       P2_06_gpio: pinmux_P2_06_gpio {
+       P2_06_gpio: P2-06-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A9, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_04 (ZCZ ball T16) gpio1_26 0x868 PIN 26 */
-       P2_04_gpio: pinmux_P2_04_gpio {
+       P2_04_gpio: P2-04-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A10, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_02 (ZCZ ball V17) gpio1_27 0x86c PIN 27 */
-       P2_02_gpio: pinmux_P2_02_gpio {
+       P2_02_gpio: P2-02-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A11, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
        /* P2_08 (ZCZ ball U18) gpio1_28 0x878 PIN 30 */
-       P2_08_gpio: pinmux_P2_08_gpio {
+       P2_08_gpio: P2-08-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_BEN1, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
        /* P2_17 (ZCZ ball V12) gpio2_1 0x88c PIN 35 */
-       P2_17_gpio: pinmux_P2_17_gpio {
+       P2_17_gpio: P2-17-gpio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CLK, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
index 3894f14..625db3b 100644 (file)
@@ -39,7 +39,7 @@
 
 /* User Leds */
 &am33xx_pinmux {
-       user_leds_pins: pinmux-user-leds {
+       user_leds_pins: pinmux-user-leds-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_VSYNC, PIN_OUTPUT_PULLDOWN, MUX_MODE7)    /* lcd_hsync.gpio2_22 */
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_OUTPUT_PULLDOWN, MUX_MODE7)   /* mcasp0_fsx.gpio3_15 */
@@ -49,7 +49,7 @@
 
 /* CAN Busses */
 &am33xx_pinmux {
-       dcan1_pins: pinmux-dcan1 {
+       dcan1_pins: pinmux-dcan1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE2)     /* uart0_ctsn.d_can1_tx */
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLUP, MUX_MODE2)      /* uart0_rtsn.d_can1_rx */
@@ -65,7 +65,7 @@
 
 /* Ethernet */
 &am33xx_pinmux {
-       ethernet1_pins: pinmux-ethernet1 {
+       ethernet1_pins: pinmux-ethernet1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A0, PIN_OUTPUT, MUX_MODE1)               /* gpmc_a0.mii2_txen */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLDOWN, MUX_MODE1)       /* gpmc_a1.mii2_rxdv */
        pinctrl-names = "default";
        pinctrl-0 = <&user_gpios_pins>;
 
-       user_gpios_pins: pinmux-user-gpios {
+       user_gpios_pins: pinmux-user-gpios-pins {
                pinctrl-single,pins = <
                        /* DIGIN 1-4 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD11, PIN_INPUT, MUX_MODE7)              /* gpmc_ad11.gpio0_27 */
 
 /* MMC */
 &am33xx_pinmux {
-       mmc1_pins: pinmux-mmc1 {
+       mmc1_pins: pinmux-mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
 
 /* UARTs */
 &am33xx_pinmux {
-       uart0_pins: pinmux-uart0 {
+       uart0_pins: pinmux-uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart2_pins: pinmux-uart2 {
+       uart2_pins: pinmux-uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_CLK, PIN_INPUT_PULLUP, MUX_MODE1)     /* mii1_tx_clk.uart2_rxd */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_CLK, PIN_OUTPUT_PULLDOWN, MUX_MODE1)  /* mii1_rx_clk.uart2_txd */
index f9b7e77..a138eb3 100644 (file)
@@ -4,7 +4,7 @@
  */
 
 &am33xx_pinmux {
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_OUTPUT_PULLDOWN, MUX_MODE2)   /* mii1_txen.rgmii1_tctl */
@@ -22,7 +22,7 @@
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_TX_EN, PIN_INPUT_PULLDOWN, MUX_MODE7)
@@ -40,7 +40,7 @@
                >;
        };
 
-       usb_hub_ctrl: usb_hub_ctrl {
+       usb_hub_ctrl: usb-hub-ctrl-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_OUTPUT_PULLUP, MUX_MODE7)     /* rmii1_refclk.gpio0_29 */
                >;
index a2676d1..5522759 100644 (file)
@@ -28,7 +28,7 @@
 };
 
 &am33xx_pinmux {
-       mmc3_pins: pinmux_mmc3_pins {
+       mmc3_pins: mmc3-pins {
                pinctrl-single,pins = <
                        /* gpmc_a9.gpio1_25: RADIO_EN */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A9, PIN_OUTPUT_PULLUP, MUX_MODE7)
                >;
        };
 
-       bluetooth_pins: pinmux_bluetooth_pins {
+       bluetooth_pins: bluetooth-pins {
                pinctrl-single,pins = <
                        /* event_intr0.gpio0_19 */
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR0, PIN_INPUT_PULLUP, MUX_MODE7)
                >;
        };
 
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        /* uart1_rxd */
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT, MUX_MODE0)
index d6ef193..b1b4002 100644 (file)
@@ -19,7 +19,7 @@
 };
 
 &am33xx_pinmux {
-       bb_spi0_pins: pinmux_bb_spi0_pins {
+       bb_spi0_pins: bb-spi0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT, MUX_MODE0)
index efbe931..3266934 100644 (file)
 };
 
 &am33xx_pinmux {
-       mpu6050_pins: pinmux_mpu6050_pins {
+       mpu6050_pins: mpu6050-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT, MUX_MODE7)    /* uart0_ctsn.gpio1_8 */
                >;
        };
 
-       lps3331ap_pins: pinmux_lps3331ap_pins {
+       lps3331ap_pins: lps3331ap-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A10, PIN_INPUT, MUX_MODE7)     /* gpmc_a10.gpio1_26 */
                >;
index 81e4453..596774c 100644 (file)
@@ -64,7 +64,7 @@
 
 &am33xx_pinmux {
        /* Display */
-       lcd_pins_default: lcd_pins_default {
+       lcd_pins_default: lcd-default-pins {
                pinctrl-single,pins = <
                        /* gpmc_ad8.lcd_data23 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD8, PIN_OUTPUT, MUX_MODE1)
                >;
        };
 
-       lcd_pins_sleep: lcd_pins_sleep {
+       lcd_pins_sleep: lcd-sleep-pins {
                pinctrl-single,pins = <
                        /* gpmc_ad8.lcd_data23 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD8, PIN_INPUT_PULLDOWN, MUX_MODE7)
index c497200..9297cb1 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&clkout2_pin>;
 
-       clkout2_pin: pinmux_clkout2_pin {
+       clkout2_pin: clkout2-pins {
                pinctrl-single,pins = <
                        /* xdma_event_intr1.clkout2 */
                        AM33XX_PADCONF(AM335X_PIN_XDMA_EVENT_INTR1, PIN_INPUT, MUX_MODE6)
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       ehrpwm1_pins: pinmux_ehrpwm1 {
+       ehrpwm1_pins: ehrpwm1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A3, PIN_OUTPUT, MUX_MODE6) /* gpmc_a3.gpio1_19 */
                >;
        };
 
-       emmc_pins: pinmux_emmc_pins {
+       emmc_pins: emmc-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT, MUX_MODE2)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_INPUT_PULLUP, MUX_MODE2)
                >;
        };
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT, MUX_MODE0)
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_CS1, PIN_INPUT, MUX_MODE5)
                >;
        };
 
-       mmc3_pins: pinmux_mmc3_pins {
+       mmc3_pins: mmc3-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT, MUX_MODE3)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT, MUX_MODE3)
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_OUTPUT, MUX_MODE0)
                >;
        };
 
-       uart1_pins: pinmux_uart1 {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLDOWN, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_OUTPUT, MUX_MODE0)
                >;
        };
 
-       uart2_pins: pinmux_uart2_pins {
+       uart2_pins: uart2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_SCLK, PIN_INPUT, MUX_MODE1)
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_OUTPUT, MUX_MODE1)
                >;
        };
 
-       uart4_pins: pinmux_uart4_pins {
+       uart4_pins: uart4-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE6)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_OUTPUT_PULLUP, MUX_MODE6)
                >;
        };
 
-       user_leds_s0: user_leds_s0 {
+       user_leds_s0: user-leds-s0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD8, PIN_OUTPUT, MUX_MODE7)
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD9, PIN_OUTPUT, MUX_MODE7)
index 73b5d1a..d35ed80 100644 (file)
        pinctrl-names = "default";
        pinctrl-0 = <&lwb_pins>;
 
-       audio_pins: pinmux_audio_pins {
+       audio_pins: audio-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_INPUT_PULLDOWN, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_FSX, PIN_INPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       audio_pa_pins: pinmux_audio_pa_pins {
+       audio_pa_pins: audio-pa-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT_PULLDOWN, MUX_MODE7)  /* SoundPA_en - mcasp0_aclkr.gpio3_18 */
                >;
        };
 
-       audio_mclk_pins: pinmux_audio_mclk_pins {
+       audio_mclk_pins: audio-mclk-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A11, PIN_INPUT_PULLDOWN, MUX_MODE7)      /* gpmc_a11.gpio1_27 */
                >;
        };
 
-       backlight0_pins: pinmux_backlight0_pins {
+       backlight0_pins: backlight0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_WEN, PIN_OUTPUT, MUX_MODE7)      /* gpmc_wen.gpio2_4 */
                >;
        };
 
-       backlight1_pins: pinmux_backlight1_pins {
+       backlight1_pins: backlight1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD10, PIN_OUTPUT, MUX_MODE7)     /* gpmc_ad10.gpio0_26 */
                >;
        };
 
-       lcd_pins: pinmux_lcd_pins {
+       lcd_pins: lcd-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA0, PIN_OUTPUT, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_LCD_DATA1, PIN_OUTPUT, MUX_MODE0)
                >;
        };
 
-       led_pins: pinmux_led_pins {
+       led_pins: led-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A5, PIN_OUTPUT, MUX_MODE7)       /* gpmc_a5.gpio1_21 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A6, PIN_OUTPUT, MUX_MODE7)       /* gpmc_a6.gpio1_22 */
                >;
        };
 
-       uart0_pins: pinmux_uart0_pins {
+       uart0_pins: uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart1_pins: pinmux_uart1_pins {
+       uart1_pins: uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart4_pins: pinmux_uart4_pins {
+       uart4_pins: uart4-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_WAIT0, PIN_INPUT_PULLUP, MUX_MODE6)      /* gpmc_wait0.uart4_rxd */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_WPN, PIN_OUTPUT_PULLDOWN, MUX_MODE6)     /* gpmc_wpn.uart4_txd */
                >;
        };
 
-       i2c0_pins: pinmux_i2c0_pins {
+       i2c0_pins: i2c0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SDA, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_I2C0_SCL, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       i2c2_pins: pinmux_i2c2_pins {
+       i2c2_pins: i2c2-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_CTSN, PIN_INPUT_PULLUP, MUX_MODE3)      /* uart1_ctsn.i2c2_sda */
                        AM33XX_PADCONF(AM335X_PIN_UART1_RTSN, PIN_INPUT_PULLUP, MUX_MODE3)      /* uart1_rtsn.i2c2_scl */
                >;
        };
 
-       cpsw_default: cpsw_default {
+       cpsw_default: cpsw-default-pins {
                pinctrl-single,pins = <
                        /* Slave 1 */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLUP, MUX_MODE0)
                >;
        };
 
-       cpsw_sleep: cpsw_sleep {
+       cpsw_sleep: cpsw-sleep-pins {
                pinctrl-single,pins = <
                        /* Slave 1 reset value */
                        AM33XX_PADCONF(AM335X_PIN_MII1_RX_ER, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       davinci_mdio_default: davinci_mdio_default {
+       davinci_mdio_default: davinci-mdio-default-pins {
                pinctrl-single,pins = <
                        /* MDIO */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
                >;
        };
 
-       davinci_mdio_sleep: davinci_mdio_sleep {
+       davinci_mdio_sleep: davinci-mdio-sleep-pins {
                pinctrl-single,pins = <
                        /* MDIO reset value */
                        AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
                >;
        };
 
-       mmc1_pins: pinmux_mmc1_pins {
+       mmc1_pins: mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT, MUX_MODE7)             /* uart0_rtsn.gpio1_9 */
                >;
        };
 
-       emmc_pwrseq_pins: pinmux_emmc_pwrseq_pins {
+       emmc_pwrseq_pins: emmc-pwrseq-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A4, PIN_OUTPUT_PULLUP, MUX_MODE7)        /* gpmc_a4.gpio1_20 */
                >;
        };
 
-       emmc_pins: pinmux_emmc_pins {
+       emmc_pins: emmc-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN1, PIN_INPUT_PULLUP, MUX_MODE2)       /* gpmc_csn1.mmc1_clk */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_CSN2, PIN_INPUT_PULLUP, MUX_MODE2)       /* gpmc_csn2.mmc1_cmd */
                >;
        };
 
-       ehrpwm1_pins: pinmux_ehrpwm1a_pins {
+       ehrpwm1_pins: ehrpwm1a-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A2, PIN_OUTPUT, MUX_MODE6)       /* gpmc_a2.ehrpwm1a */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A3, PIN_OUTPUT, MUX_MODE6)       /* gpmc_a3.ehrpwm1b */
                >;
        };
 
-       rtc0_irq_pins: pinmux_rtc0_irq_pins {
+       rtc0_irq_pins: rtc0-irq-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD9, PIN_INPUT_PULLUP, MUX_MODE7)     /* gpmc_ad9.gpio0_23 */
                >;
        };
 
-       spi0_pins: pinmux_spi0_pins {
+       spi0_pins: spi0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D0, PIN_INPUT_PULLUP, MUX_MODE0) /* SPI0_MOSI */
                        AM33XX_PADCONF(AM335X_PIN_SPI0_D1, PIN_INPUT_PULLUP, MUX_MODE0) /* SPI0_MISO */
                >;
        };
 
-       lwb_pins: pinmux_lwb_pins {
+       lwb_pins: lwb-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD12, PIN_INPUT_PULLUP, MUX_MODE7)       /* nKbdInt - gpmc_ad12.gpio1_12 */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_AD13, PIN_INPUT_PULLUP, MUX_MODE7)       /* nKbdReset - gpmc_ad13.gpio1_13 */
index 6a103f1..cb27ff4 100644 (file)
@@ -49,7 +49,7 @@
 
 /* Audio */
 &am33xx_pinmux {
-       mcasp0_pins: pinmux-mcasp0 {
+       mcasp0_pins: pinmux-mcasp0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_AHCLKX, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKX, PIN_INPUT_PULLDOWN, MUX_MODE0)
@@ -90,7 +90,7 @@
 
 /* CAN Busses */
 &am33xx_pinmux {
-       dcan1_pins: pinmux-dcan1 {
+       dcan1_pins: pinmux-dcan1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_CTSN, PIN_OUTPUT_PULLUP, MUX_MODE2) /* uart0_ctsn.d_can1_tx */
                        AM33XX_PADCONF(AM335X_PIN_UART0_RTSN, PIN_INPUT_PULLUP, MUX_MODE2) /* uart0_rtsn.d_can1_rx */
 
 /* Ethernet */
 &am33xx_pinmux {
-       ethernet1_pins: pinmux-ethernet1 {
+       ethernet1_pins: pinmux-ethernet1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A0, PIN_OUTPUT, MUX_MODE1)               /* gpmc_a0.mii2_txen */
                        AM33XX_PADCONF(AM335X_PIN_GPMC_A1, PIN_INPUT_PULLDOWN, MUX_MODE1)       /* gpmc_a1.mii2_rxdv */
 
 /* MMC */
 &am33xx_pinmux {
-       mmc1_pins: pinmux-mmc1 {
+       mmc1_pins: pinmux-mmc1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
 
 /* UARTs */
 &am33xx_pinmux {
-       uart0_pins: pinmux-uart0 {
+       uart0_pins: pinmux-uart0-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART0_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART0_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)
                >;
        };
 
-       uart1_pins: pinmux-uart1 {
+       uart1_pins: pinmux-uart1-pins {
                pinctrl-single,pins = <
                        AM33XX_PADCONF(AM335X_PIN_UART1_RXD, PIN_INPUT_PULLUP, MUX_MODE0)
                        AM33XX_PADCONF(AM335X_PIN_UART1_TXD, PIN_OUTPUT_PULLDOWN, MUX_MODE0)