| Message ID | 1453495247-5883-4-git-send-email-inindev@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
>>Also note that target/linux/ramips/dts/WT1520.dtsi is for the "Nexx WT1520" and should be named "WT1520.dts" instead. I will send that change through as a different patch. I went to fix WT1520.dtsi and see there are 9 boards not using the .dts naming convention. Felix / JohnCr, should I rename them or leave them alone? ec2-user@ip-192-168-74-100 ~/owrt-trunk/target/linux/ramips/dts $ ll *.dtsi -rw-rw-r-- 1 ec2-user ec2-user 244 Jan 18 08:26 AWM002-4M.dtsi -rw-rw-r-- 1 ec2-user ec2-user 244 Jan 18 08:26 AWM002-8M.dtsi -rw-rw-r-- 1 ec2-user ec2-user 1159 Jan 18 08:26 AWM002.dtsi -rw-rw-r-- 1 ec2-user ec2-user 2186 Jan 18 08:26 HC5XXX.dtsi -rw-rw-r-- 1 ec2-user ec2-user 9342 Jan 18 08:26 mt7620a.dtsi -rw-rw-r-- 1 ec2-user ec2-user 5997 Jan 18 08:26 mt7620n.dtsi -rw-rw-r-- 1 ec2-user ec2-user 6371 Jan 18 08:26 mt7621.dtsi -rw-rw-r-- 1 ec2-user ec2-user 7542 Jan 18 08:26 mt7628an.dtsi -rw-rw-r-- 1 ec2-user ec2-user 829 Jan 18 08:26 PX-4885.dtsi -rw-rw-r-- 1 ec2-user ec2-user 3240 Jan 18 08:26 rt2880.dtsi -rw-rw-r-- 1 ec2-user ec2-user 4733 Jan 18 08:26 rt3050.dtsi -rw-rw-r-- 1 ec2-user ec2-user 5269 Jan 18 08:26 rt3352.dtsi -rw-rw-r-- 1 ec2-user ec2-user 7375 Jan 18 08:26 rt3883.dtsi -rw-rw-r-- 1 ec2-user ec2-user 5868 Jan 22 19:37 rt5350.dtsi -rw-rw-r-- 1 ec2-user ec2-user 3364 Jan 18 08:26 VOCORE.dtsi -rw-rw-r-- 1 ec2-user ec2-user 1385 Jan 18 08:26 WRTNODE2.dtsi -rw-rw-r-- 1 ec2-user ec2-user 671 Jan 22 19:40 WT1520.dtsi -rw-rw-r-- 1 ec2-user ec2-user 1644 Jan 18 08:26 Y1.dtsi --John On 1/22/16 3:40 PM, John Clark wrote: > The top half of UARTF on the HLK-RM04 is used for GPIO. > > mode 1 mode 2 > RIN GPIO14 > DSR_N GPIO13 > DCD_N GPIO12 > DTR_N GPIO11 > RXD GPIO10 > CTS_N GPIO09 > TXD GPIO08 > RTS_N GPIO07 > > This patch applys 3'b101 mode to UARTF: > > GPIO14 > GPIO13 > GPIO12 > GPIO11 > RXD > CTS_N > TXD > RTS_N > > Because the base rt5350.dtsi file forces 3'b000 mode, remove the pin setting from this file and apply it directly to the files that inherit from it (WIZFI630A.dts and WT1520.dtsi). This change makes the rt5350.dtsi file consistent with the mt7620a.dtsi file. > > Signed-off-by: John Clark <inindev@gmail.com> > --- > Also note that target/linux/ramips/dts/WT1520.dtsi is for the "Nexx WT1520" and should be named "WT1520.dts" instead. I will send that change through as a different patch. > > target/linux/ramips/dts/HLKRM04.dts | 5 +++++ > target/linux/ramips/dts/WIZFI630A.dts | 2 ++ > target/linux/ramips/dts/WT1520.dtsi | 2 ++ > target/linux/ramips/dts/rt5350.dtsi | 3 --- > 4 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/target/linux/ramips/dts/HLKRM04.dts b/target/linux/ramips/dts/HLKRM04.dts > index 713b51f..3c9a93c 100644 > --- a/target/linux/ramips/dts/HLKRM04.dts > +++ b/target/linux/ramips/dts/HLKRM04.dts > @@ -63,6 +63,11 @@ > ralink,group = "i2c", "jtag"; > ralink,function = "gpio"; > }; > + > + uartf_gpio { > + ralink,group = "uartf"; > + ralink,function = "gpio uartf"; > + }; > }; > }; > > diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts > index 39d68c3..e2a51ec 100644 > --- a/target/linux/ramips/dts/WIZFI630A.dts > +++ b/target/linux/ramips/dts/WIZFI630A.dts > @@ -59,6 +59,8 @@ > interrupt-parent = <&intc>; > interrupts = <5>; > reg-shift = <2>; > + pinctrl-names = "default"; > + pinctrl-0 = <&uartf_pins>; > status = "okay"; > }; > > diff --git a/target/linux/ramips/dts/WT1520.dtsi b/target/linux/ramips/dts/WT1520.dtsi > index b8c4e0a..13ff268 100644 > --- a/target/linux/ramips/dts/WT1520.dtsi > +++ b/target/linux/ramips/dts/WT1520.dtsi > @@ -15,6 +15,8 @@ > > palmbus@10000000 { > uart@500 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uartf_pins>; > status = "okay"; > }; > }; > diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi > index 27f7bf6..b8712e9 100644 > --- a/target/linux/ramips/dts/rt5350.dtsi > +++ b/target/linux/ramips/dts/rt5350.dtsi > @@ -94,9 +94,6 @@ > > reg-shift = <2>; > > - pinctrl-names = "default"; > - pinctrl-0 = <&uartf_pins>; > - > status = "disabled"; > }; >
Hello John, 2016-01-22 21:56 GMT+01:00 John Clark <inindev@gmail.com>: >>>Also note that target/linux/ramips/dts/WT1520.dtsi is for the "Nexx >>> WT1520" and should be named "WT1520.dts" instead. I will send that change >>> through as a different patch. The dtsi file contains common definitions for WT1520. We also have there two separate dts files, for models with different size of FLASH - 4 and 8 MB, with different "firmware" mtd partition size. [snip] Cheers, Piotr
diff --git a/target/linux/ramips/dts/HLKRM04.dts b/target/linux/ramips/dts/HLKRM04.dts index 713b51f..3c9a93c 100644 --- a/target/linux/ramips/dts/HLKRM04.dts +++ b/target/linux/ramips/dts/HLKRM04.dts @@ -63,6 +63,11 @@ ralink,group = "i2c", "jtag"; ralink,function = "gpio"; }; + + uartf_gpio { + ralink,group = "uartf"; + ralink,function = "gpio uartf"; + }; }; }; diff --git a/target/linux/ramips/dts/WIZFI630A.dts b/target/linux/ramips/dts/WIZFI630A.dts index 39d68c3..e2a51ec 100644 --- a/target/linux/ramips/dts/WIZFI630A.dts +++ b/target/linux/ramips/dts/WIZFI630A.dts @@ -59,6 +59,8 @@ interrupt-parent = <&intc>; interrupts = <5>; reg-shift = <2>; + pinctrl-names = "default"; + pinctrl-0 = <&uartf_pins>; status = "okay"; }; diff --git a/target/linux/ramips/dts/WT1520.dtsi b/target/linux/ramips/dts/WT1520.dtsi index b8c4e0a..13ff268 100644 --- a/target/linux/ramips/dts/WT1520.dtsi +++ b/target/linux/ramips/dts/WT1520.dtsi @@ -15,6 +15,8 @@ palmbus@10000000 { uart@500 { + pinctrl-names = "default"; + pinctrl-0 = <&uartf_pins>; status = "okay"; }; }; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 27f7bf6..b8712e9 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -94,9 +94,6 @@ reg-shift = <2>; - pinctrl-names = "default"; - pinctrl-0 = <&uartf_pins>; - status = "disabled"; };
The top half of UARTF on the HLK-RM04 is used for GPIO. mode 1 mode 2 RIN GPIO14 DSR_N GPIO13 DCD_N GPIO12 DTR_N GPIO11 RXD GPIO10 CTS_N GPIO09 TXD GPIO08 RTS_N GPIO07 This patch applys 3'b101 mode to UARTF: GPIO14 GPIO13 GPIO12 GPIO11 RXD CTS_N TXD RTS_N Because the base rt5350.dtsi file forces 3'b000 mode, remove the pin setting from this file and apply it directly to the files that inherit from it (WIZFI630A.dts and WT1520.dtsi). This change makes the rt5350.dtsi file consistent with the mt7620a.dtsi file. Signed-off-by: John Clark <inindev@gmail.com> --- Also note that target/linux/ramips/dts/WT1520.dtsi is for the "Nexx WT1520" and should be named "WT1520.dts" instead. I will send that change through as a different patch. target/linux/ramips/dts/HLKRM04.dts | 5 +++++ target/linux/ramips/dts/WIZFI630A.dts | 2 ++ target/linux/ramips/dts/WT1520.dtsi | 2 ++ target/linux/ramips/dts/rt5350.dtsi | 3 --- 4 files changed, 9 insertions(+), 3 deletions(-)