Commit 7fff6f6d authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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



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 c872f0d7

arch/arm/boot/dts/motorola-mapphone-common.dtsi

+20 −20
Original line number Diff line number Diff line
@@ -352,13 +352,13 @@ isl29030@44 { 
&omap4_pmx_core {



	/* hdmi_hpd.gpio_63 */

	hdmi_hpd_gpio: pinmux_hdmi_hpd_pins {

	hdmi_hpd_gpio: hdmi-hpd-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x098, PIN_INPUT | MUX_MODE3)

		>;

	};



	hdq_pins: pinmux_hdq_pins {

	hdq_pins: hdq-pins {

		pinctrl-single,pins = <

		/* 0x4a100120 hdq_sio.hdq_sio aa27 */

		OMAP4_IOPAD(0x120, PIN_INPUT | MUX_MODE0)
@@ -366,7 +366,7 @@ OMAP4_IOPAD(0x120, PIN_INPUT | MUX_MODE0) 
	};



	/* hdmi_cec.hdmi_cec, hdmi_scl.hdmi_scl, hdmi_sda.hdmi_sda */

	dss_hdmi_pins: pinmux_dss_hdmi_pins {

	dss_hdmi_pins: dss-hdmi-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x09a, PIN_INPUT | MUX_MODE0)

		OMAP4_IOPAD(0x09c, PIN_INPUT | MUX_MODE0)
@@ -380,7 +380,7 @@ OMAP4_IOPAD(0x09e, PIN_INPUT | MUX_MODE0) 
	 * devices. Off mode value should be tested if we have off mode working

	 * later on.

	 */

	mmc3_pins: pinmux_mmc3_pins {

	mmc3_pins: mmc3-pins {

		pinctrl-single,pins = <

		/* 0x4a10008e gpmc_wait2.gpio_100 d23 */

		OMAP4_IOPAD(0x08e, PIN_INPUT | MUX_MODE3)
@@ -406,40 +406,40 @@ OMAP4_IOPAD(0x11e, PIN_INPUT_PULLUP | MUX_MODE1) 
	};



	/* gpmc_ncs0.gpio_50 */

	poweroff_gpio: pinmux_poweroff_pins {

	poweroff_gpio: poweroff-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x074, PIN_OUTPUT_PULLUP | MUX_MODE3)

		>;

	};



	/* kpd_row0.gpio_178 */

	tmp105_irq: pinmux_tmp105_irq {

	tmp105_irq: tmp105-irq-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x18e, PIN_INPUT_PULLUP | MUX_MODE3)

		>;

	};



	usb_gpio_mux_sel1: pinmux_usb_gpio_mux_sel1_pins {

	usb_gpio_mux_sel1: usb-gpio-mux-sel1-pins {

		/* gpio_60 */

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x088, PIN_OUTPUT | MUX_MODE3)

		>;

	};



	touchscreen_pins: pinmux_touchscreen_pins {

	touchscreen_pins: touchscreen-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x180, PIN_OUTPUT | MUX_MODE3)

		OMAP4_IOPAD(0x1a0, PIN_INPUT_PULLUP | MUX_MODE3)

		>;

	};



	als_proximity_pins: pinmux_als_proximity_pins {

	als_proximity_pins: als-proximity-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x18c, PIN_INPUT_PULLUP | MUX_MODE3)

		>;

	};



	usb_mdm6600_pins: pinmux_usb_mdm6600_pins {

	usb_mdm6600_pins: usb-mdm6600-pins {

		pinctrl-single,pins = <

		/* enable 0x4a1000d8 usbb1_ulpitll_dat7.gpio_95 ag16 */

		OMAP4_IOPAD(0x0d8, PIN_INPUT | MUX_MODE3)
@@ -476,7 +476,7 @@ OMAP4_IOPAD(0x142, PIN_OUTPUT | MUX_MODE3) 
		>;

	};



	usb_ulpi_pins: pinmux_usb_ulpi_pins {

	usb_ulpi_pins: usb-ulpi-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x196, MUX_MODE7)

		OMAP4_IOPAD(0x198, MUX_MODE7)
@@ -496,7 +496,7 @@ OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE0) 
	};



	/* usb0_otg_dp and usb0_otg_dm */

	usb_utmi_pins: pinmux_usb_utmi_pins {

	usb_utmi_pins: usb-utmi-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x196, PIN_INPUT | MUX_MODE0)

		OMAP4_IOPAD(0x198, PIN_INPUT | MUX_MODE0)
