Commit 46bab63e authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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



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 4ffec92e

arch/arm/boot/dts/am3517-craneboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ &mmc3 { 
#include "tps65910.dtsi"



&omap3_pmx_core {

	tps_pins: pinmux_tps_pins {

	tps_pins: tps-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21e0, PIN_INPUT_PULLUP | MUX_MODE0) /* sys_nirq.sys_nirq */

		>;

arch/arm/boot/dts/am3517-evm-ui.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ &mcbsp2 { 
};



&omap3_pmx_core {

	mcbsp1_pins: pinmux_mcbsp1_pins {

	mcbsp1_pins: mcbsp1-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2190, PIN_OUTPUT | MUX_MODE0)	/* mcbsp1_dx.mcbsp1_dx */

			OMAP3_CORE1_IOPAD(0x2192, PIN_INPUT | MUX_MODE0)	/* mcbsp1_dx.mcbsp1_dr */
@@ -206,7 +206,7 @@ OMAP3_CORE1_IOPAD(0x2198, PIN_INPUT | MUX_MODE0) /* mcbsp1_clkx.mcbsp1_clkx */ 
		>;

	};



	mcbsp2_pins: pinmux_mcbsp2_pins {

	mcbsp2_pins: mcbsp2-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x213c, PIN_INPUT | MUX_MODE0)	/* mcbsp2_fsx.mcbsp2_fsx */

			OMAP3_CORE1_IOPAD(0x213e, PIN_INPUT | MUX_MODE0)	/* mcbsp2_clkx.mcbsp2_clkx */

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

+10 −10
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ &usbhsehci { 


&omap3_pmx_core {



	ethernet_pins: pinmux_ethernet_pins {

	ethernet_pins: ethernet-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21fe, PIN_INPUT | MUX_MODE0) /* rmii_mdio_data */

			OMAP3_CORE1_IOPAD(0x2200, MUX_MODE0) /* rmii_mdio_clk */
@@ -257,28 +257,28 @@ OMAP3_CORE1_IOPAD(0x2210, PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii_50mhz_clk */ 
		>;

	};



	i2c2_pins: pinmux_i2c2_pins {

	i2c2_pins: i2c2-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21be, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c2_scl */

			OMAP3_CORE1_IOPAD(0x21c0, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c2_sda */

		>;

	};



	i2c3_pins: pinmux_i2c3_pins {

	i2c3_pins: i2c3-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21c2, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c3_scl */

			OMAP3_CORE1_IOPAD(0x21c4, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c3_sda */

		>;

	};



	leds_pins: pinmux_leds_pins {

	leds_pins: leds-pins {

		pinctrl-single,pins = <

			OMAP3_WKUP_IOPAD(0x2a24, PIN_OUTPUT_PULLUP | MUX_MODE4)	/* jtag_emu0.gpio_11 */

			OMAP3_WKUP_IOPAD(0x2a26, PIN_OUTPUT_PULLUP | MUX_MODE4)	/* jtag_emu1.gpio_31 */

		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

	mmc1_pins: mmc1-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2144, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk.sdmmc1_clk */

			OMAP3_CORE1_IOPAD(0x2146, PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_cmd.sdmmc1_cmd */
@@ -291,19 +291,19 @@ OMAP3_CORE1_IOPAD(0x2152, PIN_INPUT_PULLUP | MUX_MODE4) /* sdmmc1_dat5.gpio_127 
		>;

	};



	pwm_pins: pinmux_pwm_pins {

	pwm_pins: pwm-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21dc, PIN_OUTPUT | MUX_MODE1)       /* mcspi2_cs0.gpt11_pwm */

		>;

	};



	backlight_pins: pinmux_backlight_pins {

	backlight_pins: backlight-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21de, PIN_OUTPUT | MUX_MODE4)       /* mcspi2_cs1.gpio_182 */

		>;

	};



	dss_dpi_pins: pinmux_dss_dpi_pins {

	dss_dpi_pins: dss-dpi-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21d2, PIN_OUTPUT | MUX_MODE4)       /* mcspi1_cs2.gpio_176 */

			OMAP3_CORE1_IOPAD(0x20d4, PIN_OUTPUT | MUX_MODE0)       /* dss_pclk.dss_pclk */
@@ -329,7 +329,7 @@ OMAP3_CORE1_IOPAD(0x20fa, PIN_OUTPUT | MUX_MODE0) /* dss_data15.dss_data15 
		>;

	};



	hsusb1_rst_pins: pinmux_hsusb1_rst_pins {

	hsusb1_rst_pins: hsusb1-rst-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x20ba, PIN_OUTPUT | MUX_MODE4)	/* gpmc_ncs6.gpio_57 */

		>;
@@ -338,7 +338,7 @@ OMAP3_CORE1_IOPAD(0x20ba, PIN_OUTPUT | MUX_MODE4) /* gpmc_ncs6.gpio_57 */ 


&omap3_pmx_core2 {



	hsusb1_pins: pinmux_hsusb1_pins {

	hsusb1_pins: hsusb1-pins {

		pinctrl-single,pins = <

			OMAP3430_CORE2_IOPAD(0x25d8, PIN_OUTPUT | MUX_MODE3)	/* etk_clk.hsusb1_stp */

			OMAP3430_CORE2_IOPAD(0x25da, PIN_OUTPUT | MUX_MODE3)	/* etk_ctl.hsusb1_clk */

arch/arm/boot/dts/am3517-som.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -181,20 +181,20 @@ bluetooth { 


&omap3_pmx_core {



	i2c1_pins: pinmux_i2c1_pins {

	i2c1_pins: i2c1-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c1_scl */

			OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT_PULLUP | MUX_MODE0)  /* i2c1_sda */

		>;

	};



	wl12xx_buffer_pins: pinmux_wl12xx_buffer_pins {

	wl12xx_buffer_pins: wl12xx-buffer-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2156, PIN_OUTPUT | MUX_MODE4)  /* mmc1_dat7.gpio_129 */

		>;

	};



	mmc2_pins: pinmux_mmc2_pins {

	mmc2_pins: mmc2-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2158, PIN_INPUT_PULLUP | MUX_MODE0)  /* mmc2_clk.mmc2_clk */

			OMAP3_CORE1_IOPAD(0x215a, PIN_INPUT_PULLUP | MUX_MODE0)  /* mmc2_cmd.mmc2_cmd */
@@ -210,19 +210,19 @@ OMAP3_CORE1_IOPAD(0x21c6, PIN_INPUT_PULLUP | MUX_MODE4) /* hdq_sio.gpio_170 */ 
		>;

	};



	rtc_pins: pinmux_rtc_pins {

	rtc_pins: rtc-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x20b6, PIN_INPUT_PULLUP | MUX_MODE4) /* gpmc_ncs4.gpio_55 */

		>;

	};



	tsc2004_pins: pinmux_tsc2004_pins {

	tsc2004_pins: tsc2004-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x20d2, PIN_INPUT | MUX_MODE4) /* gpmc_wait3.gpio_65 */

		>;

	};



	uart2_pins: pinmux_uart2_pins {

	uart2_pins: uart2-pins {

		pinctrl-single,pins = <

			OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT_PULLUP | MUX_MODE0)		/* uart2_cts */

			OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT_PULLUP | MUX_MODE0)	/* uart2_rts */
@@ -235,7 +235,7 @@ OMAP3_CORE1_IOPAD(0x20b8, PIN_INPUT | MUX_MODE0) /* gpio_56 */ 


&omap3_pmx_wkup {



	wl12xx_wkup_pins: pinmux_wl12xx_wkup_pins {

	wl12xx_wkup_pins: wl12xx-wkup-pins {

		pinctrl-single,pins = <

			OMAP3_WKUP_IOPAD(0x2a0c, PIN_OUTPUT | MUX_MODE4)	/* sys_boot1.gpio_3 */

		>;

arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ / { 
&omap3_pmx_core2 {

	pinctrl-names = "default";

	pinctrl-0 = <&hsusb2_2_pins>;

	hsusb2_2_pins: pinmux_hsusb2_2_pins {

	hsusb2_2_pins: hsusb2-2-pins {

		pinctrl-single,pins = <

			OMAP3430_CORE2_IOPAD(0x25f0, PIN_OUTPUT | MUX_MODE3)            /* etk_d10.hsusb2_clk */

			OMAP3430_CORE2_IOPAD(0x25f2, PIN_OUTPUT | MUX_MODE3)            /* etk_d11.hsusb2_stp */