Skip to contentSkip to conversation

ARM: nomadik: disable UART0 on Nomadik boards

PATCH New Linus Walleij 2 participants 2 messages Jul 25, 2015 – Jul 26, 2015 Device tree bindings

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
ARM SoC folks: please apply this directly to fixes if you're OK with it.

---
 arch/arm/boot/dts/ste-nomadik-nhk15.dts    | 1 +
 arch/arm/boot/dts/ste-nomadik-s8815.dts    | 4 ++++
 arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 1 +
 3 files changed, 6 insertions(+)
arch/arm/boot/dts/ste-nomadik-nhk15.dts +1 -0
index 3d0b8755caee..3d25dba143a5 100644
@@ -17,6 +17,7 @@
 	};
 
 	aliases {
+		serial1 = &uart1;
 		stmpe-i2c0 = &stmpe0;
 		stmpe-i2c1 = &stmpe1;
 	};
arch/arm/boot/dts/ste-nomadik-s8815.dts +4 -0
index 85d3b95dfdba..3c140d05f796 100644
@@ -15,6 +15,10 @@
 		bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
 	};
 
+	aliases {
+		serial1 = &uart1;
+	};
+
 	src at 101e0000 {
 		/* These chrystal drivers are not used on this board */
 		disable-sxtalo;
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +1 -0
index 6846e3eb027d..8e601d02ca8c 100644
@@ -763,6 +763,7 @@
 			clock-names = "uartclk", "apb_pclk";
 			pinctrl-names = "default";
 			pinctrl-0 = <&uart0_default_mux>;
+			status = "disabled";
 		};
 
 		uart1: uart at 101fb000 {
Signature · 1 line
2.4.3
#1 lore raw

PATCH 1/1 ARM: nomadik: disable UART0 on Nomadik boards

Quoted 8 lines · Linus Walleij

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.

---
ARM SoC folks: please apply this directly to fixes if you're OK with it.

Applied, thanks!

-Olof