| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167 |
- From b0465fdfdd7e7c1afe2fae1cb36b94e1ce89732e Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
- 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 <[email protected]>
- Signed-off-by: Florian Fainelli <[email protected]>
- ---
- 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";
- + };
- };
- };
-
|
