浏览代码

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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Linus Walleij 10 年之前
父节点
当前提交
a153790a78

+ 1 - 0
arch/arm/boot/dts/ste-nomadik-nhk15.dts

@@ -17,6 +17,7 @@
 	};
 	};
 
 
 	aliases {
 	aliases {
+		serial1 = &uart1;
 		stmpe-i2c0 = &stmpe0;
 		stmpe-i2c0 = &stmpe0;
 		stmpe-i2c1 = &stmpe1;
 		stmpe-i2c1 = &stmpe1;
 	};
 	};

+ 4 - 0
arch/arm/boot/dts/ste-nomadik-s8815.dts

@@ -15,6 +15,10 @@
 		bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
 		bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
 	};
 	};
 
 
+	aliases {
+		serial1 = &uart1;
+	};
+
 	src@101e0000 {
 	src@101e0000 {
 		/* These chrystal drivers are not used on this board */
 		/* These chrystal drivers are not used on this board */
 		disable-sxtalo;
 		disable-sxtalo;

+ 1 - 0
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

@@ -757,6 +757,7 @@
 			clock-names = "uartclk", "apb_pclk";
 			clock-names = "uartclk", "apb_pclk";
 			pinctrl-names = "default";
 			pinctrl-names = "default";
 			pinctrl-0 = <&uart0_default_mux>;
 			pinctrl-0 = <&uart0_default_mux>;
+			status = "disabled";
 		};
 		};
 
 
 		uart1: uart@101fb000 {
 		uart1: uart@101fb000 {