From nobody Tue Dec 16 11:45:53 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB080EE4993 for ; Wed, 23 Aug 2023 13:10:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235451AbjHWNK5 (ORCPT ); Wed, 23 Aug 2023 09:10:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231472AbjHWNK4 (ORCPT ); Wed, 23 Aug 2023 09:10:56 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC767E4A for ; Wed, 23 Aug 2023 06:10:51 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:6477:4282:8a75:3696]) by xavier.telenet-ops.be with bizsmtp id d1Ap2A0080iR7xF011ApCk; Wed, 23 Aug 2023 15:10:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qYndA-001Y5a-J4; Wed, 23 Aug 2023 15:10:49 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qYndJ-00HVW7-2r; Wed, 23 Aug 2023 15:10:49 +0200 From: Geert Uytterhoeven To: Matthias Brugger , AngeloGioacchino Del Regno , Frank Wunderlich Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] arm64: dts: mediatek: mt8186: bpi-r3: Convert to sugar syntax Date: Wed, 23 Aug 2023 15:10:48 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 --- No changes in generated dtbo. --- .../mt7986a-bananapi-bpi-r3-emmc.dtso | 28 +++--- .../mt7986a-bananapi-bpi-r3-nand.dtso | 74 ++++++++------- .../mediatek/mt7986a-bananapi-bpi-r3-nor.dtso | 90 +++++++++---------- .../mediatek/mt7986a-bananapi-bpi-r3-sd.dtso | 16 ++-- 4 files changed, 98 insertions(+), 110 deletions(-) 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 779dc6782bb1986f..047a8388811eb9c0 100644 --- 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 @@ =20 / { compatible =3D "bananapi,bpi-r3", "mediatek,mt7986a"; - - fragment@0 { - target-path =3D "/soc/mmc@11230000"; - __overlay__ { - bus-width =3D <8>; - max-frequency =3D <200000000>; - cap-mmc-highspeed; - mmc-hs200-1_8v; - mmc-hs400-1_8v; - hs400-ds-delay =3D <0x14014>; - non-removable; - no-sd; - no-sdio; - status =3D "okay"; - }; - }; }; =20 +&{/soc/mmc@11230000} { + bus-width =3D <8>; + max-frequency =3D <200000000>; + cap-mmc-highspeed; + mmc-hs200-1_8v; + mmc-hs400-1_8v; + hs400-ds-delay =3D <0x14014>; + non-removable; + no-sd; + no-sdio; + status =3D "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 543c13385d6e3f82..12ec15e3188de082 100644 --- 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 @@ =20 / { compatible =3D "bananapi,bpi-r3", "mediatek,mt7986a"; +}; + +&{/soc/spi@1100a000} { + #address-cells =3D <1>; + #size-cells =3D <0>; + + spi_nand: spi_nand@0 { + compatible =3D "spi-nand"; + reg =3D <0>; + spi-max-frequency =3D <10000000>; + spi-tx-buswidth =3D <4>; + spi-rx-buswidth =3D <4>; =20 - fragment@0 { - target-path =3D "/soc/spi@1100a000"; - __overlay__ { + partitions { + compatible =3D "fixed-partitions"; #address-cells =3D <1>; - #size-cells =3D <0>; - spi_nand: spi_nand@0 { - compatible =3D "spi-nand"; - reg =3D <0>; - spi-max-frequency =3D <10000000>; - spi-tx-buswidth =3D <4>; - spi-rx-buswidth =3D <4>; - - partitions { - compatible =3D "fixed-partitions"; - #address-cells =3D <1>; - #size-cells =3D <1>; - - partition@0 { - label =3D "bl2"; - reg =3D <0x0 0x100000>; - read-only; - }; - - partition@100000 { - label =3D "reserved"; - reg =3D <0x100000 0x280000>; - }; - - partition@380000 { - label =3D "fip"; - reg =3D <0x380000 0x200000>; - read-only; - }; - - partition@580000 { - label =3D "ubi"; - reg =3D <0x580000 0x7a80000>; - }; - }; + #size-cells =3D <1>; + + partition@0 { + label =3D "bl2"; + reg =3D <0x0 0x100000>; + read-only; + }; + + partition@100000 { + label =3D "reserved"; + reg =3D <0x100000 0x280000>; + }; + + partition@380000 { + label =3D "fip"; + reg =3D <0x380000 0x200000>; + read-only; + }; + + partition@580000 { + label =3D "ubi"; + reg =3D <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 e48881be4ed60c98..6a0d529b54aca5bd 100644 --- 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 @@ =20 / { compatible =3D "bananapi,bpi-r3", "mediatek,mt7986a"; +}; + +&{/soc/spi@1100a000} { + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - fragment@0 { - target-path =3D "/soc/spi@1100a000"; - __overlay__ { + flash@0 { + compatible =3D "jedec,spi-nor"; + reg =3D <0>; + spi-max-frequency =3D <10000000>; + + partitions { + compatible =3D "fixed-partitions"; #address-cells =3D <1>; - #size-cells =3D <0>; - flash@0 { - compatible =3D "jedec,spi-nor"; - reg =3D <0>; - spi-max-frequency =3D <10000000>; - - partitions { - compatible =3D "fixed-partitions"; - #address-cells =3D <1>; - #size-cells =3D <1>; - - partition@0 { - label =3D "bl2"; - reg =3D <0x0 0x40000>; - read-only; - }; - - partition@40000 { - label =3D "u-boot-env"; - reg =3D <0x40000 0x40000>; - }; - - partition@80000 { - label =3D "reserved2"; - reg =3D <0x80000 0x80000>; - }; - - partition@100000 { - label =3D "fip"; - reg =3D <0x100000 0x80000>; - read-only; - }; - - partition@180000 { - label =3D "recovery"; - reg =3D <0x180000 0xa80000>; - }; - - partition@c00000 { - label =3D "fit"; - reg =3D <0xc00000 0x1400000>; - }; - }; + #size-cells =3D <1>; + + partition@0 { + label =3D "bl2"; + reg =3D <0x0 0x40000>; + read-only; + }; + + partition@40000 { + label =3D "u-boot-env"; + reg =3D <0x40000 0x40000>; + }; + + partition@80000 { + label =3D "reserved2"; + reg =3D <0x80000 0x80000>; + }; + + partition@100000 { + label =3D "fip"; + reg =3D <0x100000 0x80000>; + read-only; + }; + + partition@180000 { + label =3D "recovery"; + reg =3D <0x180000 0xa80000>; + }; + + partition@c00000 { + label =3D "fit"; + reg =3D <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 f623bce075ce6ea4..d9e01967acc471b8 100644 --- 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 @@ =20 / { compatible =3D "bananapi,bpi-r3", "mediatek,mt7986a"; - - fragment@0 { - target-path =3D "/soc/mmc@11230000"; - __overlay__ { - bus-width =3D <4>; - max-frequency =3D <52000000>; - cap-sd-highspeed; - status =3D "okay"; - }; - }; }; =20 +&{/soc/mmc@11230000} { + bus-width =3D <4>; + max-frequency =3D <52000000>; + cap-sd-highspeed; + status =3D "okay"; +}; --=20 2.34.1