From fb426b964f9f085be87616445294a40a8554df3e Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Tue, 12 May 2015 17:46:02 +0200
Subject: [PATCH] ar71xx/sysmocom: add support for jb02v3

---
 target/linux/ar71xx/base-files/etc/diag.sh    |  3 +-
 .../base-files/etc/uci-defaults/01_leds       |  3 +-
 .../base-files/etc/uci-defaults/02_network    |  1 +
 target/linux/ar71xx/base-files/lib/ar71xx.sh  |  3 ++
 .../ar71xx/base-files/lib/upgrade/platform.sh |  1 +
 .../files/arch/mips/ath79/mach-sysmocom.c     | 45 +++++++++++++++++++
 target/linux/ar71xx/image/Makefile            |  1 +
 .../ar71xx/patches-3.10/999-sysmocom.patch    |  3 +-
 8 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
index 4148970..c03be21 100755
--- a/target/linux/ar71xx/base-files/etc/diag.sh
+++ b/target/linux/ar71xx/base-files/etc/diag.sh
@@ -284,7 +284,8 @@ get_status_led() {
 		status_led="sysmocom:orange:wlan"
 		;;
 	sysmocom-sob-ap2 | \
-	sysmocom-sob-jb02)
+	sysmocom-sob-jb02 | \
+	sysmocom-sob-jb02v3)
 		status_led="sysmocom:red:wlan"
 		;;
 	esac
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
index c81df3b..a8550bd 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
@@ -212,7 +212,8 @@ sysmocom-sob-ap1)
 	ucidef_set_led_default "wlan" "sysmocom:orange:wlan" "1"
 	;;
 
-sysmocom-sob-jb02)
+sysmocom-sob-jb02 | \
+sysmocom-sob-jb02v3)
 	ucidef_set_led_netdev "lan" "LAN" "sysmocom:red:eth0" "eth0"
 	ucidef_set_led_wlan "wlan" "WLAN" "sysmocom:red:wlan" "phy0tpt"
 	ucidef_set_led_default "wlan" "sysmocom:red:wlan" "1"
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
index 45e7435..8d24356 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
@@ -428,6 +428,7 @@ wndr3700)
 	uci set network.@switch_port[-1].led='2'
 	;;
 sysmocom-sob-jb02 | \
+sysmocom-sob-jb02v3 | \
 sysmocom-sob-ap1)
 	uci batch <<EOF
 set network.mgmt='interface'
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
index 8872b9d..9b53d93 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
@@ -754,6 +754,9 @@ ar71xx_board_detect() {
 	*"sysmocom SOB-JB02")
 		name="sysmocom-sob-jb02"
 		;;
+	*"sysmocom SOB-JB02V3")
+		name="sysmocom-sob-jb02v3"
+		;;
 	esac
 
 	case "$machine" in
diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
index a778d0f..b80c015 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
@@ -209,6 +209,7 @@ platform_check_image() {
 	sysmocom-sob-ap1 | \
 	sysmocom-sob-ap2 | \
 	sysmocom-sob-jb02 | \
+	sysmocom-sob-jb02v3 | \
 	carambola2 )
 		[ "$magic" != "2705" ] && {
 			echo "Invalid image type."
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-sysmocom.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-sysmocom.c
index 1ee15da..ee16efa 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-sysmocom.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-sysmocom.c
@@ -34,6 +34,9 @@
 #define SYSMOCOM_SOB_AP2_GPIO_I2C_SDA 26
 #define SYSMOCOM_SOB_AP2_GPIO_I2C_SCL 27
 
+#define SYSMOCOM_SOB_JB02V3_GPIO_LED_WLAN 0
+#define SYSMOCOM_SOB_JB02V3_GPIO_LED_ETH0 17
+
 #define SYSMOCOM_MAC0_OFFSET			0x0000
 #define SYSMOCOM_MAC1_OFFSET			0x0006
 #define SYSMOCOM_CALDATA_OFFSET			0x1000
@@ -75,6 +78,18 @@ static struct gpio_led sysmocom_sob_jb02_leds_gpio[] __initdata = {
 	}
 };
 
+static struct gpio_led sysmocom_sob_jb02v3_leds_gpio[] __initdata = {
+	{
+		.name		= "sysmocom:red:wlan",
+		.gpio		= SYSMOCOM_SOB_JB02V3_GPIO_LED_WLAN,
+		.active_low	= 0,
+	}, {
+		.name		= "sysmocom:red:eth0",
+		.gpio		= SYSMOCOM_SOB_JB02V3_GPIO_LED_ETH0,
+		.active_low	= 0,
+	}
+};
+
 static struct i2c_gpio_platform_data sob_ap1_i2c_gpio_data = {
 	.sda_pin	= SYSMOCOM_SOB_AP1_GPIO_I2C_SDA,
 	.scl_pin	= SYSMOCOM_SOB_AP1_GPIO_I2C_SCL,
@@ -208,6 +223,33 @@ static void __init sysmocom_sob_jb02_setup(void)
 	ath79_register_usb();
 }
 
