Commit a4956811 authored by Tony Lindgren's avatar Tony Lindgren Committed by Vignesh Raghavendra
Browse files

arm64: dts: ti: Unify pin group node names for make dtbs checks 



Prepare for pinctrl-single yaml binding and unify pin group node names.

Let's standardize on pin group node naming ending in -pins. As we don't
necessarily have a SoC specific compatible property for pinctrl-single.
I'd rather not add a pattern match for pins somewhere in the name for all
the users.

Trying to add matches for pins-default will be futile as on the earlier
SoCs we've already seen names like pins-sleep, pins-idle, pins-off and so
on that would need to be matched.

And as the node is a pin group, let's prefer to use naming -pins rather
than -pin as more pins may need to be added to the pin group later on.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
[vigneshr@ti.com: Rebase onto latest ti/next and extend to new nodes]
Signed-off-by: default avatarVignesh Raghavendra <vigneshr@ti.com>
parent 7f066473

arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts

+3 −3
Original line number Diff line number Diff line
@@ -73,19 +73,19 @@ vddshv_sdio: regulator-4 { 
};



&main_pmx0 {

	vddshv_sdio_pins_default: vddshv-sdio-pins-default {

	vddshv_sdio_pins_default: vddshv-sdio-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */

		>;

	};



	main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-pins-default {

	main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (C13) UART0_RTSn.GPIO1_23 */

		>;

	};



	pmic_irq_pins_default: pmic-irq-pins-default {

	pmic_irq_pins_default: pmic-irq-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x01f4, PIN_INPUT, 0) /* (B16) EXTINTn */

		>;

arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -98,27 +98,27 @@ led-0 { 
};



&main_pmx0 {

	leds_pins_default: leds-pins-default {

	leds_pins_default: leds-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x034, PIN_OUTPUT, 7) /* (H21) OSPI0_CSN2.GPIO0_13 */

		>;

	};



	main_i2c0_pins_default: main-i2c0-pins-default {

	main_i2c0_pins_default: main-i2c0-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x1e0, PIN_INPUT_PULLUP, 0) /* (B16) I2C0_SCL */

			AM62X_IOPAD(0x1e4, PIN_INPUT_PULLUP, 0) /* (A16) I2C0_SDA */

		>;

	};



	main_mdio1_pins_default: main-mdio1-pins-default {

	main_mdio1_pins_default: main-mdio1-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x160, PIN_OUTPUT, 0) /* (AD24) MDIO0_MDC */

			AM62X_IOPAD(0x15c, PIN_INPUT, 0) /* (AB22) MDIO0_MDIO */

		>;

	};



	main_mmc0_pins_default: main-mmc0-pins-default {

	main_mmc0_pins_default: main-mmc0-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x220, PIN_INPUT_PULLUP, 0) /* (Y3) MMC0_CMD */

			AM62X_IOPAD(0x218, PIN_INPUT_PULLDOWN, 0) /* (AB1) MMC0_CLK */
@@ -133,7 +133,7 @@ AM62X_IOPAD(0x1f8, PIN_INPUT_PULLUP, 0) /* (AC2) MMC0_DAT7 */ 
		>;

	};



	main_rgmii1_pins_default: main-rgmii1-pins-default {

	main_rgmii1_pins_default: main-rgmii1-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x14c, PIN_INPUT, 0) /* (AB17) RGMII1_RD0 */

			AM62X_IOPAD(0x150, PIN_INPUT, 0) /* (AC17) RGMII1_RD1 */
@@ -150,7 +150,7 @@ AM62X_IOPAD(0x12c, PIN_OUTPUT, 0) /* (AD19) RGMII1_TX_CTL */ 
		>;

	};



	ospi0_pins_default: ospi0-pins-default {

	ospi0_pins_default: ospi0-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x000, PIN_OUTPUT, 0) /* (H24) OSPI0_CLK */

			AM62X_IOPAD(0x02c, PIN_OUTPUT, 0) /* (F23) OSPI0_CSn0 */
@@ -166,7 +166,7 @@ AM62X_IOPAD(0x008, PIN_INPUT, 0) /* (J24) OSPI0_DQS */ 
		>;

	};



	pmic_irq_pins_default: pmic-irq-pins-default {

	pmic_irq_pins_default: pmic-irq-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x01f4, PIN_INPUT, 0) /* (D16) EXTINTn */

		>;

arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi

+69 −69

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts

+26 −26

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/ti/k3-am625-phyboard-lyra-rdk.dts

+10 −10
Original line number Diff line number Diff line
@@ -81,33 +81,33 @@ vcc_3v3_mmc: regulator-vcc-3v3-mmc { 
};



&main_pmx0 {

	gpio_keys_pins_default: gpio-keys-pins-default {

	gpio_keys_pins_default: gpio-keys-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x1d4, PIN_INPUT, 7) /* (B15) UART0_RTSn.GPIO1_23 */

		>;

	};



	gpio_exp_int_pins_default: gpio-exp-int-pins-default {

	gpio_exp_int_pins_default: gpio-exp-int-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x244, PIN_INPUT, 7) /* (C17) MMC1_SDWP.GPIO1_49 */

		>;

	};



	main_i2c1_pins_default: main-i2c1-pins-default {

	main_i2c1_pins_default: main-i2c1-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x1e8, PIN_INPUT_PULLUP, 0) /* (B17) I2C1_SCL */

			AM62X_IOPAD(0x1ec, PIN_INPUT_PULLUP, 0) /* (A17) I2C1_SDA */

		>;

	};



	main_mcan0_pins_default: main-mcan0-pins-default {

	main_mcan0_pins_default: main-mcan0-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x1dc, PIN_INPUT, 0) /* (E15) MCAN0_RX */

			AM62X_IOPAD(0x1d8, PIN_OUTPUT, 0) /* (C15) MCAN0_TX */

		>;

	};



	main_mmc1_pins_default: main-mmc1-pins-default {

	main_mmc1_pins_default: main-mmc1-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x23c, PIN_INPUT_PULLUP, 0) /* (A21) MMC1_CMD */

			AM62X_IOPAD(0x234, PIN_INPUT_PULLDOWN, 0) /* (B22) MMC1_CLK */
@@ -119,7 +119,7 @@ AM62X_IOPAD(0x240, PIN_INPUT_PULLUP, 0) /* (D17) MMC1_SDCD */ 
		>;

	};



	main_rgmii2_pins_default: main-rgmii2-pins-default {

	main_rgmii2_pins_default: main-rgmii2-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x184, PIN_INPUT, 0) /* (AE23) RGMII2_RD0 */

			AM62X_IOPAD(0x188, PIN_INPUT, 0) /* (AB20) RGMII2_RD1 */
@@ -136,14 +136,14 @@ AM62X_IOPAD(0x164, PIN_OUTPUT, 0) /* (AA19) RGMII2_TX_CTL */ 
		>;

	};



	main_uart0_pins_default: main-uart0-pins-default {

	main_uart0_pins_default: main-uart0-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x1c8, PIN_INPUT, 0) /* (D14) UART0_RXD */

			AM62X_IOPAD(0x1cc, PIN_OUTPUT, 0) /* (E14) UART0_TXD */

		>;

	};



	main_uart1_pins_default: main-uart1-pins-default {

	main_uart1_pins_default: main-uart1-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x194, PIN_INPUT, 2) /* (B19) MCASP0_AXR3.UART1_CTSn */

			AM62X_IOPAD(0x198, PIN_OUTPUT, 2) /* (A19) MCASP0_AXR2.UART1_RTSn */
@@ -152,13 +152,13 @@ AM62X_IOPAD(0x1b0, PIN_OUTPUT, 2) /* (A20) MCASP0_ACLKR.UART1_TXD */ 
		>;

	};



	main_usb1_pins_default: main-usb1-pins-default {

	main_usb1_pins_default: main-usb1-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x258, PIN_OUTPUT, 0) /* (F18) USB1_DRVVBUS */

		>;

	};



	user_leds_pins_default: user-leds-pins-default {

	user_leds_pins_default: user-leds-default-pins {

		pinctrl-single,pins = <

			AM62X_IOPAD(0x084, PIN_OUTPUT, 7) /* (L23) GPMC0_ADVn_ALE.GPIO0_32 */

		>;