further mt7988 devicetree work
Subsystems (5)
v6 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)
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]/
needs change in mtk ethernet driver for the sram to be read from separate node:
https://patchwork.kernel.org/project/netdevbpf/patch/566ca90fc59ad0d3aff8bc8dc22ebaf0544bce47.1751072868.git.daniel@makrotopia.org/
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:
v6:
binding:
- split out the interrupt-names into separate patch
- update irq(name) min count to 4
- move interrupt-names up
- add sram-property
- drop second reg entry and minitems as there is only 1 item left
dts:
- fix whitespace-errors for pdma irqs (spaces vs. tabs)
- move sram from eth reg to own sram node (needs CONFIG_SRAM)
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 (15):
dt-bindings: net: mediatek,net: update for mt7988
dt-bindings: net: mediatek,net: allow irq names
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 | 47 ++- .../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 | 318 +++++++++++++++++- 7 files changed, 529 insertions(+), 99 deletions(-)
Signature · 1 line
2.43.0
PATCH v6 1/15 dt-bindings: net: mediatek,net: update for mt7988
From: Frank Wunderlich <[email protected]>
Update binding for mt7988 which has 3 gmac and a sram for dma operations.
MT7988 has 4 FE IRQs (currently only 2 are used) and 4 IRQs for use with RSS/LRO later.
Add interrupt-names to make them accessible by name.
---
v6:
- update irq(name) min count to 4
- move interrupt-names up and limiting for all socs below
- add sram-property and drop second reg entry
- drop minitems as there is only 1 item left now
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 | 47 +++++++++++++++++-- 1 file changed, 44 insertions(+), 3 deletions(-)
Documentation/devicetree/bindings/net/mediatek,net.yaml +44 -3
@@ -28,7 +28,8 @@ properties: - ralink,rt5350-eth reg: - maxItems: 1 + items: + - description: Register for accessing the MACs. clocks: minItems: 2
@@ -40,7 +41,19 @@ properties: interrupts: minItems: 1 - maxItems: 4 + maxItems: 8 + + interrupt-names: + minItems: 1 + items: + - const: fe0 + - const: fe1 + - const: fe2 + - const: fe3 + - const: pdma0 + - const: pdma1 + - const: pdma2 + - const: pdma3 power-domains: maxItems: 1
@@ -54,6 +67,10 @@ properties: - const: gmac - const: ppe + sram: + $ref: /schemas/types.yaml#/definitions/phandle + description: phandle to mmio SRAM + mediatek,ethsys: $ref: /schemas/types.yaml#/definitions/phandle description:
@@ -135,6 +152,10 @@ allOf: minItems: 3 maxItems: 3 + interrupt-names: + minItems: 3 + maxItems: 3 + clocks: minItems: 4 maxItems: 4
@@ -166,6 +187,9 @@ allOf: interrupts: maxItems: 1 + interrupt-namess: + maxItems: 1 + clocks: minItems: 2 maxItems: 2
@@ -192,6 +216,10 @@ allOf: minItems: 3 maxItems: 3 + interrupt-names: + minItems: 3 + maxItems: 3 + clocks: minItems: 11 maxItems: 11
@@ -232,6 +260,10 @@ allOf: minItems: 3 maxItems: 3 + interrupt-names: + minItems: 3 + maxItems: 3 + clocks: minItems: 17 maxItems: 17
@@ -274,6 +306,9 @@ allOf: interrupts: minItems: 4 + interrupt-names: + minItems: 4 + clocks: minItems: 15 maxItems: 15
@@ -312,6 +347,9 @@ allOf: interrupts: minItems: 4 + interrupt-names: + minItems: 4 + clocks: minItems: 15 maxItems: 15
@@ -350,6 +388,9 @@ allOf: interrupts: minItems: 4 + interrupt-names: + minItems: 4 + clocks: minItems: 24 maxItems: 24
@@ -382,7 +423,7 @@ allOf: - const: xgp3 patternProperties: - "^mac@[0-1]$": + "^mac@[0-2]$": type: object unevaluatedProperties: false allOf:
Signature · 1 line
2.43.0
PATCH v6 2/15 dt-bindings: net: mediatek,net: allow irq names
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
In preparation for MT7988 and RSS/LRO allow the interrupt-names property. Also increase the maximum IRQ count to 8 (4 FE + 4 RSS), but set boundaries for all compatibles same as irq count.
---
v6: new patch splitted from the mt7988 changes
--- Documentation/devicetree/bindings/net/mediatek,net.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/net/mediatek,net.yaml +2 -7
@@ -28,8 +28,7 @@ properties: - ralink,rt5350-eth reg: - items: - - description: Register for accessing the MACs. + maxItems: 1 clocks: minItems: 2
@@ -67,10 +66,6 @@ properties: - const: gmac - const: ppe - sram: - $ref: /schemas/types.yaml#/definitions/phandle - description: phandle to mmio SRAM - mediatek,ethsys: $ref: /schemas/types.yaml#/definitions/phandle description:
@@ -423,7 +418,7 @@ allOf: - const: xgp3 patternProperties: - "^mac@[0-2]$": + "^mac@[0-1]$": type: object unevaluatedProperties: false allOf:
Signature · 1 line
2.43.0
PATCH v6 3/15 dt-bindings: net: mediatek,net: update for mt7988
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Update binding for mt7988 which has 3 gmac and a sram for dma operations.
MT7988 has 4 FE IRQs (currently only 2 are used) and 4 IRQs for use with RSS/LRO later.
---
v6:
- split out the interrupt-names into separate patch
- update irq(name) min count to 4
- add sram-property
- drop second reg entry and minitems as there is only 1 item left again
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
--- Documentation/devicetree/bindings/net/mediatek,net.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/net/mediatek,net.yaml +7 -2
@@ -28,7 +28,8 @@ properties: - ralink,rt5350-eth reg: - maxItems: 1 + items: + - description: Register for accessing the MACs. clocks: minItems: 2
@@ -66,6 +67,10 @@ properties: - const: gmac - const: ppe + sram: + $ref: /schemas/types.yaml#/definitions/phandle + description: phandle to mmio SRAM + mediatek,ethsys: $ref: /schemas/types.yaml#/definitions/phandle description:
@@ -418,7 +423,7 @@ allOf: - const: xgp3 patternProperties: - "^mac@[0-1]$": + "^mac@[0-2]$": type: object unevaluatedProperties: false allOf:
Signature · 1 line
2.43.0
PATCH v6 4/15 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 v6 5/15 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