+static void __init sysmocom_sob_jb02v3_setup(void)
+{
+	u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+
+	sysmocom_common_setup();
+	ath79_register_wmac(art + SYSMOCOM_CALDATA_OFFSET,
+			    art + SYSMOCOM_WMAC_MAC_OFFSET);
+
+	/* RJ45 port is separate WAN port / MAC, not switched with other ports */
+	ath79_setup_ar933x_phy4_switch(false, false);
+	ath79_init_mac(ath79_eth0_data.mac_addr, art + SYSMOCOM_MAC1_OFFSET, 0);
+	ath79_init_mac(ath79_eth1_data.mac_addr, art + SYSMOCOM_MAC0_OFFSET, 0);
+	ath79_register_mdio(0, 0x0);
+	ath79_register_eth(0);
+	ath79_register_eth(1);
+
+	ath79_gpio_function_disable(AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+				AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+				AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+				AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+				AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
+
+	ath79_register_leds_gpio(-1, ARRAY_SIZE(sysmocom_sob_jb02v3_leds_gpio),
+				 sysmocom_sob_jb02v3_leds_gpio);
+	ath79_register_usb();
+}
+
 MIPS_MACHINE(ATH79_MACH_SYSMOCOM_SOB_AP1, "SYSMOSOBAP1", "sysmocom SOB-AP1",
 		sysmocom_sob_ap1_setup);
 
@@ -217,3 +259,6 @@ MIPS_MACHINE(ATH79_MACH_SYSMOCOM_SOB_AP2, "SYSMOSOBAP2", "sysmocom SOB-AP2",
 MIPS_MACHINE(ATH79_MACH_SYSMOCOM_SOB_JB02, "SYSMOSOBJB02", "sysmocom SOB-JB02",
 		sysmocom_sob_jb02_setup);
 
+MIPS_MACHINE(ATH79_MACH_SYSMOCOM_SOB_JB02V3, "SYSMOSOBJB02V3", "sysmocom SOB-JB02V3",
+		sysmocom_sob_jb02v3_setup);
+
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 884acb8..a18108d 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -1071,6 +1071,7 @@ $(eval $(call SingleProfile,AthLzma,64k,CARAMBOLA2,carambola2,CARAMBOLA2,ttyATH0
 $(eval $(call SingleProfile,AthLzma,64k,SYSMOSOBAP1,sysmo-sob-ap1,SYSMOSOBAP1,ttyATH0,115200,$$(carambola2_mtdlayout_16M),KRuImage,65536))
 $(eval $(call SingleProfile,AthLzma,64k,SYSMOSOBAP2,sysmo-sob-ap2,SYSMOSOBAP2,ttyATH0,115200,$$(carambola2_mtdlayout_8M),KRuImage,65536))
 $(eval $(call SingleProfile,AthLzma,64k,SYSMOSOBJB02,sysmo-sob-jb02v2-cb2,SYSMOSOBJB02,ttyATH0,115200,$$(carambola2_mtdlayout_16M),KRuImage,65536))
+$(eval $(call SingleProfile,AthLzma,64k,SYSMOSOBJB02V3SKW,sysmo-sob-jb02v3-skw,SYSMOSOBJB02V3SKW,ttyATH0,115200,$$(carambola2_mtdlayout_16M),KRuImage,65536))
 $(eval $(call SingleProfile,AthLzma,64k,AP121MINI,ap121-mini,AP121-MINI,ttyATH0,115200,$$(ap121_mtdlayout_4M),RKuImage))
 $(eval $(call SingleProfile,AthLzma,64k,AP132,ap132,AP132,ttyS0,115200,$$(ap132_mtdlayout),KRuImage))
 $(eval $(call SingleProfile,AthLzma,64k,AP135,ap135-020,AP135-020,ttyS0,115200,$$(ap135_mtdlayout),RKuImage))
diff --git a/target/linux/ar71xx/patches-3.10/999-sysmocom.patch b/target/linux/ar71xx/patches-3.10/999-sysmocom.patch
index 49494a0..5e373dc 100644
--- a/target/linux/ar71xx/patches-3.10/999-sysmocom.patch
+++ b/target/linux/ar71xx/patches-3.10/999-sysmocom.patch
@@ -2,11 +2,12 @@ Index: linux-3.10.49/arch/mips/ath79/machtypes.h
 ===================================================================
 --- linux-3.10.49.orig/arch/mips/ath79/machtypes.h
 +++ linux-3.10.49/arch/mips/ath79/machtypes.h
-@@ -103,6 +103,9 @@ enum ath79_mach_type {
+@@ -103,6 +103,10 @@ enum ath79_mach_type {
  	ATH79_MACH_RB_SXTLITE2ND,	/* Mikrotik RouterBOARD SXT Lite 2nD */
  	ATH79_MACH_RB_SXTLITE5ND,	/* Mikrotik RouterBOARD SXT Lite 5nD */
  	ATH79_MACH_RW2458N,		/* Redwave RW2458N */
 +	ATH79_MACH_SYSMOCOM_SOB_JB02,	/* sysmocom SOB-JB02 */
++	ATH79_MACH_SYSMOCOM_SOB_JB02V3,	/* sysmocom SOB-JB02V3 */
 +	ATH79_MACH_SYSMOCOM_SOB_AP1,	/* sysmocom SOB-AP */
 +	ATH79_MACH_SYSMOCOM_SOB_AP2,	/* sysmocom SOB-AP */
  	ATH79_MACH_SMART_300,		/* NC-LINK SMART-300 */