From 61b53a608563d7d5ccf71196272ef848f5b4676b Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Wed, 15 May 2019 01:07:14 +0800
Subject: [PATCH] bcm53xx: fix ARRIS-SBR-AC1900P dts support

---
 target/linux/bcm53xx/Makefile                 |   2 +-
 ...CM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch | 119 ++++++++++++++++++
 ...CM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch |  14 +--
 3 files changed, 122 insertions(+), 13 deletions(-)
 create mode 100644 target/linux/bcm53xx/patches-4.14/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch

diff --git a/target/linux/bcm53xx/Makefile b/target/linux/bcm53xx/Makefile
index 059bbfe9a..2af1c7e71 100644
--- a/target/linux/bcm53xx/Makefile
+++ b/target/linux/bcm53xx/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs nand usb pci pcie gpio
 MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de>
 CPU_TYPE:=cortex-a9
 
-KERNEL_PATCHVER:=4.19
+KERNEL_PATCHVER:=4.14
 
 define Target/Description
 	Build firmware images for Broadcom based BCM47xx/53xx routers with ARM CPU, *not* MIPS.
diff --git a/target/linux/bcm53xx/patches-4.14/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch b/target/linux/bcm53xx/patches-4.14/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch
new file mode 100644
index 000000000..258407352
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.14/322-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC1900P.patch
@@ -0,0 +1,119 @@
+This router has BCM4709A0 SoC, 128 MiB NAND flash (MX30LF1G18AC-TI),
+256 MiB memory and 4 x LAN and 1 x WAN ports.
+WiFi chips are BCM4360 x 2.
+USB2.0 x 1. USB3.0 x 1.
+this router cpu port only used port 8,but b53 must set port 7, is it a bug?
+see 700-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch
+
+
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -105,6 +105,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
+ 	bcm4709-netgear-r7000.dtb \
+ 	bcm4709-netgear-r8000.dtb \
+ 	bcm4709-tplink-archer-c9-v1.dtb \
++	bcm4709-arris-sbr-ac1900p.dtb \
++	bcm4709-arris-sbr-ac3200p.dtb \
+ 	bcm47094-dlink-dir-885l.dtb \
+ 	bcm47094-linksys-panamera.dtb \
+ 	bcm47094-luxul-abr-4500.dtb \
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm4709-arris-sbr-ac1900p.dts
+@@ -0,0 +1,97 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++/*
++ * DTS for ARRIS SBR-AC1900P
++ *
++ * Copyright (C) 2019 Shi Zhangqiang <lostlonger.g@gmail.com>
++ * Copyright (C) 2019 Xu Zhaowei <paldier@hotmail.com>
++ */
++
++/dts-v1/;
++
++#include "bcm4709.dtsi"
++#include "bcm5301x-nand-cs0-bch4.dtsi"
++
++/ {
++	compatible = "arris,sbr-ac1900p", "brcm,bcm4709", "brcm,bcm4708";
++	model = "ARRIS SBR-AC1900P";
++
++	chosen {
++		bootargs = "console=ttyS0,115200";
++	};
++
++	memory {
++		reg = <0x00000000 0x08000000
++		       0x88000000 0x08000000>;
++	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++		#address-cells = <1>;
++		#size-cells = <0>;
++
++		restart {
++			label = "Reset";
++			linux,code = <KEY_RESTART>;
++			gpios = <&chipcommon 19 GPIO_ACTIVE_LOW>;
++		};
++		
++		wps {
++			label = "WPS";
++			linux,code = <KEY_WPS_BUTTON>;
++			gpios = <&chipcommon 20 GPIO_ACTIVE_LOW>;
++		};
++	};
++};
++
++&uart1 {
++	status = "okay";
++};
++
++&usb2 {
++	vcc-gpio = <&chipcommon 18 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3 {
++	vcc-gpio = <&chipcommon 21 GPIO_ACTIVE_HIGH>;
++};
++
++&usb3_phy {
++	status = "okay";
++};
++
++&nandcs {
++	partitions {
++		compatible = "fixed-partitions";
++		#address-cells = <1>;
++		#size-cells = <1>;
++
++		partition@0 {
++			label = "boot";
++			reg = <0x0000000 0x0080000>;
++			read-only;
++		};
++
++		partition@80000 {
++			label = "nvram";
++			reg = <0x0080000 0x0180000>;
++		};
++
++		partition@200000 {
++			label = "firmware";
++			reg = <0x0200000 0x6600000>;
++			compatible = "brcm,trx";
++		};
++
++		partition@6800000 {
++			label = "env";
++			reg = <0x6800000 0x0200000>;
++			read-only;
++		};
++
++		partition@6a00000 {
++			label = "data";
++			reg = <0x6a00000 0x1600000>;
++		};
++	};
++};
++
diff --git a/target/linux/bcm53xx/patches-4.14/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch b/target/linux/bcm53xx/patches-4.14/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch
index bc8797331..606b22c3e 100644
--- a/target/linux/bcm53xx/patches-4.14/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch
+++ b/target/linux/bcm53xx/patches-4.14/323-ARM-dts-BCM5301X-Add-DT-for-ARRIS-SBR-AC3200P.patch
@@ -1,16 +1,6 @@
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -106,6 +106,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \
- 	bcm4709-netgear-r8000.dtb \
- 	bcm4709-tplink-archer-c9-v1.dtb \
-     bcm4709-arris-sbr-ac1900p.dtb \
-+    bcm4709-arris-sbr-ac3200p.dtb \
- 	bcm47094-dlink-dir-885l.dtb \
- 	bcm47094-linksys-panamera.dtb \
- 	bcm47094-luxul-abr-4500.dtb \
 --- /dev/null
 +++ b/arch/arm/boot/dts/bcm4709-arris-sbr-ac3200p.dts
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,92 @@
 +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 +/*
 + * DTS for ARRIS SBR-AC3200P
@@ -103,4 +93,4 @@
 +		};
 +	};
 +};
-+
++
\ No newline at end of file