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-s8815.dts | |
| parent | ARM: nomadik: move hog code to use DT hogs (diff) | |
| download | linux-1cb3375bb53719a2d90793b5bc47f99c21dc6b72.tar.xz linux-1cb3375bb53719a2d90793b5bc47f99c21dc6b72.zip | |
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-s8815.dts')
| -rw-r--r-- | arch/arm/boot/dts/ste-nomadik-s8815.dts | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts index edcfe2413ee7..11b5e34150b8 100644 --- a/arch/arm/boot/dts/ste-nomadik-s8815.dts +++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts @@ -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>; }; |