Commit 5cb957a1 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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



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 7a75ed22

arch/arm/boot/dts/am57xx-cl-som-am57x.dts

+14 −14
Original line number Diff line number Diff line
@@ -77,40 +77,40 @@ simple-audio-card,codec { 
};



&dra7_pmx_core {

	leds_pins_default: leds_pins_default {

	leds_pins_default: leds-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x347c, PIN_OUTPUT | MUX_MODE14)	/* gpmc_a15.gpio2_5 */

		>;

	};



	i2c1_pins_default: i2c1_pins_default {

	i2c1_pins_default: i2c1-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3800, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c1_sda.sda */

			DRA7XX_CORE_IOPAD(0x3804, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c1_scl.scl */

		>;

	};



	i2c3_pins_default: i2c3_pins_default {

	i2c3_pins_default: i2c3-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x36a4, PIN_INPUT| MUX_MODE10)	/* mcasp1_aclkx.i2c3_sda */

			DRA7XX_CORE_IOPAD(0x36a8, PIN_INPUT| MUX_MODE10)	/* mcasp1_fsx.i2c3_scl */

		>;

	};



	i2c4_pins_default: i2c4_pins_default {

	i2c4_pins_default: i2c4-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x36ac, PIN_INPUT| MUX_MODE10)	/* mcasp1_acl.i2c4_sda */

			DRA7XX_CORE_IOPAD(0x36b0, PIN_INPUT| MUX_MODE10)	/* mcasp1_fsr.i2c4_scl */

		>;

	};



	tps659038_pins_default: tps659038_pins_default {

	tps659038_pins_default: tps659038-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3818, PIN_INPUT_PULLUP | MUX_MODE14) /* wakeup0.gpio1_0 */

		>;

	};



	mmc2_pins_default: mmc2_pins_default {

	mmc2_pins_default: mmc2-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x349c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a23.mmc2_clk */

			DRA7XX_CORE_IOPAD(0x34b0, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs1.mmc2_cmd */
@@ -125,7 +125,7 @@ DRA7XX_CORE_IOPAD(0x3498, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_a22.mmc2_dat7 */ 
		>;

	};



	qspi1_pins: pinmux_qspi1_pins {

	qspi1_pins: qspi1-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3474, PIN_INPUT | MUX_MODE1)	/* gpmc_a13.qspi1_rtclk */

			DRA7XX_CORE_IOPAD(0x3480, PIN_INPUT | MUX_MODE1)	/* gpmc_a16.qspi1_d0 */
@@ -136,7 +136,7 @@ DRA7XX_CORE_IOPAD(0x34bc, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_cs3.qspi1_cs1 */ 
		>;

	};



	cpsw_pins_default: cpsw_pins_default {

	cpsw_pins_default: cpsw-default-pins {

		pinctrl-single,pins = <

			/* Slave at addr 0x0 */

			DRA7XX_CORE_IOPAD(0x3650, PIN_OUTPUT | MUX_MODE0)	/* rgmii0_tclk */
@@ -168,7 +168,7 @@ DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT_PULLDOWN | MUX_MODE3) /* vin2a_d23.rgmii1_rd 
		>;

	};



	cpsw_pins_sleep: cpsw_pins_sleep {

	cpsw_pins_sleep: cpsw-sleep-pins {

		pinctrl-single,pins = <

			/* Slave 1 */

			DRA7XX_CORE_IOPAD(0x3650, PIN_INPUT | MUX_MODE15)
@@ -200,7 +200,7 @@ DRA7XX_CORE_IOPAD(0x35c4, PIN_INPUT | MUX_MODE15) 
		>;

	};



	davinci_mdio_pins_default: davinci_mdio_pins_default {

	davinci_mdio_pins_default: davinci-mdio-default-pins {

		pinctrl-single,pins = <

			/* MDIO */

			DRA7XX_CORE_IOPAD(0x3590, PIN_OUTPUT_PULLUP | MUX_MODE3)/* vin2a_d10.mdio_mclk */
@@ -208,20 +208,20 @@ DRA7XX_CORE_IOPAD(0x3594, PIN_INPUT_PULLUP | MUX_MODE3) /* vin2a_d11.mdio_d */ 
		>;

	};



	davinci_mdio_pins_sleep: davinci_mdio_pins_sleep {

	davinci_mdio_pins_sleep: davinci-mdio-sleep-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3590, PIN_INPUT | MUX_MODE15)

			DRA7XX_CORE_IOPAD(0x3594, PIN_INPUT | MUX_MODE15)

		>;

	};



	ads7846_pins: pinmux_ads7846_pins {

	ads7846_pins: ads7846-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3464, PIN_INPUT_PULLDOWN | MUX_MODE14) /* gpmc_a9.gpio1_31 */

		>;

	};



	mcasp3_pins_default: mcasp3_pins_default {

	mcasp3_pins_default: mcasp3-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3724, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_aclkx.mcasp3_aclkx */

			DRA7XX_CORE_IOPAD(0x3728, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_fsx.mcasp3_fsx */
@@ -230,7 +230,7 @@ DRA7XX_CORE_IOPAD(0x3730, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp3_axr1.mcasp3_ 
		>;

	};



	mcasp3_pins_sleep: mcasp3_pins_sleep {

	mcasp3_pins_sleep: mcasp3-sleep-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3724, PIN_INPUT | MUX_MODE15)

			DRA7XX_CORE_IOPAD(0x3728, PIN_INPUT | MUX_MODE15)

arch/arm/boot/dts/am57xx-idk-common.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -158,14 +158,14 @@ src_clk_x1: src_clk_x1 { 
};



&dra7_pmx_core {

	dcan1_pins_default: dcan1_pins_default {

	dcan1_pins_default: dcan1-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x37d0, PIN_OUTPUT_PULLUP | MUX_MODE0)	/* dcan1_tx */

			DRA7XX_CORE_IOPAD(0x37d4, PIN_INPUT_PULLUP | MUX_MODE0)		/* dcan1_rx */

		>;

	};



	dcan1_pins_sleep: dcan1_pins_sleep {

	dcan1_pins_sleep: dcan1-sleep-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x37d0, MUX_MODE15 | PULL_UP)	/* dcan1_tx.off */

			DRA7XX_CORE_IOPAD(0x37d4, MUX_MODE15 | PULL_UP)	/* dcan1_rx.off */

arch/arm/boot/dts/am57xx-sbc-am57x.dts

+7 −7
Original line number Diff line number Diff line
@@ -20,14 +20,14 @@ aliases { 
};



&dra7_pmx_core {

	uart3_pins_default: uart3_pins_default {

	uart3_pins_default: uart3-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3648, PIN_INPUT_SLEW | MUX_MODE0)	/* uart3_rxd */

			DRA7XX_CORE_IOPAD(0x364c, PIN_INPUT_SLEW | MUX_MODE0)	/* uart3_txd */

		>;

	};



	mmc1_pins_default: mmc1_pins_default {

	mmc1_pins_default: mmc1-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_clk.clk */

			DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0)	/* mmc1_cmd.cmd */
@@ -40,33 +40,33 @@ DRA7XX_CORE_IOPAD(0x377c, PIN_INPUT | MUX_MODE14) /* mmc1_sdwp.gpio6_28 */ 
		>;

	};



	usb1_pins: pinmux_usb1_pins {

	usb1_pins: usb1-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3680, PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */

		>;

	};



	i2c5_pins_default: i2c5_pins_default {

	i2c5_pins_default: i2c5-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x36b4, PIN_INPUT| MUX_MODE10)	/* mcasp1_axr0.i2c5_sda */

			DRA7XX_CORE_IOPAD(0x36b8, PIN_INPUT| MUX_MODE10)	/* mcasp1_axr1.i2c5_scl */

		>;

	};



	lcd_pins_default: lcd_pins_default {

	lcd_pins_default: lcd-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3564, PIN_OUTPUT | MUX_MODE14)      /* vin2a_vsync0.gpio4_0 */

		>;

	};



	hdmi_pins: pinmux_hdmi_pins {

	hdmi_pins: hdmi-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3808, PIN_INPUT | MUX_MODE1)	/* i2c2_sda.hdmi1_ddc_scl */

			DRA7XX_CORE_IOPAD(0x380c, PIN_INPUT | MUX_MODE1)	/* i2c2_scl.hdmi1_ddc_sda */

		>;

	};



	hdmi_conn_pins: pinmux_hdmi_conn_pins {

	hdmi_conn_pins: hdmi-conn-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x37b8, PIN_INPUT | MUX_MODE14)	/* spi1_cs2.gpio7_12 */

		>;

