arm64: dts: mediatek: mt7986a: bpi-r3: Convert to sugar syntax

Overlay syntactic sugar for generating target-path fragments is
supported by the version of dtc supplied with the kernel since commit
50aafd60898a8b3e ("scripts/dtc: Update to upstream version
v1.4.6-21-g84e414b0b5bc").  Hence convert the Bananapi R3 overlay
devicetree source files to sugar syntax, improving readability.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/2fd900a30b5a0f7de4ea68f60bac250794b8cdb4.1716984213.git.geert+renesas@glider.be
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
index 779dc6782bb1986f8bb39d341d5d7254ee96cf56..047a8388811eb9c09d7c1ea6dc7a38c79bfb7a20 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso
@@ -9,21 +9,17 @@
 
 / {
        compatible = "bananapi,bpi-r3", "mediatek,mt7986a";
-
-       fragment@0 {
-               target-path = "/soc/mmc@11230000";
-               __overlay__ {
-                       bus-width = <8>;
-                       max-frequency = <200000000>;
-                       cap-mmc-highspeed;
-                       mmc-hs200-1_8v;
-                       mmc-hs400-1_8v;
-                       hs400-ds-delay = <0x14014>;
-                       non-removable;
-                       no-sd;
-                       no-sdio;
-                       status = "okay";
-               };
-       };
 };
 
+&{/soc/mmc@11230000} {
+       bus-width = <8>;
+       max-frequency = <200000000>;
+       cap-mmc-highspeed;
+       mmc-hs200-1_8v;
+       mmc-hs400-1_8v;
+       hs400-ds-delay = <0x14014>;
+       non-removable;
+       no-sd;
+       no-sdio;
+       status = "okay";
+};

diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
index 7b97c5c91bd0264df6655b8a3de5ec7aba168896..24398f8a7da4345c5bea4d29eedb86008c7476ca 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso
@@ -9,46 +9,44 @@
 
 / {
        compatible = "bananapi,bpi-r3", "mediatek,mt7986a";
+};
+
+&{/soc/spi@1100a000} {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       spi_nand: flash@0 {
+               compatible = "spi-nand";
+               reg = <0>;
+               spi-max-frequency = <10000000>;
+               spi-tx-buswidth = <4>;
+               spi-rx-buswidth = <4>;
 
-       fragment@0 {
-               target-path = "/soc/spi@1100a000";
-               __overlay__ {
+               partitions {
+                       compatible = "fixed-partitions";
                        #address-cells = <1>;
-                       #size-cells = <0>;
-                       spi_nand: flash@0 {
-                               compatible = "spi-nand";
-                               reg = <0>;
-                               spi-max-frequency = <10000000>;
-                               spi-tx-buswidth = <4>;
-                               spi-rx-buswidth = <4>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "bl2";
-                                               reg = <0x0 0x100000>;
-                                               read-only;
-                                       };
-
-                                       partition@100000 {
-                                               label = "reserved";
-                                               reg = <0x100000 0x280000>;
-                                       };
-
-                                       partition@380000 {
-                                               label = "fip";
-                                               reg = <0x380000 0x200000>;
-                                               read-only;
-                                       };
-
-                                       partition@580000 {
-                                               label = "ubi";
-                                               reg = <0x580000 0x7a80000>;
-                                       };
-                               };
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "bl2";
+                               reg = <0x0 0x100000>;
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "reserved";
+                               reg = <0x100000 0x280000>;
+                       };
+
+                       partition@380000 {
+                               label = "fip";
+                               reg = <0x380000 0x200000>;
+                               read-only;
+                       };
+
+                       partition@580000 {
+                               label = "ubi";
+                               reg = <0x580000 0x7a80000>;
                        };
                };
        };

diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
index e48881be4ed60c98bc89214cfe7b1dfdbf1ddf35..6a0d529b54aca5bd27062cebf5ce6658a59a173b 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso
@@ -9,54 +9,52 @@
 
 / {
        compatible = "bananapi,bpi-r3", "mediatek,mt7986a";
+};
+
+&{/soc/spi@1100a000} {
+       #address-cells = <1>;
+       #size-cells = <0>;
 
-       fragment@0 {
-               target-path = "/soc/spi@1100a000";
-               __overlay__ {
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               reg = <0>;
+               spi-max-frequency = <10000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
                        #address-cells = <1>;
-                       #size-cells = <0>;
-                       flash@0 {
-                               compatible = "jedec,spi-nor";
-                               reg = <0>;
-                               spi-max-frequency = <10000000>;
-
-                               partitions {
-                                       compatible = "fixed-partitions";
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               label = "bl2";
-                                               reg = <0x0 0x40000>;
-                                               read-only;
-                                       };
-
-                                       partition@40000 {
-                                               label = "u-boot-env";
-                                               reg = <0x40000 0x40000>;
-                                       };
-
-                                       partition@80000 {
-                                               label = "reserved2";
-                                               reg = <0x80000 0x80000>;
-                                       };
-
-                                       partition@100000 {
-                                               label = "fip";
-                                               reg = <0x100000 0x80000>;
-                                               read-only;
-                                       };
-
-                                       partition@180000 {
-                                               label = "recovery";
-                                               reg = <0x180000 0xa80000>;
-                                       };
-
-                                       partition@c00000 {
-                                               label = "fit";
-                                               reg = <0xc00000 0x1400000>;
-                                       };
-                               };
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "bl2";
+                               reg = <0x0 0x40000>;
+                               read-only;
+                       };
+
+                       partition@40000 {
+                               label = "u-boot-env";
+                               reg = <0x40000 0x40000>;
+                       };
+
+                       partition@80000 {
+                               label = "reserved2";
+                               reg = <0x80000 0x80000>;
+                       };
+
+                       partition@100000 {
+                               label = "fip";
+                               reg = <0x100000 0x80000>;
+                               read-only;
+                       };
+
+                       partition@180000 {
+                               label = "recovery";
+                               reg = <0x180000 0xa80000>;
+                       };
+
+                       partition@c00000 {
+                               label = "fit";
+                               reg = <0xc00000 0x1400000>;
                        };
                };
        };

diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
index f623bce075ce6ea4ef66928246f60b7e90bc95ed..d9e01967acc471b83b3d793d3cc095c14e43ffa0 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
+++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso
@@ -9,15 +9,11 @@
 
 / {
        compatible = "bananapi,bpi-r3", "mediatek,mt7986a";
-
-       fragment@0 {
-               target-path = "/soc/mmc@11230000";
-               __overlay__ {
-                       bus-width = <4>;
-                       max-frequency = <52000000>;
-                       cap-sd-highspeed;
-                       status = "okay";
-               };
-       };
 };
 
+&{/soc/mmc@11230000} {
+       bus-width = <4>;
+       max-frequency = <52000000>;
+       cap-sd-highspeed;
+       status = "okay";
+};