Commit 86f9abb6 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by Tony Lindgren

ARM: dts: omap3-igep00x0: Fix UART2 pins that aren't common.

UART2 is used to connect the processor with the bluetooth chip, these pins
are not common between IGEPv2 boards and IGEP COM MODULE boards. This patch
muxes the correct pins for every board and removes UART2 configuration from
common omap3-igep.dtsi file.
Signed-off-by: default avatarEnric Balletbo i Serra <eballetbo@iseebcn.com>
Acked-by: default avatarJavier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4f6dec70
...@@ -53,13 +53,6 @@ uart1_pins: pinmux_uart1_pins { ...@@ -53,13 +53,6 @@ uart1_pins: pinmux_uart1_pins {
>; >;
}; };
uart2_pins: pinmux_uart2_pins {
pinctrl-single,pins = <
0x14a (PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
0x148 (PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
>;
};
uart3_pins: pinmux_uart3_pins { uart3_pins: pinmux_uart3_pins {
pinctrl-single,pins = < pinctrl-single,pins = <
0x16e (PIN_INPUT | MUX_MODE0) /* uart3_rx.uart3_rx */ 0x16e (PIN_INPUT | MUX_MODE0) /* uart3_rx.uart3_rx */
...@@ -198,11 +191,6 @@ &uart1 { ...@@ -198,11 +191,6 @@ &uart1 {
pinctrl-0 = <&uart1_pins>; pinctrl-0 = <&uart1_pins>;
}; };
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
};
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins>; pinctrl-0 = <&uart3_pins>;
......
...@@ -149,6 +149,15 @@ dss_dpi_pins: pinmux_dss_dpi_pins { ...@@ -149,6 +149,15 @@ dss_dpi_pins: pinmux_dss_dpi_pins {
0x0da (PIN_OUTPUT | MUX_MODE0) /* dss_data23.dss_data23 */ 0x0da (PIN_OUTPUT | MUX_MODE0) /* dss_data23.dss_data23 */
>; >;
}; };
uart2_pins: pinmux_uart2_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT | MUX_MODE0) /* uart2_cts.uart2_cts */
OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0) /* uart2_rts .uart2_rts*/
OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0) /* uart2_tx.uart2_tx */
OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0) /* uart2_rx.uart2_rx */
>;
};
}; };
&omap3_pmx_core2 { &omap3_pmx_core2 {
...@@ -256,6 +265,11 @@ ethernet@gpmc { ...@@ -256,6 +265,11 @@ ethernet@gpmc {
}; };
}; };
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
};
&usbhshost { &usbhshost {
port1-mode = "ehci-phy"; port1-mode = "ehci-phy";
}; };
......
...@@ -46,6 +46,17 @@ user2 { ...@@ -46,6 +46,17 @@ user2 {
}; };
}; };
&omap3_pmx_core {
uart2_pins: pinmux_uart2_pins {
pinctrl-single,pins = <
OMAP3_CORE1_IOPAD(0x216c, PIN_INPUT | MUX_MODE1) /* mcbsp3_dx.uart2_cts */
OMAP3_CORE1_IOPAD(0x216e, PIN_OUTPUT | MUX_MODE1) /* mcbsp3_dr.uart2_rts */
OMAP3_CORE1_IOPAD(0x2170, PIN_OUTPUT | MUX_MODE1) /* mcbsp3_clk.uart2_tx */
OMAP3_CORE1_IOPAD(0x2172, PIN_INPUT | MUX_MODE1) /* mcbsp3_fsx.uart2_rx */
>;
};
};
&omap3_pmx_core2 { &omap3_pmx_core2 {
leds_pins: pinmux_leds_pins { leds_pins: pinmux_leds_pins {
pinctrl-single,pins = < pinctrl-single,pins = <
...@@ -104,3 +115,8 @@ partition@780000 { ...@@ -104,3 +115,8 @@ partition@780000 {
}; };
}; };
}; };
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins>;
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment