Author: blogic
Date: 2016-02-08 09:26:27 +0100 (Mon, 08 Feb 2016)
New Revision: 48665

Modified:
   trunk/target/linux/ramips/dts/HLKRM04.dts
   trunk/target/linux/ramips/dts/WIZFI630A.dts
   trunk/target/linux/ramips/dts/WT1520.dtsi
   trunk/target/linux/ramips/dts/rt5350.dtsi
Log:
ramips: HLK-RM04 - Enable GPIO14 for WPS button

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 applies 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 <[email protected]>

Modified: trunk/target/linux/ramips/dts/HLKRM04.dts
===================================================================
--- trunk/target/linux/ramips/dts/HLKRM04.dts   2016-02-08 08:26:19 UTC (rev 
48664)
+++ trunk/target/linux/ramips/dts/HLKRM04.dts   2016-02-08 08:26:27 UTC (rev 
48665)
@@ -63,6 +63,11 @@
                                ralink,group = "i2c", "jtag";
                                ralink,function = "gpio";
                        };
+
+                       uartf_gpio {
+                               ralink,group = "uartf";
+                               ralink,function = "gpio uartf";
+                       };
                };
        };
 

Modified: trunk/target/linux/ramips/dts/WIZFI630A.dts
===================================================================
--- trunk/target/linux/ramips/dts/WIZFI630A.dts 2016-02-08 08:26:19 UTC (rev 
48664)
+++ trunk/target/linux/ramips/dts/WIZFI630A.dts 2016-02-08 08:26:27 UTC (rev 
48665)
@@ -59,6 +59,8 @@
                        interrupt-parent = <&intc>;
                        interrupts = <5>;
                        reg-shift = <2>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uartf_pins>;
                        status = "okay";
                };
 

Modified: trunk/target/linux/ramips/dts/WT1520.dtsi
===================================================================
--- trunk/target/linux/ramips/dts/WT1520.dtsi   2016-02-08 08:26:19 UTC (rev 
48664)
+++ trunk/target/linux/ramips/dts/WT1520.dtsi   2016-02-08 08:26:27 UTC (rev 
48665)
@@ -15,6 +15,8 @@
 
        palmbus@10000000 {
                uart@500 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uartf_pins>;
                        status = "okay";
                };
        };

Modified: trunk/target/linux/ramips/dts/rt5350.dtsi
===================================================================
--- trunk/target/linux/ramips/dts/rt5350.dtsi   2016-02-08 08:26:19 UTC (rev 
48664)
+++ trunk/target/linux/ramips/dts/rt5350.dtsi   2016-02-08 08:26:27 UTC (rev 
48665)
@@ -94,9 +94,6 @@
 
                        reg-shift = <2>;
 
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&uartf_pins>;
-
                        status = "disabled";
                };
 
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to