aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2018-12-27 07:25:40 +0100
committerRafał Miłecki <rafal@milecki.pl>2018-12-27 07:33:24 +0100
commit7a7d19abcfc56c5073931e81f481e2e1fdf774c2 (patch)
tree198c6e997c122fecbe24207db980e9fb7cca937e /target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch
parenta5d6f2eb76a549af9e5e186042ab6bf2371be725 (diff)
downloadupstream-7a7d19abcfc56c5073931e81f481e2e1fdf774c2.tar.gz
upstream-7a7d19abcfc56c5073931e81f481e2e1fdf774c2.tar.bz2
upstream-7a7d19abcfc56c5073931e81f481e2e1fdf774c2.zip
bcm53xx: backport DTS changes queued for the 4.21
It just replaces some downstream patches & adds relicensing work. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch')
-rw-r--r--target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch167
1 files changed, 167 insertions, 0 deletions
diff --git a/target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch b/target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch
new file mode 100644
index 0000000000..e6e2522f08
--- /dev/null
+++ b/target/linux/bcm53xx/patches-4.14/034-v4.20-0001-ARM-dts-BCM5301X-Specify-flash-partitions.patch
@@ -0,0 +1,167 @@
+From b0465fdfdd7e7c1afe2fae1cb36b94e1ce89732e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Sat, 28 Jul 2018 14:13:57 +0200
+Subject: [PATCH] ARM: dts: BCM5301X: Specify flash partitions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Most devices use Broadcom standard partitions which allows them to be
+described with the "brcm,bcm947xx-cfe-partitions". Exceptions are:
+1) TP-LINK devices which use "os-image" partition with TRX containing
+ kernel only + separated rootfs partition.
+2) Asus RT-AC87U with custom "asus" partition.
+
+This commit also removes undocumented and unsupported linux,part-probe
+binding which got accidentally upstreamed while describing SPI
+controller.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 28 +++++++++++++++++++
+ arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 31 ++++++++++++++++++++++
+ arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 28 +++++++++++++++++++
+ arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 4 +++
+ arch/arm/boot/dts/bcm5301x.dtsi | 5 +++-
+ 5 files changed, 95 insertions(+), 1 deletion(-)
+
+--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
++++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+@@ -94,6 +94,34 @@
+
+ &spi_nor {
+ status = "okay";
++
++ partitions {
++ compatible = "fixed-partitions";
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ boot@0 {
++ label = "boot";
++ reg = <0x000000 0x040000>;
++ read-only;
++ };
++
++ os-image@100000 {
++ label = "os-image";
++ reg = <0x040000 0x200000>;
++ compatible = "brcm,trx";
++ };
++
++ rootfs@240000 {
++ label = "rootfs";
++ reg = <0x240000 0xc00000>;
++ };
++
++ nvram@ff0000 {
++ label = "nvram";
++ reg = <0xff0000 0x010000>;
++ };
++ };
+ };
+
+ &usb2 {
+--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
++++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+@@ -66,3 +66,34 @@
+ &usb3_phy {
+ status = "okay";
+ };
++
++&nandcs {
++ partitions {
++ compatible = "fixed-partitions";
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ boot@0 {
++ label = "boot";
++ reg = <0x00000000 0x00080000>;
++ read-only;
++ };
++
++ nvram@80000 {
++ label = "nvram";
++ reg = <0x00080000 0x00180000>;
++ };
++
++ firmware@200000 {
++ label = "firmware";
++ reg = <0x00200000 0x07cc0000>;
++ compatible = "brcm,trx";
++ };
++
++ asus@7ec0000 {
++ label = "asus";
++ reg = <0x07ec0000 0x00140000>;
++ read-only;
++ };
++ };
++};
+--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
++++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+@@ -103,6 +103,34 @@
+
+ &spi_nor {
+ status = "okay";
++
++ partitions {
++ compatible = "fixed-partitions";
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ boot@0 {
++ label = "boot";
++ reg = <0x000000 0x040000>;
++ read-only;
++ };
++
++ os-image@100000 {
++ label = "os-image";
++ reg = <0x040000 0x200000>;
++ compatible = "brcm,trx";
++ };
++
++ rootfs@240000 {
++ label = "rootfs";
++ reg = <0x240000 0xc00000>;
++ };
++
++ nvram@ff0000 {
++ label = "nvram";
++ reg = <0xff0000 0x010000>;
++ };
++ };
+ };
+
+ &usb3_phy {
+--- a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
++++ b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+@@ -12,6 +12,10 @@
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <1>;
++
++ partitions {
++ compatible = "brcm,bcm947xx-cfe-partitions";
++ };
+ };
+ };
+ };
+--- a/arch/arm/boot/dts/bcm5301x.dtsi
++++ b/arch/arm/boot/dts/bcm5301x.dtsi
+@@ -475,8 +475,11 @@
+ compatible = "jedec,spi-nor";
+ reg = <0>;
+ spi-max-frequency = <20000000>;
+- linux,part-probe = "ofpart", "bcm47xxpart";
+ status = "disabled";
++
++ partitions {
++ compatible = "brcm,bcm947xx-cfe-partitions";
++ };
+ };
+ };
+