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

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

ARM: nomadik: disable UART0 on Nomadik boards 



The UART0 is not used on these boards, yet active and blocking
other use. Fix this by disabling UART0 and setting port aliases
to maintain port enumeration to userspace.

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

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

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



	aliases {

		serial1 = &uart1;

		stmpe-i2c0 = &stmpe0;

		stmpe-i2c1 = &stmpe1;

	};

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

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
		bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";

	};



	aliases {

		serial1 = &uart1;

	};



	src@101e0000 {

		/* These chrystal drivers are not used on this board */

		disable-sxtalo;

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

+1 −0
Original line number Diff line number Diff line
@@ -757,6 +757,7 @@ 
			clock-names = "uartclk", "apb_pclk";

			pinctrl-names = "default";

			pinctrl-0 = <&uart0_default_mux>;

			status = "disabled";

		};



		uart1: uart@101fb000 {