From dd158ef3462c5bf8366729a97f96fa19fa543699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 8 Sep 2016 22:53:00 +0200 Subject: [PATCH] bcm53xx: use upstream queued patches for R8500 and AC9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki --- ...M-BCM5301X-Add-DT-for-Netgear-R8500.patch} | 31 +++++++------ ...basic-dts-for-BCM53573-based-Tenda-.patch} | 45 ++++++++----------- ...RM-BCM5301X-Add-DT-for-Netgear-R7900.patch | 2 +- ...cify-RAM-on-devices-by-including-HIG.patch | 2 +- 4 files changed, 37 insertions(+), 43 deletions(-) rename target/linux/bcm53xx/patches-4.4/{306-ARM-BCM5301X-Add-DT-for-Netgear-R8500.patch => 044-0001-ARM-BCM5301X-Add-DT-for-Netgear-R8500.patch} (76%) rename target/linux/bcm53xx/patches-4.4/{130-ARM-BCM5301X-Add-basic-dts-for-BCM53573-based-Tenda-.patch => 044-0002-ARM-BCM5301X-Add-basic-dts-for-BCM53573-based-Tenda-.patch} (84%) diff --git a/target/linux/bcm53xx/patches-4.4/306-ARM-BCM5301X-Add-DT-for-Netgear-R8500.patch b/target/linux/bcm53xx/patches-4.4/044-0001-ARM-BCM5301X-Add-DT-for-Netgear-R8500.patch similarity index 76% rename from target/linux/bcm53xx/patches-4.4/306-ARM-BCM5301X-Add-DT-for-Netgear-R8500.patch rename to target/linux/bcm53xx/patches-4.4/044-0001-ARM-BCM5301X-Add-DT-for-Netgear-R8500.patch index addbe36698..954e8f927f 100644 --- a/target/linux/bcm53xx/patches-4.4/306-ARM-BCM5301X-Add-DT-for-Netgear-R8500.patch +++ b/target/linux/bcm53xx/patches-4.4/044-0001-ARM-BCM5301X-Add-DT-for-Netgear-R8500.patch @@ -1,36 +1,39 @@ -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +From b5057e498da8211ac3cc8ff5780034e5da61d077 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Tue, 23 Aug 2016 08:40:32 +0200 Subject: [PATCH] ARM: BCM5301X: Add DT for Netgear R8500 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Signed-off-by: Rafał Miłecki +Netgear R8500 is another BCM47094 device, it just has three BCM4366 +wireless chipsets. It's a very standard DT with mostly GPIO devices. + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli --- - arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 31 ++++++++++++++++++++++++++++ - 2 files changed, 32 insertions(+) + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 104 +++++++++++++++++++++++++++ + 2 files changed, 105 insertions(+) create mode 100644 arch/arm/boot/dts/bcm47094-netgear-r8500.dts --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -79,6 +79,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ - bcm4709-netgear-r7900.dtb \ +@@ -77,6 +77,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ + bcm4709-netgear-r7000.dtb \ bcm4709-netgear-r8000.dtb \ bcm47094-dlink-dir-885l.dtb \ + bcm47094-netgear-r8500.dtb \ - bcm47189-tenda-ac9.dtb \ bcm94708.dtb \ bcm94709.dtb \ + bcm953012er.dtb \ --- /dev/null +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts -@@ -0,0 +1,107 @@ +@@ -0,0 +1,104 @@ +/* -+ * Broadcom BCM470X / BCM5301X ARM platform code. -+ * DTS for Netgear R8500 -+ * -+ * Copyright (C) 2016 Rafał Miłecki ++ * Copyright (C) 2016 Rafał Miłecki + * -+ * Licensed under the GNU/GPL. See COPYING for details. ++ * Licensed under the ISC license. + */ + +/dts-v1/; diff --git a/target/linux/bcm53xx/patches-4.4/130-ARM-BCM5301X-Add-basic-dts-for-BCM53573-based-Tenda-.patch b/target/linux/bcm53xx/patches-4.4/044-0002-ARM-BCM5301X-Add-basic-dts-for-BCM53573-based-Tenda-.patch similarity index 84% rename from target/linux/bcm53xx/patches-4.4/130-ARM-BCM5301X-Add-basic-dts-for-BCM53573-based-Tenda-.patch rename to target/linux/bcm53xx/patches-4.4/044-0002-ARM-BCM5301X-Add-basic-dts-for-BCM53573-based-Tenda-.patch index 9e6886d1ff..a1c462dfc2 100644 --- a/target/linux/bcm53xx/patches-4.4/130-ARM-BCM5301X-Add-basic-dts-for-BCM53573-based-Tenda-.patch +++ b/target/linux/bcm53xx/patches-4.4/044-0002-ARM-BCM5301X-Add-basic-dts-for-BCM53573-based-Tenda-.patch @@ -1,49 +1,40 @@ +From 21c29be6a69d3ef4f5a2e16272deb4845f8208ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= +Date: Tue, 23 Aug 2016 07:37:43 +0200 Subject: [PATCH] ARM: BCM5301X: Add basic dts for BCM53573 based Tenda AC9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -BCM53573 seems to be low priced alternative for standard Northstar -chipsets. It uses single core Cortex-A7, doesn't have SDU or local (TWD) -timer. It was also stripped out of independent SPI controller and 2 -GMACs. +BCM53573 seems to be low priced alternative for Northstar chipsts. It +uses single core Cortex-A7 and doesn't have SDU or local (TWD) timer. It +was also stripped out of independent SPI controller and 2 GMACs. DTS for Tenda AC9 isn't completed yet. It misses e.g. switch entry (we -still need some bgmac/b53 fixes) and probably some clocks. It adds -support for basic features however and can be improved later. +still need some b53 fixes) and probably some clocks. It adds support for +basic features however and can be improved later. -Signed-off-by: Rafał Miłecki +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli --- - MAINTAINERS | 2 + - arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 74 ++++++++++++++++ arch/arm/boot/dts/bcm53573.dtsi | 147 +++++++++++++++++++++++++++++++ - 4 files changed, 224 insertions(+) + 3 files changed, 223 insertions(+) create mode 100644 arch/arm/boot/dts/bcm47189-tenda-ac9.dts create mode 100644 arch/arm/boot/dts/bcm53573.dtsi ---- a/MAINTAINERS -+++ b/MAINTAINERS -@@ -2337,6 +2337,8 @@ S: Maintained - F: arch/arm/mach-bcm/bcm_5301x.c - F: arch/arm/boot/dts/bcm5301x.dtsi - F: arch/arm/boot/dts/bcm470* -+F: arch/arm/boot/dts/bcm53573* -+F: arch/arm/boot/dts/bcm47189* - - BROADCOM BCM53573 ARM ARCHITECTURE - M: Rafał Miłecki --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -77,6 +77,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ - bcm4709-netgear-r7000.dtb \ - bcm4709-netgear-r8000.dtb \ - bcm47094-dlink-dir-885l.dtb \ -+ bcm47189-tenda-ac9.dtb \ - bcm94708.dtb \ +@@ -82,6 +82,8 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm94709.dtb \ bcm953012er.dtb \ + bcm953012k.dtb ++dtb-$(CONFIG_ARCH_BCM_53573) += \ ++ bcm47189-tenda-ac9.dtb + dtb-$(CONFIG_ARCH_BCM_63XX) += \ + bcm963138dvt.dtb + dtb-$(CONFIG_ARCH_BCM_CYGNUS) += \ --- /dev/null +++ b/arch/arm/boot/dts/bcm47189-tenda-ac9.dts @@ -0,0 +1,74 @@ diff --git a/target/linux/bcm53xx/patches-4.4/301-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch b/target/linux/bcm53xx/patches-4.4/301-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch index 6dcdf6caaf..eec68abc53 100644 --- a/target/linux/bcm53xx/patches-4.4/301-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch +++ b/target/linux/bcm53xx/patches-4.4/301-ARM-BCM5301X-Add-DT-for-Netgear-R7900.patch @@ -16,7 +16,7 @@ Signed-off-by: Rafał Miłecki + bcm4709-netgear-r7900.dtb \ bcm4709-netgear-r8000.dtb \ bcm47094-dlink-dir-885l.dtb \ - bcm47189-tenda-ac9.dtb \ + bcm47094-netgear-r8500.dtb \ --- /dev/null +++ b/arch/arm/boot/dts/bcm4709-netgear-r7900.dts @@ -0,0 +1,41 @@ diff --git a/target/linux/bcm53xx/patches-4.4/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch b/target/linux/bcm53xx/patches-4.4/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch index f2e5a3e2b4..11d6fa68ac 100644 --- a/target/linux/bcm53xx/patches-4.4/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch +++ b/target/linux/bcm53xx/patches-4.4/331-ARM-BCM5301X-Specify-RAM-on-devices-by-including-HIG.patch @@ -185,7 +185,7 @@ Signed-off-by: Rafał Miłecki nand: nand@18028000 { --- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts +++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts -@@ -21,7 +21,8 @@ +@@ -18,7 +18,8 @@ }; memory {