arch/arm/boot/dts/dra7-evm.dts

+2 −2
Original line number Diff line number Diff line
@@ -152,14 +152,14 @@ vtt_fixed: fixedregulator-vtt { 
};



&dra7_pmx_core {

	dcan1_pins_default: dcan1_pins_default {

	dcan1_pins_default: dcan1-default-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x37d0, PIN_OUTPUT_PULLUP | MUX_MODE0) /* dcan1_tx */

			DRA7XX_CORE_IOPAD(0x3818, PULL_UP | MUX_MODE1) /* wakeup0.dcan1_rx */

		>;

	};



	dcan1_pins_sleep: dcan1_pins_sleep {

	dcan1_pins_sleep: dcan1-sleep-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x37d0, MUX_MODE15 | PULL_UP)	/* dcan1_tx.off */

			DRA7XX_CORE_IOPAD(0x3818, MUX_MODE15 | PULL_UP)	/* wakeup0.off */

arch/arm/boot/dts/dra7-mmc-iodelay.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 */



&dra7_pmx_core {

	mmc1_pins_default_no_clk_pu: mmc1_pins_default_no_clk_pu {

	mmc1_pins_default_no_clk_pu: mmc1-default-no-clk-pu-pins {

		pinctrl-single,pins = <

			DRA7XX_CORE_IOPAD(0x3754, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mmc1_clk.clk */

			DRA7XX_CORE_IOPAD(0x3758, PIN_INPUT_PULLUP | MUX_MODE0) /* mmc1_cmd.cmd */