Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcd3cca7 authored by Florian Vaussard's avatar Florian Vaussard Committed by Benoit Cousson
Browse files

ARM: dts: OMAP2+: Use pinctrl constants 



Using constants for pinctrl allows a better readability, and removes
redundancy with comments.

Signed-off-by: default avatarFlorian Vaussard <florian.vaussard@epfl.ch>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarBenoit Cousson <benoit.cousson@linaro.org>
parent 10a3472a

arch/arm/boot/dts/omap2.dtsi

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



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pinctrl/omap.h>



#include "skeleton.dtsi"

arch/arm/boot/dts/omap3-beagle.dts

+12 −12
Original line number Diff line number Diff line
@@ -81,18 +81,18 @@ 


	hsusbb2_pins: pinmux_hsusbb2_pins {

		pinctrl-single,pins = <

			0x5c0 0x3  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_clk OUTPUT */

			0x5c2 0x3  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_stp OUTPUT */

			0x5c4 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dir INPUT | PULLDOWN */

			0x5c6 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_nxt INPUT | PULLDOWN */

			0x5c8 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat0 INPUT | PULLDOWN */

			0x5cA 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat1 INPUT | PULLDOWN */

			0x1a4 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat2 INPUT | PULLDOWN */

			0x1a6 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat3 INPUT | PULLDOWN */

			0x1a8 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat4 INPUT | PULLDOWN */

			0x1aa 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat5 INPUT | PULLDOWN */

			0x1ac 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat6 INPUT | PULLDOWN */

			0x1ae 0x10b  /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat7 INPUT | PULLDOWN */

			0x5c0 (PIN_OUTPUT | MUX_MODE3)		/* usbb2_ulpitll_clk.usbb1_ulpiphy_clk */

			0x5c2 (PIN_OUTPUT | MUX_MODE3)		/* usbb2_ulpitll_clk.usbb1_ulpiphy_stp */

			0x5c4 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dir */

			0x5c6 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_nxt */

			0x5c8 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat0 */

			0x5cA (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat1 */

			0x1a4 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat2 */

			0x1a6 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat3 */

			0x1a8 (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat4 */

			0x1aa (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat5 */

			0x1ac (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat6 */

			0x1ae (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat7 */

		>;

	};

};

arch/arm/boot/dts/omap3-igep.dtsi

+17 −17
Original line number Diff line number Diff line
@@ -29,43 +29,43 @@ 
&omap3_pmx_core {

	uart1_pins: pinmux_uart1_pins {

		pinctrl-single,pins = <

			0x152 0x100	/* uart1_rx.uart1_rx INPUT | MODE0 */

			0x14c 0		/* uart1_tx.uart1_tx OUTPUT | MODE0 */

			0x152 (PIN_INPUT | MUX_MODE0)		/* uart1_rx.uart1_rx */

			0x14c (PIN_OUTPUT |MUX_MODE0)		/* uart1_tx.uart1_tx */

		>;

	};



	uart2_pins: pinmux_uart2_pins {

		pinctrl-single,pins = <

			0x14a 0x100	/* uart2_rx.uart2_rx INPUT | MODE0 */

			0x148 0		/* uart2_tx.uart2_tx OUTPUT | MODE0 */

			0x14a (PIN_INPUT | MUX_MODE0)		/* uart2_rx.uart2_rx */

			0x148 (PIN_OUTPUT | MUX_MODE0)		/* uart2_tx.uart2_tx */

		>;

	};



	uart3_pins: pinmux_uart3_pins {

		pinctrl-single,pins = <

			0x16e 0x100	/* uart3_rx.uart3_rx INPUT | MODE0 */

			0x170 0		/* uart3_tx.uart3_tx OUTPUT | MODE0 */

			0x16e (PIN_INPUT | MUX_MODE0)		/* uart3_rx.uart3_rx */

			0x170 (PIN_OUTPUT | MUX_MODE0)		/* uart3_tx.uart3_tx */

		>;

	};



	mmc1_pins: pinmux_mmc1_pins {

		pinctrl-single,pins = <

			0x114 0x0118    /* sdmmc1_clk.sdmmc1_clk INPUT PULLUP | MODE 0 */

			0x116 0x0118    /* sdmmc1_cmd.sdmmc1_cmd INPUT PULLUP | MODE 0 */

			0x118 0x0118 	/* sdmmc1_dat0.sdmmc1_dat0 INPUT PULLUP | MODE 0 */

			0x11a 0x0118	/* sdmmc1_dat1.sdmmc1_dat1 INPUT PULLUP | MODE 0 */

			0x11c 0x0118	/* sdmmc1_dat2.sdmmc1_dat2 INPUT PULLUP | MODE 0 */

			0x11e 0x0118	/* sdmmc1_dat3.sdmmc1_dat3 INPUT PULLUP | MODE 0 */

			0x120 0x0100	/* sdmmc1_dat4.sdmmc1_dat4 INPUT | MODE 0 */

			0x122 0x0100	/* sdmmc1_dat5.sdmmc1_dat5 INPUT | MODE 0 */

			0x124 0x0100	/* sdmmc1_dat6.sdmmc1_dat6 INPUT | MODE 0 */

			0x126 0x0100	/* sdmmc1_dat7.sdmmc1_dat7 INPUT | MODE 0 */

			0x114 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_clk.sdmmc1_clk */

			0x116 (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_cmd.sdmmc1_cmd */

			0x118 (PIN_INPUT_PULLUP | MUX_MODE0) 	/* sdmmc1_dat0.sdmmc1_dat0 */

			0x11a (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_dat1.sdmmc1_dat1 */

			0x11c (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_dat2.sdmmc1_dat2 */

			0x11e (PIN_INPUT_PULLUP | MUX_MODE0)	/* sdmmc1_dat3.sdmmc1_dat3 */

			0x120 (PIN_INPUT | MUX_MODE0)		/* sdmmc1_dat4.sdmmc1_dat4 */

			0x122 (PIN_INPUT | MUX_MODE0)		/* sdmmc1_dat5.sdmmc1_dat5 */

			0x124 (PIN_INPUT | MUX_MODE0)		/* sdmmc1_dat6.sdmmc1_dat6 */

			0x126 (PIN_INPUT | MUX_MODE0)		/* sdmmc1_dat7.sdmmc1_dat7 */

		>;

	};



	smsc911x_pins: pinmux_smsc911x_pins {

		pinctrl-single,pins = <

                        0x1a2 0x0104    /* mcspi1_cs2.gpio_176 INPUT | MODE4 */

			0x1a2 (PIN_INPUT | MUX_MODE4)		/* mcspi1_cs2.gpio_176 */

		>;

	};

};

arch/arm/boot/dts/omap3.dtsi

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



#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/pinctrl/omap.h>



#include "skeleton.dtsi"

arch/arm/boot/dts/omap4-panda-a4.dts

+3 −3
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
/* Pandaboard Rev A4+ have external pullups on SCL & SDA */

&dss_hdmi_pins {

	pinctrl-single,pins = <

		0x5a 0x118	/* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */

		0x5c 0x100	/* hdmi_scl.hdmi_scl INPUT | MODE 0 */

		0x5e 0x100	/* hdmi_sda.hdmi_sda INPUT | MODE 0 */

		0x5a (PIN_INPUT_PULLUP | MUX_MODE0)	/* hdmi_cec.hdmi_cec */

		0x5c (PIN_INPUT | MUX_MODE0)		/* hdmi_scl.hdmi_scl */

		0x5e (PIN_INPUT | MUX_MODE0)		/* hdmi_sda.hdmi_sda */

		>;

};