@@ -521,7 +521,7 @@ OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE7) 
	 * when not used. If needed, we can add rts pin remux later based

	 * on power measurements.

	 */

	uart1_pins: pinmux_uart1_pins {

	uart1_pins: uart1-pins {

		pinctrl-single,pins = <

		/* 0x4a10013c mcspi1_cs2.uart1_cts ag23 */

		OMAP4_IOPAD(0x13c, PIN_INPUT_PULLUP | MUX_MODE1)
@@ -538,7 +538,7 @@ OMAP4_IOPAD(0x1ca, PIN_INPUT_PULLUP | MUX_MODE2) 
	};



	/* uart3_tx_irtx and uart3_rx_irrx */

	uart3_pins: pinmux_uart3_pins {

	uart3_pins: uart3-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x196, MUX_MODE7)

		OMAP4_IOPAD(0x198, MUX_MODE7)
@@ -557,7 +557,7 @@ OMAP4_IOPAD(0x1c8, PIN_INPUT_PULLUP | MUX_MODE7) 
		>;

	};



	uart4_pins: pinmux_uart4_pins {

	uart4_pins: uart4-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x15c, PIN_INPUT | MUX_MODE0)		/* uart4_rx */

		OMAP4_IOPAD(0x15e, PIN_OUTPUT | MUX_MODE0)		/* uart4_tx */
@@ -566,7 +566,7 @@ OMAP4_IOPAD(0x112, PIN_OUTPUT_PULLUP | MUX_MODE5) /* uart4_rts */ 
		>;

	};



	mcbsp2_pins: pinmux_mcbsp2_pins {

	mcbsp2_pins: mcbsp2-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x0f6, PIN_INPUT | MUX_MODE0)	/* abe_mcbsp2_clkx */

		OMAP4_IOPAD(0x0f8, PIN_INPUT | MUX_MODE0)	/* abe_mcbsp2_dr */
@@ -575,7 +575,7 @@ OMAP4_IOPAD(0x0fc, PIN_INPUT | MUX_MODE0) /* abe_mcbsp2_fsx */ 
		>;

	};



	mcbsp3_pins: pinmux_mcbsp3_pins {

	mcbsp3_pins: mcbsp3-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x106, PIN_INPUT | MUX_MODE1)	/* abe_mcbsp3_dr */

		OMAP4_IOPAD(0x108, PIN_OUTPUT | MUX_MODE1)	/* abe_mcbsp3_dx */
