From 1ff13a1a792e0f6a3e59417b25611949285deafe Mon Sep 17 00:00:00 2001
From: RISCi_ATOM <bob@bobcall.me>
Date: Sun, 31 Mar 2019 16:52:50 -0400
Subject: [PATCH] Fix up TPE-R1100 target

---
 .../ar71xx/base-files/etc/board.d/02_network   |  2 +-
 target/linux/ar71xx/config-4.4                 |  1 +
 .../files/arch/mips/ath79/Kconfig.openwrt      | 10 ++++++++++
 .../files/arch/mips/ath79/mach-gl-ar150.c      |  2 ++
 .../ar71xx/files/arch/mips/ath79/machtypes.h   |  1 +
 target/linux/ar71xx/image/generic.mk           | 18 ++++++++++--------
 6 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index d9451c82ff..595e6735fa 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -112,7 +112,6 @@ ar71xx_setup_interfaces()
 	tl-wa901nd-v4|\
 	tl-wr703n|\
 	tl-wr802n-v1|\
-	tpe-r1100|\
 	tube2h|\
 	unifiac-lite|\
 	wndap360|\
@@ -126,6 +125,7 @@ ar71xx_setup_interfaces()
 	dr344|\
 	gl-ar150|\
 	gl-ar300m|\
+	tpe-r1100|\
 	tpe-r1200|\
 	gl-domino|\
 	gl-inet|\
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
index bd14388f75..997838f24f 100644
--- a/target/linux/ar71xx/config-4.4
+++ b/target/linux/ar71xx/config-4.4
@@ -161,6 +161,7 @@ CONFIG_ATH79_MACH_TEW_673GRU=y
 CONFIG_ATH79_MACH_TEW_712BR=y
 CONFIG_ATH79_MACH_TEW_732BR=y
 CONFIG_ATH79_MACH_TEW_823DRU=y
+CONFIG_ATH79_MACH_TPE_R1100=y
 CONFIG_ATH79_MACH_TPE_R1200=y
 CONFIG_ATH79_MACH_TL_MR11U=y
 CONFIG_ATH79_MACH_TL_MR13U=y
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
index ef23fa3ddc..139d49b36d 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
+++ b/target/linux/ar71xx/files/arch/mips/ath79/Kconfig.openwrt
@@ -1254,6 +1254,16 @@ config ATH79_MACH_BSB
 	select ATH79_DEV_USB
 	select ATH79_DEV_WMAC
 
+config ATH79_MACH_TPE_R1100
+        bool "TPE-R1100 support"
+        select SOC_AR933X
+        select ATH79_DEV_ETH
+        select ATH79_DEV_GPIO_BUTTONS
+        select ATH79_DEV_LEDS_GPIO
+        select ATH79_DEV_M25P80
+        select ATH79_DEV_USB
+        select ATH79_DEV_WMAC
+
 config ATH79_MACH_TPE_R1200
         bool "TPE-R1200 Support"
         select SOC_QCA953X
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
index e0d1ea4381..fdbec760eb 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
@@ -123,3 +123,5 @@ static void __init gl_ar150_setup(void)
 }
 
 MIPS_MACHINE(ATH79_MACH_GL_AR150, "GL-AR150", "GL AR150",gl_ar150_setup);
+MIPS_MACHINE(ATH79_MACH_TPE_R1100, "TPE-R1100", "TPE-R1100 Think Penguin Mini Router",gl_ar150_setup);
+
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
index 68e28535d6..fef3fc21a6 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
+++ b/target/linux/ar71xx/files/arch/mips/ath79/machtypes.h
@@ -185,6 +185,7 @@ enum ath79_mach_type {
 	ATH79_MACH_TEW_712BR,			/* TRENDnet TEW-712BR */
 	ATH79_MACH_TEW_732BR,			/* TRENDnet TEW-732BR */
 	ATH79_MACH_TEW_823DRU,			/* TRENDnet TEW-823DRU */
+	ATH79_MACH_TPE_R1100,			/* ThinkPenguin TPE-R1100 */
 	ATH79_MACH_TPE_R1200,			/* ThinkPenguin TPE-R1200 */
 	ATH79_MACH_TL_MR10U,			/* TP-LINK TL-MR10U */
 	ATH79_MACH_TL_MR11U,			/* TP-LINK TL-MR11U */
diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk
index 8243648955..594af4cf6c 100644
--- a/target/linux/ar71xx/image/generic.mk
+++ b/target/linux/ar71xx/image/generic.mk
@@ -129,7 +129,16 @@ define Device/gl-ar150
   CONSOLE = ttyATH0,115200
   MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro
 endef
-TARGET_DEVICES += gl-ar150
+
+define Device/tpe-r1100
+  $(Device/gl-ar150)
+  DEVICE_TITLE := TPE-R1100 Think Penguin Mini Router
+  BOARDNAME = TPE-R1100
+endef
+
+TARGET_DEVICES += gl-ar150 tpe-r1100
+
+
 
 define Device/gl-usb150
   DEVICE_TITLE := GL.iNet GL-USB150
@@ -144,13 +153,6 @@ define Device/gl-usb150
 endef
 TARGET_DEVICES += gl-usb150
 
-define Device/tpe-r1100
-  $(Device/gl-ar150)
-  DEVICE_TITLE := TPE-R1100 Think Penguin Mini Router
-endef
-
-TARGET_DEVICES += tpe-r1100
-
 define Device/gl-ar300
   DEVICE_TITLE := GL AR300
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2
-- 
2.25.1