Commit 1cb3375b authored by Linus Walleij's avatar Linus Walleij Committed by Olof Johansson
Browse files

ARM: nomadik: selectively enable UART0 on boards 



The S8815 board is using RX/TX on UART0, and the NHK8815 is
using RX/TX and CTS/RTS (the latter connected to a Bluetooth
chip). Activate the right groups with the u0 UART0 function
on each board and undisable it. Get rid of the old erroneous
default definition from the SoC file.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 4cec8cd7

arch/arm/boot/dts/ste-nomadik-nhk15.dts

+16 −0
Original line number Diff line number Diff line
@@ -17,12 +17,22 @@ 
	};



	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

		stmpe-i2c0 = &stmpe0;

		stmpe-i2c1 = &stmpe1;

	};



	pinctrl {

		uart0 {

			uart0_nhk_mode: uart0_mux {

				u0_default_mux {

					function = "u0";

					groups = "u0txrx_a_1", "u0ctsrts_a_1";

				};

			};

		};



		stmpe2401_1 {

			stmpe2401_1_nhk_mode: stmpe2401_1_nhk {

				nhk_cfg1 {
@@ -146,6 +156,12 @@ 
	};



	amba {

		/* Activate RX/TX and CTS/RTS on UART 0 */

		uart0: uart@101fd000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_nhk_mode>;

			status = "okay";

		};

		mmcsd: sdi@101f6000 {

			cd-gpios = <&stmpe_gpio44 7 GPIO_ACTIVE_LOW>;

			wp-gpios = <&stmpe_gpio44 18 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/ste-nomadik-s8815.dts

+17 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
	};



	aliases {

		serial0 = &uart0;

		serial1 = &uart1;

	};
@@ -40,6 +41,15 @@ 
		pinctrl-names = "default";

		pinctrl-0 = <&cd_default_mode>;



		uart0 {

			/* Only use RX/TX pins */

			uart0_s8815_mode: uart0_mux {

				u0_default_mux {

					function = "u0";

					groups = "u0txrx_a_1";

				};

			};

		};

		mmcsd-cd {

			cd_default_mode: cd_default {

				cd_default_cfg1 {
@@ -112,8 +122,14 @@ 
	};





	/* Configure card detect for the uSD slot */

	amba {

		/* Activate RXTX on UART 0 */

		uart0: uart@101fd000 {

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_s8815_mode>;

			status = "okay";

		};

		/* Configure card detect for the uSD slot */

		mmcsd: sdi@101f6000 {

			cd-gpios = <&gpio3 15 GPIO_ACTIVE_LOW>;

		};

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

+0 −10
Original line number Diff line number Diff line
@@ -97,14 +97,6 @@ 
	pinctrl {

		compatible = "stericsson,stn8815-pinctrl";

		/* Pin configurations */

		uart0 {

			uart0_default_mux: uart0_mux {

				u0_default_mux {

					function = "u0";

					groups = "u0_a_1";

				};

			};

		};

		uart1 {

			uart1_default_mux: uart1_mux {

				u1_default_mux {
@@ -755,8 +747,6 @@ 
			interrupts = <12>;

			clocks = <&uart0clk>, <&pclkuart0>;

			clock-names = "uartclk", "apb_pclk";

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_default_mux>;

			status = "disabled";

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE