Unverified Commit 739c4c31 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v6.5/dt-pin-nodes-signed' of... 

Merge tag 'omap-for-v6.5/dt-pin-nodes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into soc/dt

Clean-up for pinctrl-single node names for omaps for v6.5

To avoid producing lots of make dtbs checks warnings when the yaml binding
for pinctrl-single gets merged, let's fix up the pin group node names. We
want to do this rather than add non-standard node name workarounds to the
yaml binding.

Also included is a non-urgent fix to move gta04 model name out of the pinmux
node that can wait for the merge window.

* tag 'omap-for-v6.5/dt-pin-nodes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: Unify pinctrl-single pin group nodes for dra7
  ARM: dts: Unify pinctrl-single pin group nodes for am4
  ARM: dts: Unify pinctrl-single pin group nodes for am33xx
  ARM: dts: Unify pinctrl-single pin group nodes for ti81xx
  ARM: dts: Unify pinctrl-single pin group nodes for omap5
  ARM: dts: Unify pinctrl-single pin group nodes for omap4
  ARM: dts: Unify pinctrl-single pin group nodes for omap2
  ARM: dts: Unify pinctrl-single pin group nodes for omap3
  ARM: dts: gta04: Move model property out of pinctrl node

Link: https://lore.kernel.org/r/pull-1685700720-242492@atomide.com-2


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c5c3f746 5cb957a1

arch/arm/boot/dts/am335x-baltos-ir2110.dts

+2 −2
Original line number Diff line number Diff line
@@ -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 @@ AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_INPUT_PULLDOWN, MUX_MODE7) /* 
		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

	mmc1_pins: mmc1-pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_GPMC_AD15, PIN_INPUT, MUX_MODE7)     /* MMC1 CD */

		>;

arch/arm/boot/dts/am335x-baltos-ir3220.dts

+4 −4
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ / { 
};



&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 @@ AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_INPUT_PULLDOWN, MUX_MODE7) /* 
		>;

	};



	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 @@ AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT_PULLUP, MUX_MODE7) /* mca 
		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

	mmc1_pins: mmc1-pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT, MUX_MODE7)     /* MMC1 CD */

		>;

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+5 −5
Original line number Diff line number Diff line
@@ -18,21 +18,21 @@ / { 
};



&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 @@ AM33XX_PADCONF(AM335X_PIN_LCD_AC_BIAS_EN, PIN_INPUT_PULLDOWN, MUX_MODE7) /* 
		>;

	};



	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 @@ AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT_PULLUP, MUX_MODE7) /* mca 
		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

	mmc1_pins: mmc1-pins {

		pinctrl-single,pins = <

			AM33XX_PADCONF(AM335X_PIN_MII1_RXD3, PIN_INPUT, MUX_MODE7)     /* MMC1 CD */

		>;

arch/arm/boot/dts/am335x-baltos-leds.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ led-app { 
};



&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 */

arch/arm/boot/dts/am335x-baltos.dtsi

+10 −10
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ wl12xx_vmmc: fixedregulator2 { 
};



&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 */
@@ -60,33 +60,33 @@ AM33XX_PADCONF(AM335X_PIN_EMU0, PIN_INPUT_PULLUP, MUX_MODE7) /* emu0.gpio3[ 
		>;

	};



	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 */
@@ -114,7 +114,7 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_A11, PIN_INPUT_PULLDOWN, MUX_MODE2) /* gpmc_a11.r 
		>;

	};



	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)
@@ -141,7 +141,7 @@ AM33XX_PADCONF(AM335X_PIN_GPMC_A11, 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 */
@@ -149,7 +149,7 @@ AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0) /* mdio_clk.mdio_ 
		>;

	};



	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)
@@ -157,7 +157,7 @@ AM33XX_PADCONF(AM335X_PIN_MDC, 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 */