| Message ID | 20221112091518.7846-1-linux@fw-web.de |
|---|---|
| Headers | show |
| Series | Add BananaPi R3 | expand |
i've noticed that i missed the Ack from Krzysztof i've got in v1 [1]
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
[1] https://patchwork.kernel.org/project/linux-mediatek/patch/20221017104141.7338-2-linux@fw-web.de/
regards Frank
i've noticed that i missed the Ack from Krzysztof i've got in v1 [1]
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
[1] https://patchwork.kernel.org/project/linux-mediatek/patch/20221017104141.7338-4-linux@fw-web.de/
regards Frank
Am 12. November 2022 10:15:12 MEZ schrieb Frank Wunderlich <linux@fw-web.de>: >From: Frank Wunderlich <frank-w@public-files.de> > >Add compatible string and clock-definition for mt7986. It needs 4 clocks >for PCIe, define them in binding. > >Signed-off-by: Frank Wunderlich <frank-w@public-files.de> >Reviewed-by: Rob Herring <robh@kernel.org> >--- >v2: >- squashed patch 2+3 (compatible and clock definition) >--- > .../bindings/pci/mediatek-pcie-gen3.yaml | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > >diff --git a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml >index 5d7369debff2..f7a02019daea 100644 >--- a/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml >+++ b/Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml >@@ -48,6 +48,7 @@ properties: > oneOf: > - items: > - enum: >+ - mediatek,mt7986-pcie > - mediatek,mt8188-pcie > - mediatek,mt8195-pcie > - const: mediatek,mt8192-pcie >@@ -78,9 +79,11 @@ properties: > - const: mac > > clocks: >+ minItems: 4 > maxItems: 6 > > clock-names: >+ minItems: 4 > maxItems: 6 > > assigned-clocks: >@@ -160,6 +163,20 @@ allOf: > - const: tl_32k > - const: peri_26m > - const: peri_mem >+ - if: >+ properties: >+ compatible: >+ contains: >+ enum: >+ - mediatek,mt7986-pcie >+ then: >+ properties: >+ clock-names: >+ items: >+ - const: pl_250m >+ - const: tl_26m >+ - const: peri_26m >+ - const: top_133m > > unevaluatedProperties: false > Missed ack i got here: https://patchwork.kernel.org/project/linux-mediatek/patch/20221029175806.14899-3-frank-w@public-files.de/ Acked-by: Jianjun Wang <jianjun.wang@mediatek.com> regards Frank
On Sat, 2022-11-12 at 10:15 +0100, Frank Wunderlich wrote: > From: Frank Wunderlich <frank-w@public-files.de> > > Add compatible string for mt7986. > > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > --- > Documentation/devicetree/bindings/phy/mediatek,tphy.yaml | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml > b/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml > index 5613cc5106e3..230a17f24966 100644 > --- a/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml > +++ b/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml > @@ -79,6 +79,7 @@ properties: > - enum: > - mediatek,mt2712-tphy > - mediatek,mt7629-tphy > + - mediatek,mt7986-tphy > - mediatek,mt8183-tphy > - mediatek,mt8186-tphy > - mediatek,mt8192-tphy Reviewed-by: Chunfeng Yun <chunfeng.yun@mediatek.com> Thanks
On Sat, 2022-11-12 at 10:15 +0100, Frank Wunderlich wrote: > From: Sam Shih <sam.shih@mediatek.com> > > This patch adds USB support for MT7986. > > Signed-off-by: Sam Shih <sam.shih@mediatek.com> > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > --- > changes compared to sams original version: > - reorder xhci-clocks based on yaml binding > --- > arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 28 ++++++++++ > arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 55 > ++++++++++++++++++++ > arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 28 ++++++++++ > 3 files changed, 111 insertions(+) > > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > index 006878e3f2b2..2b5d7ea31b4d 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > +++ b/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts > @@ -23,6 +23,24 @@ memory@40000000 { > device_type = "memory"; > reg = <0 0x40000000 0 0x40000000>; > }; > + > + reg_3p3v: regulator-3p3v { > + compatible = "regulator-fixed"; > + regulator-name = "fixed-3.3V"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + reg_5v: regulator-5v { > + compatible = "regulator-fixed"; > + regulator-name = "fixed-5V"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-boot-on; > + regulator-always-on; > + }; > }; > > &crypto { > @@ -140,6 +158,12 @@ &spi1 { > status = "okay"; > }; > > +&ssusb { > + vusb33-supply = <®_3p3v>; > + vbus-supply = <®_5v>; > + status = "okay"; > +}; > + > &switch { > ports { > #address-cells = <1>; > @@ -201,6 +225,10 @@ &uart2 { > status = "okay"; > }; > > +&usb_phy { > + status = "okay"; > +}; > + > &wifi { > status = "okay"; > pinctrl-names = "default", "dbdc"; > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > index 29da9b8ed753..2bcf48890ba8 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi > @@ -281,6 +281,61 @@ spi1: spi@1100b000 { > status = "disabled"; > }; > > + ssusb: usb@11200000 { > + compatible = "mediatek,mt7986-xhci", > + "mediatek,mtk-xhci"; > + reg = <0 0x11200000 0 0x2e00>, > + <0 0x11203e00 0 0x0100>; > + reg-names = "mac", "ippc"; > + interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&infracfg CLK_INFRA_IUSB_SYS_CK>, > + <&infracfg CLK_INFRA_IUSB_CK>, > + <&infracfg CLK_INFRA_IUSB_133_CK>, > + <&infracfg CLK_INFRA_IUSB_66M_CK>, > + <&topckgen CLK_TOP_U2U3_XHCI_SEL>; > + clock-names = "sys_ck", > + "ref_ck", > + "mcu_ck", > + "dma_ck", > + "xhci_ck"; > + phys = <&u2port0 PHY_TYPE_USB2>, > + <&u3port0 PHY_TYPE_USB3>, > + <&u2port1 PHY_TYPE_USB2>; > + status = "disabled"; > + }; > + > + usb_phy: t-phy@11e10000 { > + compatible = "mediatek,mt7986-tphy", > + "mediatek,generic-tphy-v2"; > + #address-cells = <2>; > + #size-cells = <2>; > + ranges; Please use ranges with a triplet value (child, parent, len), refers to: https://elixir.bootlin.com/linux/latest/source/arch/arm64/boot/dts/mediatek/mt2712e.dtsi#L891 Thanks a lot > + status = "disabled"; > + > + u2port0: usb-phy@11e10000 { > + reg = <0 0x11e10000 0 0x700>; > + clocks = <&topckgen > CLK_TOP_DA_U2_REFSEL>, > + <&topckgen > CLK_TOP_DA_U2_CK_1P_SEL>; > + clock-names = "ref", "da_ref"; > + #phy-cells = <1>; > + }; > + > + u3port0: usb-phy@11e10700 { > + reg = <0 0x11e10700 0 0x900>; > + clocks = <&topckgen > CLK_TOP_USB3_PHY_SEL>; > + clock-names = "ref"; > + #phy-cells = <1>; > + }; > + > + u2port1: usb-phy@11e11000 { > + reg = <0 0x11e11000 0 0x700>; > + clocks = <&topckgen > CLK_TOP_DA_U2_REFSEL>, > + <&topckgen > CLK_TOP_DA_U2_CK_1P_SEL>; > + clock-names = "ref", "da_ref"; > + #phy-cells = <1>; > + }; > + }; > + > ethsys: syscon@15000000 { > #address-cells = <1>; > #size-cells = <1>; > diff --git a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > index 2c7f1d4fb352..a98025112b5a 100644 > --- a/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > +++ b/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts > @@ -23,6 +23,24 @@ memory@40000000 { > device_type = "memory"; > reg = <0 0x40000000 0 0x40000000>; > }; > + > + reg_3p3v: regulator-3p3v { > + compatible = "regulator-fixed"; > + regulator-name = "fixed-3.3V"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + > + reg_5v: regulator-5v { > + compatible = "regulator-fixed"; > + regulator-name = "fixed-5V"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + regulator-boot-on; > + regulator-always-on; > + }; > }; > > &crypto { > @@ -167,10 +185,20 @@ &spi1 { > status = "okay"; > }; > > +&ssusb { > + vusb33-supply = <®_3p3v>; > + vbus-supply = <®_5v>; > + status = "okay"; > +}; > + > &uart0 { > status = "okay"; > }; > > +&usb_phy { > + status = "okay"; > +}; > + > &wifi { > status = "okay"; > pinctrl-names = "default", "dbdc";
Il 12/11/22 10:15, Frank Wunderlich ha scritto: > From: Frank Wunderlich <frank-w@public-files.de> > > Add compatible string for mt7986. > > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> > Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Reviewed-by: Chunfeng Yun <chunfeng.yun@mediatek.com> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Il 12/11/22 10:15, Frank Wunderlich ha scritto: > From: Frank Wunderlich <frank-w@public-files.de> > > Move the wed_pcie node to have node aligned by address. > > Fixes: 00b9903996b3 ("arm64: dts: mediatek: mt7986: add support for Wireless Ethernet Dispatch") > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Il 12/11/22 10:15, Frank Wunderlich ha scritto: > From: Frank Wunderlich <frank-w@public-files.de> > > Add support for Bananapi R3 SBC. > > - SD/eMMC support (switching first 4 bits of data-bus with sw6/D) > - all rj45 ports and both SFP working (eth1/lan4) > - all USB-Ports + SIM-Slot tested > - i2c and all uarts tested > - wifi tested (with eeprom calibration data) > > Signed-off-by: Frank Wunderlich <frank-w@public-files.de> ..snip.. > + > diff --git a/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi > new file mode 100644 > index 000000000000..def16e36f1e6 > --- /dev/null > +++ b/arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi > @@ -0,0 +1,458 @@ > +// SPDX-License-Identifier: (GPL-2.0 OR MIT) > +/* > + * Copyright (C) 2021 MediaTek Inc. > + * Authors: Sam.Shih <sam.shih@mediatek.com> > + * Frank Wunderlich <frank-w@public-files.de> > + * Daniel Golle <daniel@makrotopia.org> > + */ > + > +/dts-v1/; > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > +#include <dt-bindings/leds/common.h> > +#include <dt-bindings/pinctrl/mt65xx.h> > + > +#include "mt7986a.dtsi" > + > +/ { > + model = "Bananapi BPI-R3"; > + compatible = "bananapi,bpi-r3", "mediatek,mt7986a"; You have to add the machine compatible to devicetree/bindings/arm/mediatek.yaml or you get dtb check issues. Regards, Angelo
Am 14. November 2022 12:50:40 MEZ schrieb AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>: >Il 12/11/22 10:15, Frank Wunderlich ha scritto: >> From: Frank Wunderlich <frank-w@public-files.de> >> >> +/ { >> + model = "Bananapi BPI-R3"; >> + compatible = "bananapi,bpi-r3", "mediatek,mt7986a"; > >You have to add the machine compatible to devicetree/bindings/arm/mediatek.yaml >or you get dtb check issues. Have already: https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/commit/?h=v6.1-next/dts64&id=8c80453864efea0a0ed5ca2b399fd97f2f55a5ae >Regards, >Angelo regards Frank
Il 14/11/22 13:03, Frank Wunderlich ha scritto: > Am 14. November 2022 12:50:40 MEZ schrieb AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>: >> Il 12/11/22 10:15, Frank Wunderlich ha scritto: >>> From: Frank Wunderlich <frank-w@public-files.de> >>> >>> +/ { >>> + model = "Bananapi BPI-R3"; >>> + compatible = "bananapi,bpi-r3", "mediatek,mt7986a"; >> >> You have to add the machine compatible to devicetree/bindings/arm/mediatek.yaml >> or you get dtb check issues. > > Have already: > > https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git/commit/?h=v6.1-next/dts64&id=8c80453864efea0a0ed5ca2b399fd97f2f55a5ae > Sorry, had missed that one. In this case: Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
From: Frank Wunderlich <frank-w@public-files.de> This Series adds some Nodes to mt7986 devicetree and the BananaPi R3 This version is rebased on Matthias' DTS64 next Branch from 2022/11/11. 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/ 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: v4: - dropped RFC prefix - rebase on matthias' mtk dts-next (for 6.2) branch - added author information to overlays - fixed sfp binding error - added fix for moving wed_pcie node - readded missing compatible patches 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 (7): arm64: dts: mt7986: move wed_pcie node dt-bindings: phy: mediatek,tphy: add support for mt7986 dt-bindings: usb: mtk-xhci: add support for mt7986 dt-bindings: PCI: mediatek-gen3: add SoC based clock config dt-bindings: PCI: mediatek-gen3: add support for mt7986 arm64: dts: mt7986: add Bananapi R3 arm64: dts: mt7986: add BPI-R3 nand/nor overlays Sam Shih (4): arm64: dts: mt7986: add spi related device nodes arm64: dts: mt7986: add usb related device nodes arm64: dts: mt7986: add mmc related device nodes arm64: dts: mt7986: add pcie related device nodes .../bindings/pci/mediatek-pcie-gen3.yaml | 64 ++- .../bindings/phy/mediatek,tphy.yaml | 1 + .../bindings/usb/mediatek,mtk-xhci.yaml | 1 + arch/arm64/boot/dts/mediatek/Makefile | 4 + .../mediatek/mt7986a-bananapi-bpi-r3-emmc.dts | 31 ++ .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 55 +++ .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts | 69 +++ .../mediatek/mt7986a-bananapi-bpi-r3-sd.dts | 25 + .../dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi | 458 ++++++++++++++++++ arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 166 +++++++ arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 162 ++++++- arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 63 +++ 12 files changed, 1081 insertions(+), 18 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