further mt7988 devicetree work
Subsystems (7)
v5 cover further mt7988 devicetree work
From: Frank Wunderlich <[email protected]>
This series continues mt7988 devicetree work
- Extend cpu frequency scaling with CCI
- GPIO leds
- Basic network-support (ethernet controller + builtin switch + SFP Cages)
sorry for confusion about irq-count and names, i tried to upstream only the needed parts. I got the information that reserved irqs can be freely used (and not "blocked") very late.
depencies (i hope this list is complete and latest patches/series linked):
support interrupt-names is optional again as i re-added the reserved IRQs (they are not unusable as i thought and can allow features in future)
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
for SFP-Function (macs currently disabled):
PCS clearance which is a 1.5 year discussion currently ongoing
Daniel asked netdev for a way 2 go:
https://lore.kernel.org/netdev/[email protected]/
e.g. something like this (one of):
* https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/ (v6)
* https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/ (v4)
* https://patchwork.kernel.org/project/netdevbpf/patch/ba4e359584a6b3bc4b3470822c42186d5b0856f9.1721910728.git.daniel@makrotopia.org/
full usxgmii driver:
https://patchwork.kernel.org/project/netdevbpf/patch/07845ec900ba41ff992875dce12c622277592c32.1702352117.git.daniel@makrotopia.org/
first PCS-discussion is here:
https://patchwork.kernel.org/project/netdevbpf/patch/8aa905080bdb6760875d62cb3b2b41258837f80e.1702352117.git.daniel@makrotopia.org/
some more here:
https://lore.kernel.org/netdev/[email protected]/
and then dts nodes for sgmiisys+usxgmii+2g5 firmware
when above depencies are solved the mac1/2 can be enabled and 2.5G phy/SFP slots will work.
changes:
v5:
- add reserved irqs and change names
- update binding for 8 irqs with different names (rx,tx => fe1+fe2, rx-ringX => pdmaX) (dropped Robs RB due to this change again, sorry)
v4:
net-binding:
- allow interrupt names and increase max interrupts to 6 because of RSS/LRO interrupts (dropped Robs RB due to this change)
dts-patches:
- add interrupts for RSS/LRO and interrupt-names for ethernet node
- eth-reg and clock whitespace-fix
- comment for fixed-link on gmac0
- drop phy-mode properties as suggested by andrew
- drop phy-connection-type on 2g5 board
- reorder some properties
- update 2g5 phy node
- unit-name dec instead of hex to match reg property
- move compatible before reg
- drop phy-mode
v3:
- dropped patches already applied (SPI+thermal)
- added soc specific cci compatible (new binding patch + changed dts)
- enable 2g5 phy because driver is now merged
- add patch for cleaning up unnecessary pins
- add patch for gpio-leds
- add patch for adding ethernet aliases
v2:
- change reg to list of items in eth binding
- changed mt7530 binding:
- unevaluatedProperties=false
- mediatek,pio subproperty
- from patternProperty to property
- board specific properties like led function and labels moved to bpi-r4 dtsi
Frank Wunderlich (13):
dt-bindings: net: mediatek,net: update for mt7988
dt-bindings: net: dsa: mediatek,mt7530: add dsa-port definition for
mt7988
dt-bindings: net: dsa: mediatek,mt7530: add internal mdio bus
dt-bindings: interconnect: add mt7988-cci compatible
arm64: dts: mediatek: mt7988: add cci node
arm64: dts: mediatek: mt7988: add basic ethernet-nodes
arm64: dts: mediatek: mt7988: add switch node
arm64: dts: mediatek: mt7988a-bpi-r4: add proc-supply for cci
arm64: dts: mediatek: mt7988a-bpi-r4: drop unused pins
arm64: dts: mediatek: mt7988a-bpi-r4: add gpio leds
arm64: dts: mediatek: mt7988a-bpi-r4: add aliases for ethernet
arm64: dts: mediatek: mt7988a-bpi-r4: add sfp cages and link to gmac
arm64: dts: mediatek: mt7988a-bpi-r4: configure switch phys and leds
.../bindings/interconnect/mediatek,cci.yaml | 11 +- .../bindings/net/dsa/mediatek,mt7530.yaml | 24 +- .../devicetree/bindings/net/mediatek,net.yaml | 30 +- .../mediatek/mt7988a-bananapi-bpi-r4-2g5.dts | 11 + .../dts/mediatek/mt7988a-bananapi-bpi-r4.dts | 19 ++ .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 198 ++++++----- arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 309 +++++++++++++++++- 7 files changed, 502 insertions(+), 100 deletions(-)
Signature · 1 line
2.43.0
PATCH v5 1/13 dt-bindings: net: mediatek,net: update for mt7988
From: Frank Wunderlich <[email protected]>
Update binding for mt7988 which has 3 gmac and 2 reg items.
MT7988 has 4 FE IRQs (currently only 2 are used) and the 4 IRQs for use with RSS/LRO later.
Add interrupt-names to make them accessible by name.
---
v5:
- fix v4 logmessage and change description a bit describing how i get the irq count.
- update binding for 8 irqs with different names (rx,tx => fe0..fe3) including the 2 reserved irqs which can be used later
- change rx-ringX to pdmaX to be closer to hardware documentation
v4:
- increase max interrupts to 6 because of adding RSS/LRO interrupts (4) and dropping 2 reserved irqs (0+3) around rx+tx
- dropped Robs RB due to this change
- allow interrupt names
- add interrupt-names without reserved IRQs on mt7988
this requires mtk driver patch:
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/
v2:
- change reg to list of items
--- .../devicetree/bindings/net/mediatek,net.yaml | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/net/mediatek,net.yaml +26 -4
@@ -28,7 +28,10 @@ properties: - ralink,rt5350-eth reg: - maxItems: 1 + items: + - description: Register for accessing the MACs. + - description: SoC internal SRAM used for DMA operations. + minItems: 1 clocks: minItems: 2
@@ -40,7 +43,11 @@ properties: interrupts: minItems: 1 - maxItems: 4 + maxItems: 8 + + interrupt-names: + minItems: 1 + maxItems: 8 power-domains: maxItems: 1
@@ -348,7 +355,19 @@ allOf: then: properties: interrupts: - minItems: 4 + minItems: 2 + + interrupt-names: + minItems: 2 + items: + - const: fe0 + - const: fe1 + - const: fe2 + - const: fe3 + - const: pdma0 + - const: pdma1 + - const: pdma2 + - const: pdma3 clocks: minItems: 24
@@ -381,8 +400,11 @@ allOf: - const: xgp2 - const: xgp3 + reg: + minItems: 2 + patternProperties: - "^mac@[0-1]$": + "^mac@[0-2]$": type: object unevaluatedProperties: false allOf:
Signature · 1 line
2.43.0
PATCH v5 3/13 dt-bindings: net: dsa: mediatek,mt7530: add internal mdio bus
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Mt7988 buildin switch has own mdio bus where ge-phys are connected. Add related property for this.
---
v2:
- change from patternproperty to property
- add unevaluatedProperties and mediatek,pio subproperty
--- .../devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+)
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +10 -0
@@ -136,6 +136,16 @@ properties: See Documentation/devicetree/bindings/regulator/mt6323-regulator.txt for details for the regulator setup on these boards. + mdio: + $ref: /schemas/net/mdio.yaml# + unevaluatedProperties: false + + properties: + mediatek,pio: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle pointing to the mediatek pinctrl node. + mediatek,mcm: type: boolean description:
Signature · 1 line
2.43.0
PATCH v5 4/13 dt-bindings: interconnect: add mt7988-cci compatible
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add compatible for Mediatek MT7988 SoC with mediatek,mt8183-cci fallback which is taken by driver.
---
v2:
- no RFC
- drop "items" as sugested by conor
--- .../bindings/interconnect/mediatek,cci.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/interconnect/mediatek,cci.yaml +8 -3
@@ -17,9 +17,14 @@ description: | properties: compatible: - enum: - - mediatek,mt8183-cci - - mediatek,mt8186-cci + oneOf: + - enum: + - mediatek,mt8183-cci + - mediatek,mt8186-cci + - items: + - enum: + - mediatek,mt7988-cci + - const: mediatek,mt8183-cci clocks: items:
Signature · 1 line
2.43.0
PATCH v5 10/13 arm64: dts: mediatek: mt7988a-bpi-r4: add gpio leds
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Bananapi R4 has a green and a blue led which can be switched by gpio. Green led is for running state so default on.
Green led also shares pin with eeprom writeprotect where led off allows writing to eeprom.
--- .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +19 -0
@@ -21,6 +21,25 @@ fan: pwm-fan { status = "okay"; }; + gpio-leds { + compatible = "gpio-leds"; + + led_green: led-green { + function = LED_FUNCTION_STATUS; + color = <LED_COLOR_ID_GREEN>; + gpios = <&pio 79 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + + led_blue: led-blue { + function = LED_FUNCTION_WPS; + color = <LED_COLOR_ID_BLUE>; + gpios = <&pio 63 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + }; + + reg_1p8v: regulator-1p8v { compatible = "regulator-fixed"; regulator-name = "fixed-1.8V";
Signature · 1 line
2.43.0
PATCH v5 6/13 arm64: dts: mediatek: mt7988: add basic ethernet-nodes
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add basic ethernet related nodes.
Mac1+2 needs pcs (sgmii+usxgmii) to work correctly which will be linked later when driver is merged.
---
v5:
- add reserved irqs and change name to fe0..fe3
- change rx-ringX to pdmaX to be closer to documentation
v4:
- comment for fixed-link on gmac0
- update 2g5 phy node
- unit-name dec instead of hex to match reg property
- move compatible before reg
- drop phy-mode
- add interrupts for RSS
- add interrupt-names and drop reserved irqs for ethernet
- some reordering
- eth-reg and clock whitespace-fix based on angelos review
--- arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 128 +++++++++++++++++++++- 1 file changed, 125 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/mediatek/mt7988a.dtsi +125 -3
@@ -680,7 +680,28 @@ xphyu3port0: usb-phy@11e13000 { }; }; - clock-controller@11f40000 { + xfi_tphy0: phy@11f20000 { + compatible = "mediatek,mt7988-xfi-tphy"; + reg = <0 0x11f20000 0 0x10000>; + clocks = <&xfi_pll CLK_XFIPLL_PLL_EN>, + <&topckgen CLK_TOP_XFI_PHY_0_XTAL_SEL>; + clock-names = "xfipll", "topxtal"; + resets = <&watchdog 14>; + mediatek,usxgmii-performance-errata; + #phy-cells = <0>; + }; + + xfi_tphy1: phy@11f30000 { + compatible = "mediatek,mt7988-xfi-tphy"; + reg = <0 0x11f30000 0 0x10000>; + clocks = <&xfi_pll CLK_XFIPLL_PLL_EN>, + <&topckgen CLK_TOP_XFI_PHY_1_XTAL_SEL>; + clock-names = "xfipll", "topxtal"; + resets = <&watchdog 15>; + #phy-cells = <0>; + }; + + xfi_pll: clock-controller@11f40000 { compatible = "mediatek,mt7988-xfi-pll"; reg = <0 0x11f40000 0 0x1000>; resets = <&watchdog 16>;
@@ -714,19 +735,120 @@ phy_calibration_p3: calib@97c { }; }; - clock-controller@15000000 { + ethsys: clock-controller@15000000 { compatible = "mediatek,mt7988-ethsys", "syscon"; reg = <0 0x15000000 0 0x1000>; #clock-cells = <1>; #reset-cells = <1>; }; - clock-controller@15031000 { + ethwarp: clock-controller@15031000 { compatible = "mediatek,mt7988-ethwarp"; reg = <0 0x15031000 0 0x1000>; #clock-cells = <1>; #reset-cells = <1>; }; + + eth: ethernet@15100000 { + compatible = "mediatek,mt7988-eth"; + reg = <0 0x15100000 0 0x80000>, <0 0x15400000 0 0x200000>; + interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "fe0", "fe1", "fe2", "fe3", "pdma0", + "pdma1", "pdma2", "pdma3"; + clocks = <ðsys CLK_ETHDMA_CRYPT0_EN>, + <ðsys CLK_ETHDMA_FE_EN>, + <ðsys CLK_ETHDMA_GP2_EN>, + <ðsys CLK_ETHDMA_GP1_EN>, + <ðsys CLK_ETHDMA_GP3_EN>, + <ðwarp CLK_ETHWARP_WOCPU2_EN>, + <ðwarp CLK_ETHWARP_WOCPU1_EN>, + <ðwarp CLK_ETHWARP_WOCPU0_EN>, + <ðsys CLK_ETHDMA_ESW_EN>, + <&topckgen CLK_TOP_ETH_GMII_SEL>, + <&topckgen CLK_TOP_ETH_REFCK_50M_SEL>, + <&topckgen CLK_TOP_ETH_SYS_200M_SEL>, + <&topckgen CLK_TOP_ETH_SYS_SEL>, + <&topckgen CLK_TOP_ETH_XGMII_SEL>, + <&topckgen CLK_TOP_ETH_MII_SEL>, + <&topckgen CLK_TOP_NETSYS_SEL>, + <&topckgen CLK_TOP_NETSYS_500M_SEL>, + <&topckgen CLK_TOP_NETSYS_PAO_2X_SEL>, + <&topckgen CLK_TOP_NETSYS_SYNC_250M_SEL>, + <&topckgen CLK_TOP_NETSYS_PPEFB_250M_SEL>, + <&topckgen CLK_TOP_NETSYS_WARP_SEL>, + <ðsys CLK_ETHDMA_XGP1_EN>, + <ðsys CLK_ETHDMA_XGP2_EN>, + <ðsys CLK_ETHDMA_XGP3_EN>; + clock-names = "crypto", "fe", "gp2", "gp1", "gp3", + "ethwarp_wocpu2", "ethwarp_wocpu1", + "ethwarp_wocpu0", "esw", "top_eth_gmii_sel", + "top_eth_refck_50m_sel", "top_eth_sys_200m_sel", + "top_eth_sys_sel", "top_eth_xgmii_sel", + "top_eth_mii_sel", "top_netsys_sel", + "top_netsys_500m_sel", "top_netsys_pao_2x_sel", + "top_netsys_sync_250m_sel", + "top_netsys_ppefb_250m_sel", + "top_netsys_warp_sel","xgp1", "xgp2", "xgp3"; + assigned-clocks = <&topckgen CLK_TOP_NETSYS_2X_SEL>, + <&topckgen CLK_TOP_NETSYS_GSW_SEL>, + <&topckgen CLK_TOP_USXGMII_SBUS_0_SEL>, + <&topckgen CLK_TOP_USXGMII_SBUS_1_SEL>, + <&topckgen CLK_TOP_SGM_0_SEL>, + <&topckgen CLK_TOP_SGM_1_SEL>; + assigned-clock-parents = <&apmixedsys CLK_APMIXED_NET2PLL>, + <&topckgen CLK_TOP_NET1PLL_D4>, + <&topckgen CLK_TOP_NET1PLL_D8_D4>, + <&topckgen CLK_TOP_NET1PLL_D8_D4>, + <&apmixedsys CLK_APMIXED_SGMPLL>, + <&apmixedsys CLK_APMIXED_SGMPLL>; + #address-cells = <1>; + #size-cells = <0>; + mediatek,ethsys = <ðsys>; + mediatek,infracfg = <&topmisc>; + + gmac0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "internal"; + + /* Connected to internal switch */ + fixed-link { + speed = <10000>; + full-duplex; + pause; + }; + }; + + gmac1: mac@1 { + compatible = "mediatek,eth-mac"; + reg = <1>; + status = "disabled"; + }; + + gmac2: mac@2 { + compatible = "mediatek,eth-mac"; + reg = <2>; + status = "disabled"; + }; + + mdio_bus: mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + + /* internal 2.5G PHY */ + int_2p5g_phy: ethernet-phy@15 { + compatible = "ethernet-phy-ieee802.3-c45"; + reg = <15>; + }; + }; + }; }; thermal-zones {
Signature · 1 line
2.43.0
PATCH v5 8/13 arm64: dts: mediatek: mt7988a-bpi-r4: add proc-supply for cci
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
CCI requires proc-supply. Add it on board level.
--- arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +4 -0
@@ -40,6 +40,10 @@ reg_3p3v: regulator-3p3v { }; }; +&cci { + proc-supply = <&rt5190_buck3>; +}; + &cpu0 { proc-supply = <&rt5190_buck3>; };
Signature · 1 line
2.43.0
PATCH v5 12/13 arm64: dts: mediatek: mt7988a-bpi-r4: add sfp cages and link to gmac
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add SFP cages to Bananapi-R4 board. The 2.5g phy variant only contains the wan-SFP, so add this to common dtsi and the lan-sfp only to the dual-SFP variant.
---
v4:
- update 2g5-board (reorder and drop phy-connection-type)
- order sfp properties
v3:
- enable mac with 2.5g phy on r4 phy variant because driver is now mainline
--- .../mediatek/mt7988a-bananapi-bpi-r4-2g5.dts | 11 +++++++++++ .../dts/mediatek/mt7988a-bananapi-bpi-r4.dts | 19 +++++++++++++++++++ .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 19 +++++++++++++++++++ 3 files changed, 49 insertions(+)
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4-2g5.dts +11 -0
@@ -9,3 +9,14 @@ / { model = "Banana Pi BPI-R4 (1x SFP+, 1x 2.5GbE)"; chassis-type = "embedded"; }; + +&gmac1 { + phy = <&int_2p5g_phy>; + phy-mode = "internal"; + status = "okay"; +}; + +&int_2p5g_phy { + pinctrl-0 = <&i2p5gbe_led0_pins>; + pinctrl-names = "i2p5gbe-led"; +};
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dts +19 -0
@@ -8,6 +8,25 @@ / { compatible = "bananapi,bpi-r4", "mediatek,mt7988a"; model = "Banana Pi BPI-R4 (2x SFP+)"; chassis-type = "embedded"; + + /* SFP2 cage (LAN) */ + sfp2: sfp2 { + compatible = "sff,sfp"; + i2c-bus = <&i2c_sfp2>; + maximum-power-milliwatt = <3000>; + + los-gpios = <&pio 2 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&pio 83 GPIO_ACTIVE_LOW>; + rate-select0-gpios = <&pio 3 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&pio 0 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&pio 1 GPIO_ACTIVE_HIGH>; + }; +}; + +&gmac1 { + managed = "in-band-status"; + phy-mode = "usxgmii"; + sfp = <&sfp2>; }; &pca9545 {
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +19 -0
@@ -63,6 +63,19 @@ reg_3p3v: regulator-3p3v { regulator-boot-on; regulator-always-on; }; + + /* SFP1 cage (WAN) */ + sfp1: sfp1 { + compatible = "sff,sfp"; + i2c-bus = <&i2c_sfp1>; + maximum-power-milliwatt = <3000>; + + los-gpios = <&pio 54 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&pio 82 GPIO_ACTIVE_LOW>; + rate-select0-gpios = <&pio 21 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&pio 70 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&pio 69 GPIO_ACTIVE_HIGH>; + }; }; &cci {
@@ -133,6 +146,12 @@ map-cpu-active-low { }; }; +&gmac2 { + managed = "in-band-status"; + phy-mode = "usxgmii"; + sfp = <&sfp1>; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>;
Signature · 1 line
2.43.0
PATCH v5 2/13 dt-bindings: net: dsa: mediatek,mt7530: add dsa-port definition for mt7988
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add own dsa-port binding for SoC with internal switch where only phy-mode 'internal' is valid.
--- .../bindings/net/dsa/mediatek,mt7530.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +13 -1
@@ -190,6 +190,18 @@ required: - reg $defs: + builtin-dsa-port: + patternProperties: + "^(ethernet-)?ports$": + patternProperties: + "^(ethernet-)?port@[0-6]$": + if: + required: [ ethernet ] + then: + properties: + phy-mode: + const: internal + mt7530-dsa-port: patternProperties: "^(ethernet-)?ports$":
@@ -297,7 +309,7 @@ allOf: - airoha,en7581-switch - airoha,an7583-switch then: - $ref: "#/$defs/mt7530-dsa-port" + $ref: "#/$defs/builtin-dsa-port" properties: gpio-controller: false mediatek,mcm: false
Signature · 1 line
2.43.0
PATCH v5 5/13 arm64: dts: mediatek: mt7988: add cci node
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add cci devicetree node for cpu frequency scaling.
---
v3:
- add mt7988-cci compatible as suggested by angelo
--- arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 33 +++++++++++++++++++++++ 1 file changed, 33 insertions(+)
arch/arm64/boot/dts/mediatek/mt7988a.dtsi +33 -0
@@ -12,6 +12,35 @@ / { #address-cells = <2>; #size-cells = <2>; + cci: cci { + compatible = "mediatek,mt7988-cci", "mediatek,mt8183-cci"; + clocks = <&mcusys CLK_MCU_BUS_DIV_SEL>, + <&topckgen CLK_TOP_XTAL>; + clock-names = "cci", "intermediate"; + operating-points-v2 = <&cci_opp>; + }; + + cci_opp: opp-table-cci { + compatible = "operating-points-v2"; + opp-shared; + opp-480000000 { + opp-hz = /bits/ 64 <480000000>; + opp-microvolt = <850000>; + }; + opp-660000000 { + opp-hz = /bits/ 64 <660000000>; + opp-microvolt = <850000>; + }; + opp-900000000 { + opp-hz = /bits/ 64 <900000000>; + opp-microvolt = <850000>; + }; + opp-1080000000 { + opp-hz = /bits/ 64 <1080000000>; + opp-microvolt = <900000>; + }; + }; + cpus { #address-cells = <1>; #size-cells = <0>;
@@ -25,6 +54,7 @@ cpu0: cpu@0 { <&topckgen CLK_TOP_XTAL>; clock-names = "cpu", "intermediate"; operating-points-v2 = <&cluster0_opp>; + mediatek,cci = <&cci>; }; cpu1: cpu@1 {
@@ -36,6 +66,7 @@ cpu1: cpu@1 { <&topckgen CLK_TOP_XTAL>; clock-names = "cpu", "intermediate"; operating-points-v2 = <&cluster0_opp>; + mediatek,cci = <&cci>; }; cpu2: cpu@2 {
@@ -47,6 +78,7 @@ cpu2: cpu@2 { <&topckgen CLK_TOP_XTAL>; clock-names = "cpu", "intermediate"; operating-points-v2 = <&cluster0_opp>; + mediatek,cci = <&cci>; }; cpu3: cpu@3 {
@@ -58,6 +90,7 @@ cpu3: cpu@3 { <&topckgen CLK_TOP_XTAL>; clock-names = "cpu", "intermediate"; operating-points-v2 = <&cluster0_opp>; + mediatek,cci = <&cci>; }; cluster0_opp: opp-table-0 {
Signature · 1 line
2.43.0
PATCH v5 7/13 arm64: dts: mediatek: mt7988: add switch node
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add mt7988 builtin mt753x switch nodes.
---
v4:
- drop phy-mode for gsw-phy
- reorder phy-mode after phy-handle
- drop interrupt parent from switch
v2:
- drop labels and led-function too (have to be in board)
--- arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 148 ++++++++++++++++++++++ 1 file changed, 148 insertions(+)
arch/arm64/boot/dts/mediatek/mt7988a.dtsi +148 -0
@@ -742,6 +742,154 @@ ethsys: clock-controller@15000000 { #reset-cells = <1>; }; + switch: switch@15020000 { + compatible = "mediatek,mt7988-switch"; + reg = <0 0x15020000 0 0x8000>; + interrupt-controller; + #interrupt-cells = <1>; + interrupts = <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>; + resets = <ðwarp MT7988_ETHWARP_RST_SWITCH>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + gsw_port0: port@0 { + reg = <0>; + phy-handle = <&gsw_phy0>; + phy-mode = "internal"; + }; + + gsw_port1: port@1 { + reg = <1>; + phy-handle = <&gsw_phy1>; + phy-mode = "internal"; + }; + + gsw_port2: port@2 { + reg = <2>; + phy-handle = <&gsw_phy2>; + phy-mode = "internal"; + }; + + gsw_port3: port@3 { + reg = <3>; + phy-handle = <&gsw_phy3>; + phy-mode = "internal"; + }; + + port@6 { + reg = <6>; + ethernet = <&gmac0>; + phy-mode = "internal"; + + fixed-link { + speed = <10000>; + full-duplex; + pause; + }; + }; + }; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + mediatek,pio = <&pio>; + + gsw_phy0: ethernet-phy@0 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <0>; + interrupts = <0>; + nvmem-cells = <&phy_calibration_p0>; + nvmem-cell-names = "phy-cal-data"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + gsw_phy0_led0: led@0 { + reg = <0>; + status = "disabled"; + }; + + gsw_phy0_led1: led@1 { + reg = <1>; + status = "disabled"; + }; + }; + }; + + gsw_phy1: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + interrupts = <1>; + nvmem-cells = <&phy_calibration_p1>; + nvmem-cell-names = "phy-cal-data"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + gsw_phy1_led0: led@0 { + reg = <0>; + status = "disabled"; + }; + + gsw_phy1_led1: led@1 { + reg = <1>; + status = "disabled"; + }; + }; + }; + + gsw_phy2: ethernet-phy@2 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <2>; + interrupts = <2>; + nvmem-cells = <&phy_calibration_p2>; + nvmem-cell-names = "phy-cal-data"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + gsw_phy2_led0: led@0 { + reg = <0>; + status = "disabled"; + }; + + gsw_phy2_led1: led@1 { + reg = <1>; + status = "disabled"; + }; + }; + }; + + gsw_phy3: ethernet-phy@3 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <3>; + interrupts = <3>; + nvmem-cells = <&phy_calibration_p3>; + nvmem-cell-names = "phy-cal-data"; + + leds { + #address-cells = <1>; + #size-cells = <0>; + + gsw_phy3_led0: led@0 { + reg = <0>; + status = "disabled"; + }; + + gsw_phy3_led1: led@1 { + reg = <1>; + status = "disabled"; + }; + }; + }; + }; + }; + ethwarp: clock-controller@15031000 { compatible = "mediatek,mt7988-ethwarp"; reg = <0 0x15031000 0 0x1000>;
Signature · 1 line
2.43.0
PATCH v5 9/13 arm64: dts: mediatek: mt7988a-bpi-r4: drop unused pins
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Pins were moved from SoC dtsi to Board level dtsi without cleaning up to needed ones. Drop the unused pins now.
--- .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 89 ------------------- 1 file changed, 89 deletions(-)
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +0 -89
@@ -223,18 +223,6 @@ &pcie3 { }; &pio { - mdio0_pins: mdio0-pins { - mux { - function = "eth"; - groups = "mdc_mdio0"; - }; - - conf { - pins = "SMI_0_MDC", "SMI_0_MDIO"; - drive-strength = <8>; - }; - }; - i2c0_pins: i2c0-g0-pins { mux { function = "i2c";
@@ -249,20 +237,6 @@ mux { }; }; - i2c1_sfp_pins: i2c1-sfp-g0-pins { - mux { - function = "i2c"; - groups = "i2c1_sfp"; - }; - }; - - i2c2_0_pins: i2c2-g0-pins { - mux { - function = "i2c"; - groups = "i2c2_0"; - }; - }; - i2c2_1_pins: i2c2-g1-pins { mux { function = "i2c";
@@ -298,34 +272,6 @@ mux { }; }; - gbe0_led1_pins: gbe0-led1-pins { - mux { - function = "led"; - groups = "gbe0_led1"; - }; - }; - - gbe1_led1_pins: gbe1-led1-pins { - mux { - function = "led"; - groups = "gbe1_led1"; - }; - }; - - gbe2_led1_pins: gbe2-led1-pins { - mux { - function = "led"; - groups = "gbe2_led1"; - }; - }; - - gbe3_led1_pins: gbe3-led1-pins { - mux { - function = "led"; - groups = "gbe3_led1"; - }; - }; - i2p5gbe_led0_pins: 2p5gbe-led0-pins { mux { function = "led";
@@ -333,13 +279,6 @@ mux { }; }; - i2p5gbe_led1_pins: 2p5gbe-led1-pins { - mux { - function = "led"; - groups = "2p5gbe_led1"; - }; - }; - mmc0_pins_emmc_45: mmc0-emmc-45-pins { mux { function = "flash";
@@ -361,40 +300,12 @@ mux { }; }; - snfi_pins: snfi-pins { - mux { - function = "flash"; - groups = "snfi"; - }; - }; - - spi0_pins: spi0-pins { - mux { - function = "spi"; - groups = "spi0"; - }; - }; - spi0_flash_pins: spi0-flash-pins { mux { function = "spi"; groups = "spi0", "spi0_wp_hold"; }; }; - - spi2_pins: spi2-pins { - mux { - function = "spi"; - groups = "spi2"; - }; - }; - - spi2_flash_pins: spi2-flash-pins { - mux { - function = "spi"; - groups = "spi2", "spi2_wp_hold"; - }; - }; }; &pwm {
Signature · 1 line
2.43.0
PATCH v5 11/13 arm64: dts: mediatek: mt7988a-bpi-r4: add aliases for ethernet
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add aliases for gmacs to allow bootloader setting mac-adresses.
--- arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 6 ++++++ 1 file changed, 6 insertions(+)
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +6 -0
@@ -8,6 +8,12 @@ #include "mt7988a.dtsi" / { + aliases { + ethernet0 = &gmac0; + ethernet1 = &gmac1; + ethernet2 = &gmac2; + }; + chosen { stdout-path = "serial0:115200n8"; };
Signature · 1 line
2.43.0
PATCH v5 13/13 arm64: dts: mediatek: mt7988a-bpi-r4: configure switch phys and leds
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Assign pinctrl to switch phys and leds.
---
v4:
- reorder switch phy(-led) properties
v2:
- add labels and led-function and include after dropping from soc dtsi
--- .../dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+)
arch/arm64/boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi +61 -0
@@ -4,6 +4,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/regulator/richtek,rt5190a-regulator.h> +#include <dt-bindings/leds/common.h> #include "mt7988a.dtsi"
@@ -152,6 +153,66 @@ &gmac2 { sfp = <&sfp1>; }; +&gsw_phy0 { + pinctrl-0 = <&gbe0_led0_pins>; + pinctrl-names = "gbe-led"; +}; + +&gsw_phy0_led0 { + function = LED_FUNCTION_WAN; + color = <LED_COLOR_ID_GREEN>; + status = "okay"; +}; + +&gsw_port0 { + label = "wan"; +}; + +&gsw_phy1 { + pinctrl-0 = <&gbe1_led0_pins>; + pinctrl-names = "gbe-led"; +}; + +&gsw_phy1_led0 { + function = LED_FUNCTION_LAN; + color = <LED_COLOR_ID_GREEN>; + status = "okay"; +}; + +&gsw_port1 { + label = "lan1"; +}; + +&gsw_phy2 { + pinctrl-0 = <&gbe2_led0_pins>; + pinctrl-names = "gbe-led"; +}; + +&gsw_phy2_led0 { + function = LED_FUNCTION_LAN; + color = <LED_COLOR_ID_GREEN>; + status = "okay"; +}; + +&gsw_port2 { + label = "lan2"; +}; + +&gsw_phy3 { + pinctrl-0 = <&gbe3_led0_pins>; + pinctrl-names = "gbe-led"; +}; + +&gsw_phy3_led0 { + function = LED_FUNCTION_LAN; + color = <LED_COLOR_ID_GREEN>; + status = "okay"; +}; + +&gsw_port3 { + label = "lan3"; +}; + &i2c0 { pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>;
Signature · 1 line
2.43.0
Re: [PATCH v5 01/13] dt-bindings: net: mediatek,net: update for mt7988
In reply to Frank WunderlichQuoted 50 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Update binding for mt7988 which has 3 gmac and 2 reg items.
MT7988 has 4 FE IRQs (currently only 2 are used) and the 4 IRQs for use with RSS/LRO later.
Add interrupt-names to make them accessible by name.
Signed-off-by Frank Wunderlich <[email protected]>---
v5:
- fix v4 logmessage and change description a bit describing how i get the irq count.
- update binding for 8 irqs with different names (rx,tx => fe0..fe3) including the 2 reserved irqs which can be used later
- change rx-ringX to pdmaX to be closer to hardware documentationv4:
- increase max interrupts to 6 because of adding RSS/LRO interrupts (4) and dropping 2 reserved irqs (0+3) around rx+tx
- dropped Robs RB due to this change
- allow interrupt names
- add interrupt-names without reserved IRQs on mt7988
this requires mtk driver patch:
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/v2:
- change reg to list of items--- .../devicetree/bindings/net/mediatek,net.yaml | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-)Documentation/devicetree/bindings/net/mediatek,net.yaml +4
-1@@ -28,7 +28,10 @@ properties: - ralink,rt5350-eth reg: - maxItems: 1 + items: + - description: Register for accessing the MACs. + - description: SoC internal SRAM used for DMA operations. + minItems: 1 clocks: minItems: 2
Documentation/devicetree/bindings/net/mediatek,net.yaml properties: · line 50
Quoted 9 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +5
-1@@ -40,7 +43,11 @@ properties: interrupts: minItems: 1 - maxItems: 4 + maxItems: 8 + + interrupt-names: + minItems: 1 + maxItems: 8
Shouldn't interrupt-names only be required for MT7988 (and future SoCs)? Like this at least one entry in interrupt-names is now always required.
Re: [PATCH v5 01/13] dt-bindings: net: mediatek,net: update for mt7988
Am 20. Juni 2025 12:31:41 MESZ schrieb Daniel Golle <[email protected]>:
Quoted 14 lines · Frank Wunderlich
Documentation/devicetree/bindings/net/mediatek,net.yaml properties: · line 50
Quoted 10 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +5
-1@@ -40,7 +43,11 @@ properties: interrupts: minItems: 1 - maxItems: 4 + maxItems: 8 + + interrupt-names: + minItems: 1 + maxItems: 8Shouldn't interrupt-names only be required for MT7988 (and future SoCs)? Like this at least one entry in interrupt-names is now always required.
No,this section only allows this property and it
is not listed in required section and so an
optional property. But if it is defined in
devicetree it needs 1 to 8 items.
regards Frank
Aw: [PATCH v5 06/13] arm64: dts: mediatek: mt7988: add basic ethernet-nodes
In reply to Frank Wunderlicharch/arm64/boot/dts/mediatek/mt7988a.dtsi phy_calibration_p3: calib@97c { · line 758
Quoted 10 lines
Gesendet: Freitag, 20. Juni 2025 um 10:35
Von: "Frank Wunderlich" <[email protected]>arch/arm64/boot/dts/mediatek/mt7988a.dtsi +8
-0+ + eth: ethernet@15100000 { + compatible = "mediatek,mt7988-eth"; + reg = <0 0x15100000 0 0x80000>, <0 0x15400000 0 0x200000>; + interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,
sorry, i messed up the whitespaces (spaces instead of tabs), fixed it locally but seems not recreated the patch-files (and not run checkpatch.pl again). I send new version when net-binding is reviewed, ok?
Quoted 6 lines
arch/arm64/boot/dts/mediatek/mt7988a.dtsi +6
-0+ <GIC_SPI 189 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "fe0", "fe1", "fe2", "fe3", "pdma0", + "pdma1", "pdma2", "pdma3";
Re: [PATCH v5 01/13] dt-bindings: net: mediatek,net: update for mt7988
In reply to Frank WunderlichQuoted 3 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Update binding for mt7988 which has 3 gmac and 2 reg items.
Why?
Quoted 35 lines
MT7988 has 4 FE IRQs (currently only 2 are used) and the 4 IRQs for use with RSS/LRO later.
Add interrupt-names to make them accessible by name.
Signed-off-by Frank Wunderlich <[email protected]>---
v5:
- fix v4 logmessage and change description a bit describing how i get the irq count.
- update binding for 8 irqs with different names (rx,tx => fe0..fe3) including the 2 reserved irqs which can be used later
- change rx-ringX to pdmaX to be closer to hardware documentationv4:
- increase max interrupts to 6 because of adding RSS/LRO interrupts (4) and dropping 2 reserved irqs (0+3) around rx+tx
- dropped Robs RB due to this change
- allow interrupt names
- add interrupt-names without reserved IRQs on mt7988
this requires mtk driver patch:
https://patchwork.kernel.org/project/netdevbpf/patch/[email protected]/v2:
- change reg to list of items--- .../devicetree/bindings/net/mediatek,net.yaml | 30 ++++++++++++++++--- 1 file changed, 26 insertions(+), 4 deletions(-)Documentation/devicetree/bindings/net/mediatek,net.yaml +0
-0
Documentation/devicetree/bindings/net/mediatek,net.yaml properties: · line 33
Quoted 7 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +3
-1@@ -28,7 +28,10 @@ properties: - ralink,rt5350-eth reg: - maxItems: 1 + items: + - description: Register for accessing the MACs. + - description: SoC internal SRAM used for DMA operations.
SRAM like mmio-sram?
Quoted 5 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +1
-0+ minItems: 1 clocks: minItems: 2
Documentation/devicetree/bindings/net/mediatek,net.yaml properties: · line 50
Quoted 9 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +5
-1@@ -40,7 +43,11 @@ properties: interrupts: minItems: 1 - maxItems: 4 + maxItems: 8 + + interrupt-names: + minItems: 1 + maxItems: 8
So now all variants get unspecified names? You need to define it. Or just drop.
Documentation/devicetree/bindings/net/mediatek,net.yaml allOf: · line 358
Quoted 9 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +1
-1power-domains: maxItems: 1@@ -348,7 +355,19 @@ allOf: then: properties: interrupts: - minItems: 4 + minItems: 2
Why? Didn't you say it has 4?
Quoted 16 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +12
-0+ + interrupt-names: + minItems: 2 + items: + - const: fe0 + - const: fe1 + - const: fe2 + - const: fe3 + - const: pdma0 + - const: pdma1 + - const: pdma2 + - const: pdma3 clocks: minItems: 24
Documentation/devicetree/bindings/net/mediatek,net.yaml allOf: · line 404
Quoted 5 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +2
-0@@ -381,8 +400,11 @@ allOf: - const: xgp2 - const: xgp3 + reg: + minItems: 2
And all else? Why they got 2 reg and 8 interrupts now? All variants are now affected/changed. We have been here: you need to write specific bindings.
Best regards,
Krzysztof
Re: [PATCH v5 01/13] dt-bindings: net: mediatek,net: update for mt7988
Hi,
Thank you for review.
Am 22. Juni 2025 13:10:31 MESZ schrieb Krzysztof Kozlowski <[email protected]>:
Quoted 6 lines · Frank Wunderlich
Quoted 3 lines
From: Frank Wunderlich <[email protected]>
Update binding for mt7988 which has 3 gmac and 2 reg items.
Why?
I guess this is for reg? Socs toll mt7986 afair
get the SRAM register by offset to the MAC
register.
On mt7988 we started defining it directly.
Quoted 5 lines
Quoted 5 lines
MT7988 has 4 FE IRQs (currently only 2 are used) and the 4 IRQs for use with RSS/LRO later.
Add interrupt-names to make them accessible by name.
...
Quoted 7 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml properties: · line 33
Quoted 5 lines
reg:
Documentation/devicetree/bindings/net/mediatek,net.yaml +3
-1- maxItems: 1 + items: + - description: Register for accessing the MACs. + - description: SoC internal SRAM used for DMA operations.SRAM like mmio-sram?
Not sure,but as far as i understand the driver
the sram is used to handle tx packets directly
on the soc (less dram operations).
As mt7988 is the first 10Gbit/s capable SoC
there are some changes. But do we really need
a new binding? We also thing abour adding
RSS/LRO to mt7986 too,so we come into
similar situation regarding the Interrupts/
-names.
Quoted 6 lines
Quoted 6 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +1
-0+ minItems: 1 clocks: minItems: 2@@ -40,7 +43,11 @@ properties:
Quoted 11 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml properties: · line 50
Quoted 8 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +5
-1interrupts: minItems: 1 - maxItems: 4 + maxItems: 8 + + interrupt-names: + minItems: 1 + maxItems: 8So now all variants get unspecified names? You need to define it. Or just drop.
Most socs using the Fe-irqs like mt7988,some
specify only 3 and 2 soc (mt762[18]) have only 1 shared irq. But existing dts not yet using the irq-names.
Thats why i leave it undefined here and
defining it only for mt7988 below. But leaving it open to add irq names to other socs like filogic socs (mt798x) where we are considering adding rss/lro support too.
Quoted 11 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml allOf: · line 358
Quoted 9 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +1
-1power-domains: maxItems: 1@@ -348,7 +355,19 @@ allOf: then: properties: interrupts: - minItems: 4 + minItems: 2Why? Didn't you say it has 4?
Sorry missed to change it after adding the 2
reserved fe irqs back again (i tried adding only used irqs - rx+tx,but got info that all irqs can be used - for future functions - so added all available).
Quoted 19 lines
Quoted 19 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +12
-0+ + interrupt-names: + minItems: 2 + items: + - const: fe0 + - const: fe1 + - const: fe2 + - const: fe3 + - const: pdma0 + - const: pdma1 + - const: pdma2 + - const: pdma3 clocks: minItems: 24@@ -381,8 +400,11 @@ allOf: - const: xgp2 - const: xgp3
Quoted 7 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml allOf: · line 404
Quoted 2 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +2
-0+ reg: + minItems: 2And all else? Why they got 2 reg and 8 interrupts now? All variants are now affected/changed. We have been here: you need to write specific bindings.
Mt7988 is more powerful and we wanted to add
all irqs available to have less problems when
adding rss support later. E.g. mt7986 also have
the pdma irqs,but they are not part of
binding+dts yet. Thats 1 reason why
introducing irq-names now. And this block is
for mt7988 only...the other still have a regcount of 1 (min-items).
But of course i can limit the reg/ irqs/
irq-names for each compatible.
Quoted 3 lines
I take a look into it,but allowing irq names for all matching compatibles does not require it for them. Or am i wrong here?
Quoted 2 lines
Best regards,
Krzysztof
regards Frank
Re: [PATCH v5 01/13] dt-bindings: net: mediatek,net: update for mt7988
Quoted 8 lines · Frank Wunderlich
Hi,
Thank you for review.
Am 22. Juni 2025 13:10:31 MESZ schrieb Krzysztof Kozlowski <[email protected]>:
Quoted 3 lines · Frank Wunderlich
Quoted 2 lines
From: Frank Wunderlich <[email protected]>
Quoted 8 lines
Quoted 3 lines
Quoted 1 line
Update binding for mt7988 which has 3 gmac and 2 reg items.
Why?
I guess this is for reg? Socs toll mt7986 afair
get the SRAM register by offset to the MAC
register.
On mt7988 we started defining it directly.
This should be explained in commit msg. Why are you doing the changes...
Quoted 19 lines
Quoted 6 lines
Quoted 6 lines
MT7988 has 4 FE IRQs (currently only 2 are used) and the 4 IRQs for use with RSS/LRO later.
Add interrupt-names to make them accessible by name.
...
Quoted 7 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml properties: · line 33
Quoted 5 lines
reg:
Documentation/devicetree/bindings/net/mediatek,net.yaml +3
-1- maxItems: 1 + items: + - description: Register for accessing the MACs. + - description: SoC internal SRAM used for DMA operations.SRAM like mmio-sram?
Not sure,but as far as i understand the driver
the sram is used to handle tx packets directly
on the soc (less dram operations).
Quoted 6 lines
As mt7988 is the first 10Gbit/s capable SoC
there are some changes. But do we really need
a new binding? We also thing abour adding
RSS/LRO to mt7986 too,so we come into
similar situation regarding the Interrupts/
-names.
If it is mmio-sram, then it is definitely not reg property.
Anyway
wrap emails
according to list
discussion rules.
Quoted 19 lines
Quoted 7 lines
Quoted 7 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +1
-0+ minItems: 1 clocks: minItems: 2@@ -40,7 +43,11 @@ properties:Quoted 11 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml properties: · line 50
Quoted 8 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +5
-1interrupts: minItems: 1 - maxItems: 4 + maxItems: 8 + + interrupt-names: + minItems: 1 + maxItems: 8So now all variants get unspecified names? You need to define it. Or just drop.
Quoted 10 lines
Most socs using the Fe-irqs like mt7988,some
specify only 3 and 2 soc (mt762[18]) have only 1 shared irq. But existing dts not yet using the irq-names.
Thats why i leave it undefined here and
defining it only for mt7988 below. But leaving it open to add irq names to other socs like filogic socs (mt798x) where we are considering adding rss/lro support too.
I explained this is wrong. Your binding must be specific, not flexible.
Quoted 42 lines
Quoted 11 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml allOf: · line 358
Quoted 9 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +1
-1power-domains: maxItems: 1@@ -348,7 +355,19 @@ allOf: then: properties: interrupts: - minItems: 4 + minItems: 2Why? Didn't you say it has 4?
Sorry missed to change it after adding the 2
reserved fe irqs back again (i tried adding only used irqs - rx+tx,but got info that all irqs can be used - for future functions - so added all available).Quoted 19 lines
Quoted 19 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +12
-0+ + interrupt-names: + minItems: 2 + items: + - const: fe0 + - const: fe1 + - const: fe2 + - const: fe3 + - const: pdma0 + - const: pdma1 + - const: pdma2 + - const: pdma3 clocks: minItems: 24@@ -381,8 +400,11 @@ allOf: - const: xgp2 - const: xgp3Quoted 7 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml allOf: · line 404
Quoted 2 lines
Documentation/devicetree/bindings/net/mediatek,net.yaml +2
-0+ reg: + minItems: 2And all else? Why they got 2 reg and 8 interrupts now? All variants are now affected/changed. We have been here: you need to write specific bindings.
Quoted 7 lines
Mt7988 is more powerful and we wanted to add
all irqs available to have less problems when
adding rss support later. E.g. mt7986 also have
the pdma irqs,but they are not part of
binding+dts yet. Thats 1 reason why
introducing irq-names now. And this block is
for mt7988 only...the other still have a regcount of 1 (min-items).
This explains me nothing. Why do you change other hardware? Why when doing something for MT7988 you also state that other SoCs have different number of interrupts?
Best regards,
Krzysztof
Re: [PATCH v5 12/13] arm64: dts: mediatek: mt7988a-bpi-r4: add sfp cages and link to gmac
In reply to Frank WunderlichIl 20/06/25 10:35, Frank Wunderlich ha scritto:
Quoted 8 lines
From: Frank Wunderlich <[email protected]>
Add SFP cages to Bananapi-R4 board. The 2.5g phy variant only contains the wan-SFP, so add this to common dtsi and the lan-sfp only to the dual-SFP variant.
Signed-off-by Daniel Golle <[email protected]>Signed-off-by Frank Wunderlich <[email protected]>
Re: [PATCH v5 07/13] arm64: dts: mediatek: mt7988: add switch node
In reply to Frank WunderlichIl 20/06/25 10:35, Frank Wunderlich ha scritto:
Quoted 6 lines
From: Frank Wunderlich <[email protected]>
Add mt7988 builtin mt753x switch nodes.
Signed-off-by Daniel Golle <[email protected]>Signed-off-by Frank Wunderlich <[email protected]>
Re: [PATCH v5 03/13] dt-bindings: net: dsa: mediatek,mt7530: add internal mdio bus
In reply to Frank WunderlichIl 20/06/25 10:35, Frank Wunderlich ha scritto:
Quoted 7 lines
From: Frank Wunderlich <[email protected]>
Mt7988 buildin switch has own mdio bus where ge-phys are connected. Add related property for this.
Signed-off-by Frank Wunderlich <[email protected]>Reviewed-by Rob Herring (Arm) <[email protected]>
Re: [PATCH v5 02/13] dt-bindings: net: dsa: mediatek,mt7530: add dsa-port definition for mt7988
In reply to Frank WunderlichIl 20/06/25 10:35, Frank Wunderlich ha scritto:
Quoted 7 lines
From: Frank Wunderlich <[email protected]>
Add own dsa-port binding for SoC with internal switch where only phy-mode 'internal' is valid.
Signed-off-by Frank Wunderlich <[email protected]>Reviewed-by Rob Herring (Arm) <[email protected]>
Re: [PATCH v5 04/13] dt-bindings: interconnect: add mt7988-cci compatible
In reply to Frank WunderlichQuoted 8 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Add compatible for Mediatek MT7988 SoC with mediatek,mt8183-cci fallback which is taken by driver.
Signed-off-by Frank Wunderlich <[email protected]>Reviewed-by AngeloGioacchino Del Regno <[email protected]>
This can go with the rest of the patches or please let me know if i should apply it.
BR,
Georgi
Quoted 30 lines
---
v2:
- no RFC
- drop "items" as sugested by conor--- .../bindings/interconnect/mediatek,cci.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)Documentation/devicetree/bindings/interconnect/mediatek,cci.yaml +8
-3@@ -17,9 +17,14 @@ description: | properties: compatible: - enum: - - mediatek,mt8183-cci - - mediatek,mt8186-cci + oneOf: + - enum: + - mediatek,mt8183-cci + - mediatek,mt8186-cci + - items: + - enum: + - mediatek,mt7988-cci + - const: mediatek,mt8183-cci clocks: items: