From 1948afc6ec0155212b914a66f59053ae2e080ba1 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Thu, 15 Oct 2015 14:37:12 +0000
Subject: [PATCH] lantiq: several ARV7519RW22 fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fixes ARV7519RW22 flash register (only 1 flash).
Power LED is green, not red.
Rename message LEDs to internet.
Add LEDs configuration (lan, wan, power).
Enable switch VLANs.
Fix secondary USB.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: José Vázquez Fernández <ppvazquezfer@gmail.com>

SVN-Revision: 47190
---
 .../base-files/etc/uci-defaults/01_leds       |  5 +++++
 .../base-files/etc/uci-defaults/02_network    |  3 +++
 target/linux/lantiq/dts/ARV7519RW22.dts       | 22 +++++++++++--------
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds b/target/linux/lantiq/base-files/etc/uci-defaults/01_leds
index 8041ac941f..6956d616af 100644
--- a/target/linux/lantiq/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/01_leds
@@ -51,6 +51,11 @@ P2812HNUF*)
 	ucidef_set_led_netdev "dsl" "dsl" "dsl" "nas0"
 	ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan"
 	;;
+ARV7519RW22)
+	ucidef_set_led_default "power" "power" "power" "1"
+	ucidef_set_led_netdev "internet_green" "internet_green" "internet_green" "pppoe-wan"
+	ucidef_set_led_netdev "lan" "lan" "lan" "eth0.1"
+	;;
 *)
 	;;
 esac
diff --git a/target/linux/lantiq/base-files/etc/uci-defaults/02_network b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
index afb8714fe8..721098e4d3 100644
--- a/target/linux/lantiq/base-files/etc/uci-defaults/02_network
+++ b/target/linux/lantiq/base-files/etc/uci-defaults/02_network
@@ -162,6 +162,9 @@ TDW8970)
 ARV7519RW22)
 	lan_mac=$(mtd_get_mac_binary boardconfig 22)
 	wan_mac=$(macaddr_add "$lan_mac" 1)
+	ucidef_set_interface_lan "eth0.1"
+	ucidef_add_switch "switch0" "1" "1"
+	ucidef_add_switch_vlan "switch0" "1" "0 2 3 4 5 6t"
 	;;
 
 BTHOMEHUBV2B|BTHOMEHUBV3A)
diff --git a/target/linux/lantiq/dts/ARV7519RW22.dts b/target/linux/lantiq/dts/ARV7519RW22.dts
index 68237532b4..d925f8603d 100644
--- a/target/linux/lantiq/dts/ARV7519RW22.dts
+++ b/target/linux/lantiq/dts/ARV7519RW22.dts
@@ -18,7 +18,7 @@
 			nor-boot@0 {
 				compatible = "lantiq,nor";
 				bank-width = <2>;
-				reg = <0 0x0 0x2000000>, <1 0x2000000 0x2000000>;
+				reg = <0 0x0 0x2000000>;
 				#address-cells = <1>;
 				#size-cells = <1>;
 
@@ -151,7 +151,11 @@
 		ifxhcd@E101000 {
 			status = "okay";
 			gpios = <&gpio 32 0>;
-			lantiq,portmask = <0x3>;
+		};
+
+		ifxhcd@E106000 {
+			status = "okay";
+			gpios = <&gpio 32 0>;
 		};
 
 		pcie@d900000 {
@@ -202,11 +206,11 @@
 			label = "lan";
 			gpios = <&gpio 2 1>;
 		};
-		message_red {
-			label = "message_red";
+		internet_red {
+			label = "internet_red";
 			gpios = <&gpio 10 1>;
 		};
-		power_red {
+		power_green {
 			label = "power";
 			gpios = <&gpio 14 1>;
 			default-state = "on";
@@ -215,12 +219,12 @@
 			label = "alarm";
 			gpios = <&gpio 15 1>;
 		};
-		message_orange {
-			label = "message_orange";
+		internet_orange {
+			label = "internet_orange";
 			gpios = <&gpio 19 1>;
 		};
-		message_green {
-			label = "message_green";
+		internet_green {
+			label = "internet_green";
 			gpios = <&gpio 28 1>;
 		};
 		voice_green {
-- 
2.30.2