UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: kirkwood: set default pinctrl for UART0/1 

Most boards use the default UART0/1 pinctrl setting without RTS/CTS.
Add the pinctrl setting to the toplevel SoC UART nodes and put a note
in front of the corresponding pinctrl node to overwrite the setting
on board level. Currently, both boards using a different UART pinctrl
setting (Openblocks A6, A7) already overwrite the pinctrl node.

While at it, also fix up some status = "ok" to "okay" and again
whitespace issues on mplcec4 uart nodes.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/1398862602-29595-10-git-send-email-sebastian.hesselbarth@gmail.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
This commit is contained in:
Sebastian Hesselbarth 2014-04-30 14:56:36 +02:00 committed by Jason Cooper
parent 9dd85ad219
commit 9f2339a697
17 changed files with 18 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/kirkwood-b3.dts
View File

@ -114,8 +114,6 @@
* UART0_TX = Testpoint 66
* See the Excito Wiki for more details.
*/
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-cloudbox.dts
View File

@ -26,8 +26,6 @@
};
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};

4
arch/arm/boot/dts/kirkwood-db.dtsi
View File

@ -34,9 +34,7 @@
};
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "ok";
status = "okay";
};
sata@80000 {

2
arch/arm/boot/dts/kirkwood-dns320.dts
View File

@ -52,8 +52,6 @@
};
serial@12100 {
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
status = "okay";
};
};

2
arch/arm/boot/dts/kirkwood-laplug.dts
View File

@ -38,8 +38,6 @@
ocp@f1000000 {
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};

8
arch/arm/boot/dts/kirkwood-mplcec4.dts
View File

@ -90,11 +90,9 @@
};
serial@12000 {
status = "ok";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
};
serial@12000 {
status = "okay";
};
rtc@10300 {
status = "disabled";

4
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View File

@ -65,9 +65,7 @@
};
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "ok";
status = "okay";
};
ehci@50000 {

2
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
View File

@ -113,8 +113,6 @@
};
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
View File

@ -120,8 +120,6 @@
};
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};

2
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
View File

@ -20,8 +20,6 @@
};
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};

8
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View File

@ -19,15 +19,11 @@
ocp@f1000000 {
serial@12000 {
status = "ok";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};
serial@12100 {
status = "ok";
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
status = "okay";
};
sata@80000 {

8
arch/arm/boot/dts/kirkwood-openblocks_a7.dts
View File

@ -31,15 +31,11 @@
ocp@f1000000 {
serial@12000 {
status = "ok";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};
serial@12100 {
status = "ok";
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
status = "okay";
};
sata@80000 {

2
arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
View File

@ -45,8 +45,6 @@
};
};
serial@12000 {
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};
};

4
arch/arm/boot/dts/kirkwood-synology.dtsi
View File

@ -277,14 +277,10 @@
serial@12000 {
status = "okay";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
};
serial@12100 {
status = "okay";
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
};
poweroff@12100 {

4
arch/arm/boot/dts/kirkwood-topkick.dts
View File

@ -86,9 +86,7 @@
};
serial@12000 {
status = "ok";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "okay";
};
sata@80000 {

4
arch/arm/boot/dts/kirkwood-ts219.dtsi
View File

@ -36,13 +36,9 @@
};
serial@12000 {
status = "okay";
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
};
serial@12100 {
status = "okay";
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
};
poweroff@12100 {
compatible = "qnap,power-off";

8
arch/arm/boot/dts/kirkwood.dtsi
View File

@ -98,6 +98,10 @@
marvell,function = "twsi0";
};
/*
* Default UART pinctrl setting without RTS/CTS,
* overwrite marvell,pins on board level if required.
*/
pmx_uart0: pmx-uart0 {
marvell,pins = "mpp10", "mpp11";
marvell,function = "uart0";
@ -167,6 +171,8 @@
reg-shift = <2>;
interrupts = <33>;
clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_uart0>;
pinctrl-names = "default";
status = "disabled";
};
@ -176,6 +182,8 @@
reg-shift = <2>;
interrupts = <34>;
clocks = <&gate_clk 7>;
pinctrl-0 = <&pmx_uart1>;
pinctrl-names = "default";
status = "disabled";
};