@@ -584,13 +584,13 @@ OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1) /* abe_mcbsp3_fsx */ 
		>;

	};



	vibrator_direction_pin: pinmux_vibrator_direction_pin {

	vibrator_direction_pin: vibrator-direction-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x1ce, PIN_OUTPUT | MUX_MODE1)	/* dmtimer8_pwm_evt (gpio_27) */

		>;

	};



	vibrator_enable_pin: pinmux_vibrator_enable_pin {

	vibrator_enable_pin: vibrator-enable-pins {

		pinctrl-single,pins = <

		OMAP4_IOPAD(0X1d0, PIN_OUTPUT | MUX_MODE1)	/* dmtimer9_pwm_evt (gpio_28) */

		>;
@@ -598,7 +598,7 @@ OMAP4_IOPAD(0X1d0, PIN_OUTPUT | MUX_MODE1) /* dmtimer9_pwm_evt (gpio_28) */ 
};



&omap4_pmx_wkup {

	usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins {

	usb_gpio_mux_sel2: usb-gpio-mux-sel2-pins {

		/* gpio_wk0 */

		pinctrl-single,pins = <

		OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3)

arch/arm/boot/dts/omap4-duovero-parlor.dts

+6 −6
Original line number Diff line number Diff line
@@ -62,33 +62,33 @@ &button_pins 
			&smsc_pins

	>;



	led_pins: pinmux_led_pins {

	led_pins: led-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x116, PIN_OUTPUT | MUX_MODE3)		/* abe_dmic_din3.gpio_122 */

		>;

	};



	button_pins: pinmux_button_pins {

	button_pins: button-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x114, PIN_INPUT_PULLUP | MUX_MODE3)	/* abe_dmic_din2.gpio_121 */

		>;

	};



	i2c2_pins: pinmux_i2c2_pins {

	i2c2_pins: i2c2-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x126, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c2_scl */

			OMAP4_IOPAD(0x128, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c2_sda */

		>;

	};



	i2c3_pins: pinmux_i2c3_pins {

	i2c3_pins: i2c3-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x12a, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c3_scl */

			OMAP4_IOPAD(0x12c, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c3_sda */

		>;

	};



	smsc_pins: pinmux_smsc_pins {

	smsc_pins: smsc-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x068, PIN_INPUT | MUX_MODE3)		/* gpmc_a20.gpio_44: IRQ */

			OMAP4_IOPAD(0x06a, PIN_INPUT_PULLUP | MUX_MODE3)	/* gpmc_a21.gpio_45: nReset */
@@ -96,7 +96,7 @@ OMAP4_IOPAD(0x070, PIN_INPUT_PULLUP | MUX_MODE3) /* gpmc_a24.gpio_48: amdix enab 
		>;

	};



	dss_hdmi_pins: pinmux_dss_hdmi_pins {

	dss_hdmi_pins: dss-hdmi-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x098, PIN_INPUT | MUX_MODE3)		/* hdmi_hpd.gpio_63 */

			OMAP4_IOPAD(0x09a, PIN_INPUT | MUX_MODE0)		/* hdmi_cec.hdmi_cec */

arch/arm/boot/dts/omap4-duovero.dtsi

+9 −9
Original line number Diff line number Diff line
@@ -73,14 +73,14 @@ &twl6040_pins 
			&hsusbb1_pins

	>;



	twl6040_pins: pinmux_twl6040_pins {

	twl6040_pins: twl6040-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x166, PIN_OUTPUT | MUX_MODE3)		/* usbb2_ulpitll_nxt.gpio_160 */

			OMAP4_IOPAD(0x1a0, PIN_INPUT | MUX_MODE0)		/* sys_nirq2.sys_nirq2 */

		>;

	};



	mcbsp1_pins: pinmux_mcbsp1_pins {

	mcbsp1_pins: mcbsp1-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x0fe, PIN_INPUT | MUX_MODE0)		/* abe_mcbsp1_clkx.abe_mcbsp1_clkx */

			OMAP4_IOPAD(0x100, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* abe_mcbsp1_dr.abe_mcbsp1_dr */
@@ -89,7 +89,7 @@ OMAP4_IOPAD(0x104, PIN_INPUT | MUX_MODE0) /* abe_mcbsp1_fsx.abe_mcbsp1_fsx */ 
		>;

	};



	hsusbb1_pins: pinmux_hsusbb1_pins {

	hsusbb1_pins: hsusbb1-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x0c2, PIN_INPUT_PULLDOWN | MUX_MODE4)	/* usbb1_ulpitll_clk.usbb1_ulpiphy_clk */

			OMAP4_IOPAD(0x0c4, PIN_OUTPUT | MUX_MODE4)		/* usbb1_ulpitll_stp.usbb1_ulpiphy_stp */
@@ -106,34 +106,34 @@ OMAP4_IOPAD(0x0d8, PIN_INPUT_PULLDOWN | MUX_MODE4) /* usbb1_ulpitll_dat7.usbb1_u 
		>;

	};



	hsusb1phy_pins: pinmux_hsusb1phy_pins {

	hsusb1phy_pins: hsusb1phy-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x08c, PIN_OUTPUT | MUX_MODE3)		/* gpmc_wait1.gpio_62 */

		>;

	};



	w2cbw0015_pins: pinmux_w2cbw0015_pins {

	w2cbw0015_pins: w2cbw0015-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x066, PIN_OUTPUT | MUX_MODE3)		/* gpmc_a19.gpio_43 */

			OMAP4_IOPAD(0x07a, PIN_INPUT | MUX_MODE3)		/* gpmc_ncs3.gpio_53 */

		>;

	};



	i2c1_pins: pinmux_i2c1_pins {

	i2c1_pins: i2c1-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x122, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c1_scl */

			OMAP4_IOPAD(0x124, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c1_sda */

		>;

	};



	i2c4_pins: pinmux_i2c4_pins {

	i2c4_pins: i2c4-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x12e, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c4_scl */

			OMAP4_IOPAD(0x130, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c4_sda */

		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

	mmc1_pins: mmc1-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x0e2, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk */

			OMAP4_IOPAD(0x0e4, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmcc1_cmd */
@@ -144,7 +144,7 @@ OMAP4_IOPAD(0x0ec, PIN_INPUT_PULLUP | MUX_MODE0) /* sdmmc1_dat3 */ 
		>;

	};



	mmc5_pins: pinmux_mmc5_pins {

	mmc5_pins: mmc5-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x148, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc5_clk */

			OMAP4_IOPAD(0x14a, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmcc5_cmd */

arch/arm/boot/dts/omap4-kc1.dts

+7 −7
Original line number Diff line number Diff line
@@ -35,42 +35,42 @@ led-2 { 
&omap4_pmx_core {

	pinctrl-names = "default";



	uart3_pins: pinmux_uart3_pins {

	uart3_pins: uart3-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x144, PIN_INPUT | MUX_MODE0)		/* uart3_rx_irrx */

			OMAP4_IOPAD(0x146, PIN_OUTPUT | MUX_MODE0)		/* uart3_tx_irtx */

		>;

	};



	i2c1_pins: pinmux_i2c1_pins {

	i2c1_pins: i2c1-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x122, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c1_scl */

			OMAP4_IOPAD(0x124, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c1_sda */

		>;

	};



	i2c2_pins: pinmux_i2c2_pins {

	i2c2_pins: i2c2-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x126, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c2_scl */

			OMAP4_IOPAD(0x128, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c2_sda */

		>;

	};



	i2c3_pins: pinmux_i2c3_pins {

	i2c3_pins: i2c3-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x12a, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c3_scl */

			OMAP4_IOPAD(0x12c, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c3_sda */

		>;

	};



	i2c4_pins: pinmux_i2c4_pins {

	i2c4_pins: i2c4-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x12e, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c4_scl */

			OMAP4_IOPAD(0x130, PIN_INPUT_PULLUP | MUX_MODE0)	/* i2c4_sda */

		>;

	};



	mmc2_pins: pinmux_mmc2_pins {

	mmc2_pins: mmc2-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x040, PIN_INPUT_PULLUP | MUX_MODE1)	/* sdmmc2_dat0 */

			OMAP4_IOPAD(0x042, PIN_INPUT_PULLUP | MUX_MODE1)	/* sdmmc2_dat1 */
@@ -85,7 +85,7 @@ OMAP4_IOPAD(0x084, PIN_INPUT_PULLUP | MUX_MODE1) /* sdmmc2_cmd */ 
		>;

	};



	usb_otg_hs_pins: pinmux_usb_otg_hs_pins {

	usb_otg_hs_pins: usb-otg-hs-pins {

		pinctrl-single,pins = <

			OMAP4_IOPAD(0x194, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* usba0_otg_ce */

			OMAP4_IOPAD(0x196, PIN_INPUT | MUX_MODE0)		/* usba0_otg_dp */

arch/arm/boot/dts/omap4-mcpdm.dtsi

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



&omap4_pmx_core {

	mcpdm_pins: pinmux_mcpdm_pins {

	mcpdm_pins: mcpdm-pins {

		pinctrl-single,pins = <

		/* 0x4a100106 abe_pdm_ul_data.abe_pdm_ul_data ag25 */

		OMAP4_IOPAD(0x106, PIN_INPUT_PULLDOWN | MUX_MODE0)