Commit c99b8874 authored by Tony Lindgren's avatar Tony Lindgren

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

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

Cc: Conor Dooley <conor+dt@kernel.org>
Cc: Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent e141d4a7
...@@ -285,7 +285,7 @@ i2c@6 { ...@@ -285,7 +285,7 @@ i2c@6 {
}; };
&pincntl { &pincntl {
mmc2_pins: pinmux_mmc2_pins { mmc2_pins: mmc2-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0800, PIN_INPUT | 0x1) /* SD1_CLK */ DM814X_IOPAD(0x0800, PIN_INPUT | 0x1) /* SD1_CLK */
DM814X_IOPAD(0x0804, PIN_INPUT_PULLUP | 0x1) /* SD1_CMD */ DM814X_IOPAD(0x0804, PIN_INPUT_PULLUP | 0x1) /* SD1_CMD */
...@@ -299,19 +299,19 @@ DM814X_IOPAD(0x093C, PIN_INPUT | 0x2) /* SD1_SDCD */ ...@@ -299,19 +299,19 @@ DM814X_IOPAD(0x093C, PIN_INPUT | 0x2) /* SD1_SDCD */
>; >;
}; };
usb0_pins: pinmux_usb0_pins { usb0_pins: usb0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1) /* USB0_DRVVBUS */ DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1) /* USB0_DRVVBUS */
>; >;
}; };
usb1_pins: pinmux_usb1_pins { usb1_pins: usb1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0834, PIN_OUTPUT | 0x80) /* USB1_DRVVBUS */ DM814X_IOPAD(0x0834, PIN_OUTPUT | 0x80) /* USB1_DRVVBUS */
>; >;
}; };
gpio1_pins: pinmux_gpio1_pins { gpio1_pins: gpio1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x081c, PIN_OUTPUT | 0x80) /* PROGRAM_B */ DM814X_IOPAD(0x081c, PIN_OUTPUT | 0x80) /* PROGRAM_B */
DM814X_IOPAD(0x0820, PIN_INPUT | 0x80) /* INIT_B */ DM814X_IOPAD(0x0820, PIN_INPUT | 0x80) /* INIT_B */
...@@ -336,7 +336,7 @@ DM814X_IOPAD(0x0ab0, PIN_INPUT_PULLUP | 0x80) /* FPGA_TDI */ ...@@ -336,7 +336,7 @@ DM814X_IOPAD(0x0ab0, PIN_INPUT_PULLUP | 0x80) /* FPGA_TDI */
>; >;
}; };
gpio2_pins: pinmux_gpio2_pins { gpio2_pins: gpio2-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x090c, PIN_INPUT_PULLUP | 0x80) /* PHY A IRQ */ DM814X_IOPAD(0x090c, PIN_INPUT_PULLUP | 0x80) /* PHY A IRQ */
DM814X_IOPAD(0x0910, PIN_INPUT_PULLUP | 0x80) /* PHY A RESET */ DM814X_IOPAD(0x0910, PIN_INPUT_PULLUP | 0x80) /* PHY A RESET */
...@@ -349,7 +349,7 @@ DM814X_IOPAD(0x0a2c, PIN_INPUT_PULLUP | 0x80) /* GPIO RESET */ ...@@ -349,7 +349,7 @@ DM814X_IOPAD(0x0a2c, PIN_INPUT_PULLUP | 0x80) /* GPIO RESET */
>; >;
}; };
gpio4_pins: pinmux_gpio4_pins { gpio4_pins: gpio4-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
/* The PLL doesn't react well to the SPI controller reset, so /* The PLL doesn't react well to the SPI controller reset, so
* we force the CS lines to pull up as GPIOs until we're ready. * we force the CS lines to pull up as GPIOs until we're ready.
...@@ -364,14 +364,14 @@ DM814X_IOPAD(0x0b50, PIN_INPUT_PULLUP | 0x80) /* BP_ARM_GPIO5 */ ...@@ -364,14 +364,14 @@ DM814X_IOPAD(0x0b50, PIN_INPUT_PULLUP | 0x80) /* BP_ARM_GPIO5 */
>; >;
}; };
spi2_pins: pinmux_spi2_pins { spi2_pins: spi2-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0950, PIN_INPUT_PULLUP | 0x80) /* PLL SPI CS1 as GPIO */ DM814X_IOPAD(0x0950, PIN_INPUT_PULLUP | 0x80) /* PLL SPI CS1 as GPIO */
DM814X_IOPAD(0x0818, PIN_INPUT_PULLUP | 0x80) /* PLL SPI CS2 as GPIO */ DM814X_IOPAD(0x0818, PIN_INPUT_PULLUP | 0x80) /* PLL SPI CS2 as GPIO */
>; >;
}; };
spi4_pins: pinmux_spi4_pins { spi4_pins: spi4-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0a7c, 0x20) DM814X_IOPAD(0x0a7c, 0x20)
DM814X_IOPAD(0x0b74, 0x20) DM814X_IOPAD(0x0b74, 0x20)
......
...@@ -116,7 +116,7 @@ &mmc3 { ...@@ -116,7 +116,7 @@ &mmc3 {
}; };
&pincntl { &pincntl {
sd1_pins: pinmux_sd1_pins { sd1_pins: sd1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0800, PIN_INPUT | 0x1) /* SD1_CLK */ DM814X_IOPAD(0x0800, PIN_INPUT | 0x1) /* SD1_CLK */
DM814X_IOPAD(0x0804, PIN_INPUT_PULLUP | 0x1) /* SD1_CMD */ DM814X_IOPAD(0x0804, PIN_INPUT_PULLUP | 0x1) /* SD1_CMD */
...@@ -129,13 +129,13 @@ DM814X_IOPAD(0x093C, PIN_INPUT_PULLUP | 0x80) /* GP1[6] */ ...@@ -129,13 +129,13 @@ DM814X_IOPAD(0x093C, PIN_INPUT_PULLUP | 0x80) /* GP1[6] */
>; >;
}; };
usb0_pins: pinmux_usb0_pins { usb0_pins: usb0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1) /* USB0_DRVVBUS */ DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1) /* USB0_DRVVBUS */
>; >;
}; };
usb1_pins: pinmux_usb1_pins { usb1_pins: usb1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0834, PIN_OUTPUT | 0x80) /* USB1_DRVVBUS */ DM814X_IOPAD(0x0834, PIN_OUTPUT | 0x80) /* USB1_DRVVBUS */
>; >;
......
...@@ -71,7 +71,7 @@ &mmc3 { ...@@ -71,7 +71,7 @@ &mmc3 {
}; };
&pincntl { &pincntl {
sd2_pins: pinmux_sd2_pins { sd2_pins: sd2-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x09c0, PIN_INPUT_PULLUP | 0x1) /* SD2_DAT[7] */ DM814X_IOPAD(0x09c0, PIN_INPUT_PULLUP | 0x1) /* SD2_DAT[7] */
DM814X_IOPAD(0x09c4, PIN_INPUT_PULLUP | 0x1) /* SD2_DAT[6] */ DM814X_IOPAD(0x09c4, PIN_INPUT_PULLUP | 0x1) /* SD2_DAT[6] */
...@@ -87,13 +87,13 @@ DM814X_IOPAD(0x0920, PIN_INPUT | 0x40) /* SD2_SDCD */ ...@@ -87,13 +87,13 @@ DM814X_IOPAD(0x0920, PIN_INPUT | 0x40) /* SD2_SDCD */
>; >;
}; };
usb0_pins: pinmux_usb0_pins { usb0_pins: usb0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1) /* USB0_DRVVBUS */ DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1) /* USB0_DRVVBUS */
>; >;
}; };
usb1_pins: pinmux_usb1_pins { usb1_pins: usb1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0834, PIN_OUTPUT | 0x80) /* USB1_DRVVBUS */ DM814X_IOPAD(0x0834, PIN_OUTPUT | 0x80) /* USB1_DRVVBUS */
>; >;
......
...@@ -30,7 +30,7 @@ sata_refclk: fixedclock0 { ...@@ -30,7 +30,7 @@ sata_refclk: fixedclock0 {
}; };
&dm816x_pinmux { &dm816x_pinmux {
mcspi1_pins: pinmux_mcspi1_pins { mcspi1_pins: mcspi1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM816X_IOPAD(0x0a94, MUX_MODE0) /* SPI_SCLK */ DM816X_IOPAD(0x0a94, MUX_MODE0) /* SPI_SCLK */
DM816X_IOPAD(0x0a98, MUX_MODE0) /* SPI_SCS0 */ DM816X_IOPAD(0x0a98, MUX_MODE0) /* SPI_SCS0 */
...@@ -39,7 +39,7 @@ DM816X_IOPAD(0x0aac, MUX_MODE0) /* SPI_D1 */ ...@@ -39,7 +39,7 @@ DM816X_IOPAD(0x0aac, MUX_MODE0) /* SPI_D1 */
>; >;
}; };
mmc_pins: pinmux_mmc_pins { mmc_pins: mmc-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM816X_IOPAD(0x0a70, MUX_MODE0) /* SD_POW */ DM816X_IOPAD(0x0a70, MUX_MODE0) /* SD_POW */
DM816X_IOPAD(0x0a74, MUX_MODE0) /* SD_CLK */ DM816X_IOPAD(0x0a74, MUX_MODE0) /* SD_CLK */
...@@ -53,19 +53,19 @@ DM816X_IOPAD(0x0a90, MUX_MODE2) /* GP1[8] */ ...@@ -53,19 +53,19 @@ DM816X_IOPAD(0x0a90, MUX_MODE2) /* GP1[8] */
>; >;
}; };
usb0_pins: pinmux_usb0_pins { usb0_pins: usb0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM816X_IOPAD(0x0d04, MUX_MODE0) /* USB0_DRVVBUS */ DM816X_IOPAD(0x0d04, MUX_MODE0) /* USB0_DRVVBUS */
>; >;
}; };
usb1_pins: pinmux_usb1_pins { usb1_pins: usb1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM816X_IOPAD(0x0d08, MUX_MODE0) /* USB1_DRVVBUS */ DM816X_IOPAD(0x0d08, MUX_MODE0) /* USB1_DRVVBUS */
>; >;
}; };
nandflash_pins: nandflash_pins { nandflash_pins: nandflash-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM816X_IOPAD(0x0b38, PULL_UP | MUX_MODE0) /* PINCTRL207 GPMC_CS0*/ DM816X_IOPAD(0x0b38, PULL_UP | MUX_MODE0) /* PINCTRL207 GPMC_CS0*/
DM816X_IOPAD(0x0b60, PULL_ENA | MUX_MODE0) /* PINCTRL217 GPMC_ADV_ALE */ DM816X_IOPAD(0x0b60, PULL_ENA | MUX_MODE0) /* PINCTRL217 GPMC_ADV_ALE */
......
...@@ -108,7 +108,7 @@ &mmc2 { ...@@ -108,7 +108,7 @@ &mmc2 {
}; };
&pincntl { &pincntl {
sd1_pins: pinmux_sd1_pins { sd1_pins: sd1-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0800, PIN_INPUT | 0x1) /* SD1_CLK */ DM814X_IOPAD(0x0800, PIN_INPUT | 0x1) /* SD1_CLK */
DM814X_IOPAD(0x0804, PIN_INPUT_PULLUP | 0x1) /* SD1_CMD */ DM814X_IOPAD(0x0804, PIN_INPUT_PULLUP | 0x1) /* SD1_CMD */
...@@ -121,7 +121,7 @@ DM814X_IOPAD(0x093C, PIN_INPUT_PULLUP | 0x80) /* GP1[6] */ ...@@ -121,7 +121,7 @@ DM814X_IOPAD(0x093C, PIN_INPUT_PULLUP | 0x80) /* GP1[6] */
>; >;
}; };
usb0_pins: pinmux_usb0_pins { usb0_pins: usb0-pins {
pinctrl-single,pins = < pinctrl-single,pins = <
DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1) /* USB0_DRVVBUS */ DM814X_IOPAD(0x0c34, PIN_OUTPUT | 0x1) /* USB0_DRVVBUS */
>; >;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment