From aabdf6991cce55a76540c91ff3b5177afd8dce99 Mon Sep 17 00:00:00 2001
From: Sungbo Eo <mans0n@gorani.run>
Date: Wed, 13 Nov 2019 23:29:21 +0900
Subject: ramips: improve Samsung CY-SWR1100 support

This patch does the following:

- rename "devdata" flash partition and make it read-only
- switch from gpio-keys-polled to gpio-keys
- add missing power LED
- set correct PCI ID to compatible string in wifi node
- remove ralink,5ghz property in wifi node
- provide label MAC address

Rename devdata partition to devconf as indicated in the stock firmware
partition table:
00030000-00040000: "devdata"
00040000-00050000: "devconf"

Power LED can be controlled by SoC GPIO. Add it in the dts leds node.

RT3092L supports only bgn mode, so it is unnecessary to disable 5GHz band.

Signed-off-by: Sungbo Eo <mans0n@gorani.run>
---
 target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts      | 14 +++++++++-----
 .../linux/ramips/rt3883/base-files/etc/board.d/02_network  |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'target/linux')

diff --git a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
index a25d9d02c1..7bab768fe4 100644
--- a/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
+++ b/target/linux/ramips/dts/rt3662_samsung_cy-swr1100.dts
@@ -49,8 +49,9 @@
 			};
 
 			partition@40000 {
-				label = "devdata";
+				label = "devconf";
 				reg = <0x40000 0x10000>;
+				read-only;
 			};
 
 			partition@50000 {
@@ -69,8 +70,7 @@
 	};
 
 	keys {
-		compatible = "gpio-keys-polled";
-		poll-interval = <100>;
+		compatible = "gpio-keys";
 
 		reset {
 			label = "reset";
@@ -99,6 +99,11 @@
 			trigger-sources = <&ohci_port1>, <&ehci_port1>;
 			linux,default-trigger = "usbport";
 		};
+
+		power {
+			label = "cy-swr1100:blue:power";
+			gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+		};
 	};
 };
 
@@ -130,9 +135,8 @@
 	status = "okay";
 
 	wifi@0,0 {
-		compatible = "pci0,0";
+		compatible = "pci1814,3091";
 		reg = <0x10000 0 0 0 0>;
-		ralink,5ghz = <0>;
 		ralink,mtd-eeprom = <&factory 0x2000>;
 	};
 };
diff --git a/target/linux/ramips/rt3883/base-files/etc/board.d/02_network b/target/linux/ramips/rt3883/base-files/etc/board.d/02_network
index 2ef0e319bb..873c72cea3 100755
--- a/target/linux/ramips/rt3883/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/rt3883/base-files/etc/board.d/02_network
@@ -72,6 +72,7 @@ ramips_setup_macs()
 	samsung,cy-swr1100)
 		lan_mac=$(mtd_get_mac_ascii nvram lanmac)
 		wan_mac=$(mtd_get_mac_ascii nvram wanmac)
+		label_mac=$wan_mac
 		;;
 	sitecom,wlr-6000)
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x8004)" 2)
-- 
cgit v1.2.3