| Message ID | 20221106085034.12582-1-linux@fw-web.de |
|---|---|
| Headers | show |
| Series | Add BananaPi R3 | expand |
Hi Rob, can you please take Patches 1+3 of v1 into your tree? due to reordering in my tree i missed them in this version https://patchwork.kernel.org/project/linux-mediatek/list/?series=685798 pcie-bindings are here: https://patchwork.kernel.org/project/linux-mediatek/list/?series=690172 i found 1 error in bpi-r3 dts (properties from sfp1 not plural) which i will fix in next version and will drop the compile comment in dt overlays. also i've found this commit: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit/?h=dt/next&id=363547d2191cbc32ca954ba75d72908712398ff2 so maybe i need to rename my overlay dts files to dtso? maybe the others can be applied (at least the mt7986 nodes)? regards Frank
Rob, Krzysztof, On 06/11/2022 09:50, Frank Wunderlich wrote: > From: Frank Wunderlich <frank-w@public-files.de> > > Add devicetree overlays for using nand and nor on BPI-R3. > > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > --- > arch/arm64/boot/dts/mediatek/Makefile | 2 + > .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 53 +++++++++++++++ > .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts | 67 +++++++++++++++++++ > 3 files changed, 122 insertions(+) > create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts > create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts > > diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile > index e8902f2cc58f..d42208c4090d 100644 > --- a/arch/arm64/boot/dts/mediatek/Makefile > +++ b/arch/arm64/boot/dts/mediatek/Makefile > @@ -8,6 +8,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtb > +dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nand.dtbo > +dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nor.dtbo Do we allow the inclusion of overlays in the kernel? I don't think so. I see there are some dtbos for some freescale platforms, but I wasn't aware that we support that. I thought it is all about dtsi includes. @frank In any case we would need to apply these overlays to some base board to create a valis dtb. Regards, Matthias > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd.dtb > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-rfb.dtb > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts > new file mode 100644 > index 000000000000..e12ff825bb50 > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts > @@ -0,0 +1,53 @@ > +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ > + > +/dts-v1/; > +/plugin/; > + > +//dtc -O dtb -o bpi-r3-nand.dtbo mt7986a-bananapi-bpi-r3-nand.dts > + > +/ { > + compatible = "bananapi,bpi-r3", "mediatek,mt7986a"; > + > + fragment@0 { > + target-path = "/soc/spi@1100a000"; > + __overlay__ { > + #address-cells = <1>; > + #size-cells = <0>; > + spi_nand: spi_nand@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 0x80000>; > + read-only; > + }; > + > + partition@80000 { > + label = "reserved"; > + reg = <0x80000 0x300000>; > + }; > + > + 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.dts b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts > new file mode 100644 > index 000000000000..f11ffd9c4bce > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts > @@ -0,0 +1,67 @@ > +/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */ > + > +/dts-v1/; > +/plugin/; > + > +//dtc -O dtb -o bpi-r3-nor.dtbo mt7986a-bananapi-bpi-r3-nor.dts > + > +/ { > + compatible = "bananapi,bpi-r3", "mediatek,mt7986a"; > + > + fragment@0 { > + target-path = "/soc/spi@1100a000"; > + __overlay__ { > + #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 0x20000>; > + read-only; > + }; > + > + partition@20000 { > + label = "reserved"; > + reg = <0x20000 0x20000>; > + }; > + > + 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>; > + compatible = "denx,fit"; > + }; > + }; > + }; > + }; > + }; > +};
Hi > Gesendet: Freitag, 11. November 2022 um 10:17 Uhr > Von: "Matthias Brugger" <matthias.bgg@gmail.com> > An: "Frank Wunderlich" <frank-w@public-files.de>, "Rob Herring" <robh+dt@kernel.org> > Cc: linux-mediatek@lists.infradead.org, "Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, "Frank Wunderlich" <linux@fw-web.de> > Betreff: Re: Aw: [RFC v3 00/11] Add BananaPi R3 > > > > On 10/11/2022 18:03, Frank Wunderlich wrote: > > Hi Rob, > > > > can you please take Patches 1+3 of v1 into your tree? > > due to reordering in my tree i missed them in this version > > > > https://patchwork.kernel.org/project/linux-mediatek/list/?series=685798 > > > > They should go through the subsystem maintainers trees. I'd advise to resend, > dropping the RFC prefix and add the corresponding maintainers. ok, wait for your push and i create v4 including the missing binding-patches and the reorder of wed-node together with my fixes. > Regards, > Matthias > > > pcie-bindings are here: > > > > https://patchwork.kernel.org/project/linux-mediatek/list/?series=690172 > > > > i found 1 error in bpi-r3 dts (properties from sfp1 not plural) which i will fix in next version and will drop > > the compile comment in dt overlays. > > > > also i've found this commit: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit/?h=dt/next&id=363547d2191cbc32ca954ba75d72908712398ff2 > > > > so maybe i need to rename my overlay dts files to dtso? > > > > maybe the others can be applied (at least the mt7986 nodes)? does this solve your question about dt-overlays? just to note for all...it is all 1 board having sd+emmc on 1 mmc-controller and nand+nor on one spi. it depends on hardware-switches which devices are accessable (1mmc+1 spi). Adding dts for all possible combinations will add more dts (sd+nor, sd+nand, emmc+nor, emmc+nand) than adding the 2 overlays or adds redundant config. or should i copy the emmc/sd dts and adding once nor or nand? so we have the dtsi and dts for combinations above (=5 total)? > > regards Frank >
On Fri, Nov 11, 2022 at 3:16 AM Matthias Brugger <matthias.bgg@gmail.com> wrote: > > Rob, Krzysztof, > > On 06/11/2022 09:50, Frank Wunderlich wrote: > > From: Frank Wunderlich <frank-w@public-files.de> > > > > Add devicetree overlays for using nand and nor on BPI-R3. Overlays are necessary because ...? > > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > > --- > > arch/arm64/boot/dts/mediatek/Makefile | 2 + > > .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 53 +++++++++++++++ > > .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts | 67 +++++++++++++++++++ > > 3 files changed, 122 insertions(+) > > create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts > > create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts > > > > diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile > > index e8902f2cc58f..d42208c4090d 100644 > > --- a/arch/arm64/boot/dts/mediatek/Makefile > > +++ b/arch/arm64/boot/dts/mediatek/Makefile > > @@ -8,6 +8,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb > > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb > > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb > > dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtb > > +dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nand.dtbo > > +dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nor.dtbo > > Do we allow the inclusion of overlays in the kernel? > I don't think so. I see there are some dtbos for some freescale platforms, but I > wasn't aware that we support that. I thought it is all about dtsi includes. Yes, we do. > @frank In any case we would need to apply these overlays to some base board to > create a valis dtb. Indeed. The build system supports this and it's a requirement (though not easily enforced) that overlays apply to something. It works much like how kbuild combines multiple .o files into a module. Please rename to .dtso though. I copied you all on the PR I just sent. Rob
From: Frank Wunderlich <frank-w@public-files.de> This Series adds some Nodes to mt7986 devicetree and the BananaPi R3 i included sams series for mt7986 DTS with small changes https://patchwork.kernel.org/project/linux-mediatek/cover/20220427124741.18245-1-sam.shih@mediatek.com/ this series need these Patches: i2c-support: https://patchwork.kernel.org/project/linux-mediatek/cover/20221009101631.82380-1-linux@fw-web.de/ mmc bindings: https://patchwork.kernel.org/project/linux-mediatek/list/?series=688675 update pinctrl-bindings: https://patchwork.kernel.org/project/linux-mediatek/list/?series=692462 hwrng and pinctrl (uart splitting) are already applied to next i had run full dtbs-check but i end up with some strange warnings in ethernet-node that should not come up as phy-handle and sfp/managed properties are already defined. phy-handle made optional https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/net/mediatek,net.yaml#n265 property sfp/managed (which is included for mac subnode in yaml above): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/net/ethernet-controller.yaml#n137 changes: v3: - changed mmc pull-ups - added patch for board binding (sent separately before) - added pcie node in mt7986 (not yet again in r3) - added dt overlays Frank Wunderlich (5): arm64: dts: mt7986: add i2c node dt-bindings: arm64: dts: mediatek: add compatible for bananapi r3 arm64: dts: mt7986: add Bananapi R3 arm64: dts: mt7986: add PCIe nodes to BananaPi-R3 arm64: dts: mt7986: add BPI-R3 nand/nor overlays Sam Shih (6): arm64: dts: mt7986: harmonize device node order arm64: dts: mt7986: add spi related device nodes arm64: dts: mt7986: add usb related device nodes arm64: dts: mt7986: add crypto related device nodes arm64: dts: mt7986: add mmc related device nodes arm64: dts: mt7986: add pcie related device nodes .../devicetree/bindings/arm/mediatek.yaml | 1 + arch/arm64/boot/dts/mediatek/Makefile | 4 + .../mediatek/mt7986a-bananapi-bpi-r3-emmc.dts | 31 ++ .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 53 ++ .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts | 67 +++ .../mediatek/mt7986a-bananapi-bpi-r3-sd.dts | 25 + .../dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi | 458 ++++++++++++++++++ arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 264 ++++++++-- arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 179 +++++++ arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 83 +++- 10 files changed, 1110 insertions(+), 55 deletions(-) create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi