diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2015-07-23 23:14:20 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-11 15:29:58 +0200 |
| commit | 1cb3375bb53719a2d90793b5bc47f99c21dc6b72 (patch) | |
| tree | 5767be93f28fecc478eba77a6fdd8270dab722b3 /arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | |
| parent | 4cec8cd790e3645d2e5ddf01cbe4ed2a90dcd94f (diff) | |
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: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/ste-nomadik-stn8815.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi index ef794a33b4dc..f68988ac800c 100644 --- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi @@ -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"; }; |