[OpenWrt-Devel,2/3] RT5350F-OLINUXINO(-EVB) dts: enable ttyS1

Submitted by Zoltan Gyarmati on Jan. 31, 2017, 3:53 p.m.

Details

Message ID 1485878029-14812-3-git-send-email-mr.zoltan.gyarmati@gmail.com
State New
Headers show

Commit Message

Zoltan Gyarmati Jan. 31, 2017, 3:53 p.m.
The RT5350F's second UART port is available on the base module and on
the EVB as well, so enable it in the dts.

Signed-off-by: Zoltan Gyarmati <mr.zoltan.gyarmati@gmail.com>
---
 target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts | 11 ++++++++-
 target/linux/ramips/dts/RT5350F-OLINUXINO.dts     | 10 +++++++-
 target/linux/ramips/dts/rt5350.dtsi               | 29 ++++++++++++-----------
 3 files changed, 34 insertions(+), 16 deletions(-)

Patch hide | download patch | download mbox

diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts b/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts
index bda918b..bab08c8 100644
--- a/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts
+++ b/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts
@@ -29,6 +29,11 @@ 
 	};
 };
 
+
+&uart {
+	status = "okay";
+};
+
 &spi0 {
 	status = "okay";
 
@@ -72,9 +77,13 @@ 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
-			ralink,group = "jtag", "rgmii", "mdio", "uartf";
+			ralink,group = "jtag", "rgmii", "mdio";
 			ralink,function = "gpio";
 		};
+		uartf_gpio {
+			ralink,group = "uartf";
+			ralink,function = "uartf";
+		};
 	};
 };
 
diff --git a/target/linux/ramips/dts/RT5350F-OLINUXINO.dts b/target/linux/ramips/dts/RT5350F-OLINUXINO.dts
index 0d28e10..78871e4 100644
--- a/target/linux/ramips/dts/RT5350F-OLINUXINO.dts
+++ b/target/linux/ramips/dts/RT5350F-OLINUXINO.dts
@@ -7,6 +7,10 @@ 
 	model = "Olimex RT5350F-OLinuXino";
 };
 
+&uart {
+	status = "okay";
+};
+
 &spi0 {
 	status = "okay";
 
@@ -50,9 +54,13 @@ 
 &pinctrl {
 	state_default: pinctrl0 {
 		gpio {
-			ralink,group = "jtag", "rgmii", "mdio", "uartf";
+			ralink,group = "jtag", "rgmii", "mdio";
 			ralink,function = "gpio";
 		};
+		uartf_gpio {
+			ralink,group = "uartf";
+			ralink,function = "uartf";
+		};
 	};
 };
 
diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi
index 99959bf..a07f1f6 100644
--- a/target/linux/ramips/dts/rt5350.dtsi
+++ b/target/linux/ramips/dts/rt5350.dtsi
@@ -83,20 +83,6 @@ 
 			interrupts = <3>;
 		};
 
-		uart: uart@500 {
-			compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a";
-			reg = <0x500 0x100>;
-
-			resets = <&rstctrl 12>;
-			reset-names = "uart";
-
-			interrupt-parent = <&intc>;
-			interrupts = <5>;
-
-			reg-shift = <2>;
-
-			status = "disabled";
-		};
 
 		gpio0: gpio@600 {
 			compatible = "ralink,rt5350-gpio", "ralink,rt2880-gpio";
@@ -221,6 +207,21 @@ 
 			reg-shift = <2>;
 		};
 
+        uart: uart@500 {
+			compatible = "ralink,rt5350-uart", "ralink,rt2880-uart", "ns16550a";
+			reg = <0x500 0x100>;
+
+			resets = <&rstctrl 12>;
+			reset-names = "uart";
+
+			interrupt-parent = <&intc>;
+			interrupts = <5>;
+
+			reg-shift = <2>;
+
+			status = "disabled";
+		};
+
 		systick: systick@d00 {
 			compatible = "ralink,rt5350-systick", "ralink,cevt-systick";
 			reg = <0xd00 0x10>;