فهرست منبع

ARM: dts: OMAP3: beagle/overo: mux console UART, enable wakeup

Ensure the console uart (UART3) on these boards is mux'd correctly, and
IO ring wakeup is enabled.

This is needed for serial console wakeups when using DT boot.

Thanks to Florian Vaussard for suggestion to use preprocessor
features.

Cc: Florian Vaussard <florian.vaussard@epfl.ch>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Benoit Cousson <benoit.cousson@linaro.org>
Kevin Hilman 12 سال پیش
والد
کامیت
b859c1ef92
3فایلهای تغییر یافته به همراه40 افزوده شده و 0 حذف شده
  1. 14 0
      arch/arm/boot/dts/omap3-beagle-xm.dts
  2. 12 0
      arch/arm/boot/dts/omap3-beagle.dts
  3. 14 0
      arch/arm/boot/dts/omap3-overo.dtsi

+ 14 - 0
arch/arm/boot/dts/omap3-beagle-xm.dts

@@ -126,3 +126,17 @@
 	mode = <3>;
 	mode = <3>;
 	power = <50>;
 	power = <50>;
 };
 };
+
+&omap3_pmx_core {
+	uart3_pins: pinmux_uart3_pins {
+		pinctrl-single,pins = <
+			0x16e (PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
+			0x170 (PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx OUTPUT | MODE0 */
+		>;
+	};
+};
+
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3_pins>;
+};

+ 12 - 0
arch/arm/boot/dts/omap3-beagle.dts

@@ -95,6 +95,13 @@
 			0x1ae (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat7 */
 			0x1ae (PIN_INPUT_PULLDOWN | MUX_MODE3)	/* usbb2_ulpitll_clk.usbb1_ulpiphy_dat7 */
 		>;
 		>;
 	};
 	};
+
+	uart3_pins: pinmux_uart3_pins {
+		pinctrl-single,pins = <
+			0x16e (PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
+			0x170 (PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */
+		>;
+	};
 };
 };
 
 
 &i2c1 {
 &i2c1 {
@@ -142,3 +149,8 @@
 	 */
 	 */
 	ti,pulldowns = <0x03a1c4>;
 	ti,pulldowns = <0x03a1c4>;
 };
 };
+
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3_pins>;
+};

+ 14 - 0
arch/arm/boot/dts/omap3-overo.dtsi

@@ -77,3 +77,17 @@
 	mode = <3>;
 	mode = <3>;
 	power = <50>;
 	power = <50>;
 };
 };
+
+&omap3_pmx_core {
+	uart3_pins: pinmux_uart3_pins {
+		pinctrl-single,pins = <
+			0x16e (PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */
+			0x170 (PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */
+		>;
+	};
+};
+
+&uart3 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3_pins>;
+};