ipq40xx: GL-B1300: convert to new partitions layout

Alberto Bursi reported:
>The patch "ipq40xx: specify "firmware" partition format for GL.iNet GL-B1300"
>prevents boot on my B1300. I compiled from latest sources.

The GL-B1300 was using the discouraged direct subnodes method to declare
the partitions on the flash.

|The partition table should be a subnode of the flash node and should be named
|'partitions'. This node should have the following property:
|- compatible : (required) must be "fixed-partitions"
|Partitions are then defined in subnodes of the partitions node.
|
|For backwards compatibility partitions as direct subnodes of the flash device are
|supported. This use is discouraged.
|NOTE: also for backwards compatibility, direct subnodes that have a compatible
|string are not considered partitions, as they may be used for other bindings.
<https://www.kernel.org/doc/Documentation/devicetree/bindings/mtd/partition.txt>

Hence, this patch converts the device to the "partitions" layout.

Fixes: 1cbe457cf94 ("ipq40xx: specify "firmware" partition format for GL.iNet GL-B1300")
Reported-by: Alberto Bursi <bobafetthotmail@gmail.com>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>

diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
index fdfe969245a2230db0f6a752e92b65b513df3f9d..b1f71efcffd389a8604bf5c84312fb7882668e61 100644 (file)
--- a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
+++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-gl-b1300.dts
@@ -155,58 +155,64 @@
                reg = <0>;
                spi-max-frequency = <24000000>;
 
-               SBL1@0 {
-                       label = "SBL1";
-                       reg = <0x0 0x40000>;
-                       read-only;
-               };
-
-               MIBIB@40000 {
-                       label = "MIBIB";
-                       reg = <0x40000 0x20000>;
-                       read-only;
-               };
-
-               QSEE@60000 {
-                       label = "QSEE";
-                       reg = <0x60000 0x60000>;
-                       read-only;
-               };
-
-               CDT@c0000 {
-                       label = "CDT";
-                       reg = <0xc0000 0x10000>;
-                       read-only;
-               };
-
-               DDRPARAMS@d0000 {
-                       label = "DDRPARAMS";
-                       reg = <0xd0000 0x10000>;
-                       read-only;
-               };
-
-               APPSBLENV@e0000 {
-                       label = "APPSBLENV";
-                       reg = <0xe0000 0x10000>;
-                       read-only;
-               };
-
-               APPSBL@f0000 {
-                       label = "APPSBL";
-                       reg = <0xf0000 0x80000>;
-                       read-only;
-               };
-
-               ART@170000 {
-                       label = "ART";
-                       reg = <0x170000 0x10000>;
-                       read-only;
-               };
-
-               firmware@180000 {
-                       compatible = "denx,fit";
-                       label = "firmware";
-                       reg = <0x180000 0x1e80000>;
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       SBL1@0 {
+                               label = "SBL1";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+
+                       MIBIB@40000 {
+                               label = "MIBIB";
+                               reg = <0x40000 0x20000>;
+                               read-only;
+                       };
+
+                       QSEE@60000 {
+                               label = "QSEE";
+                               reg = <0x60000 0x60000>;
+                               read-only;
+                       };
+
+                       CDT@c0000 {
+                               label = "CDT";
+                               reg = <0xc0000 0x10000>;
+                               read-only;
+                       };
+
+                       DDRPARAMS@d0000 {
+                               label = "DDRPARAMS";
+                               reg = <0xd0000 0x10000>;
+                               read-only;
+                       };
+
+                       APPSBLENV@e0000 {
+                               label = "APPSBLENV";
+                               reg = <0xe0000 0x10000>;
+                               read-only;
+                       };
+
+                       APPSBL@f0000 {
+                               label = "APPSBL";
+                               reg = <0xf0000 0x80000>;
+                               read-only;
+                       };
+
+                       ART@170000 {
+                               label = "ART";
+                               reg = <0x170000 0x10000>;
+                               read-only;
+                       };
+
+                       firmware@180000 {
+                               compatible = "denx,fit";
+                               label = "firmware";
+                               reg = <0x180000 0x1e80000>;
+                       };
                };
        };
 };