Commit a6f12204 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'further-mt7988-devicetree-work' 

Frank Wunderlich says:

====================
further mt7988 devicetree work

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/20250619132125.78368-2-linux@fw-web.de/

needs change in mtk ethernet driver for the sram to be read from separate node:
https://patchwork.kernel.org/project/netdevbpf/patch/c2b9242229d06af4e468204bcf42daa1535c3a72.1751461762.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/aEwfME3dYisQtdCj@pidgin.makrotopia.org/

e.g. something like this (one of):
* https://patchwork.kernel.org/project/netdevbpf/patch/20250610233134.3588011-4-sean.anderson@linux.dev/ (v6)
* https://patchwork.kernel.org/project/netdevbpf/patch/20250511201250.3789083-4-ansuelsmth@gmail.com/ (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/20250511201250.3789083-4-ansuelsmth@gmail.com/

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.
====================

Link: https://patch.msgid.link/20250709111147.11843-1-linux@fw-web.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents b430f6c3 66a44adf

Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml

+23 −1
Original line number Diff line number Diff line
@@ -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:
@@ -190,6 +200,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 +319,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

Documentation/devicetree/bindings/net/mediatek,net.yaml

+58 −6
Original line number Diff line number Diff line
@@ -40,7 +40,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 +66,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 +151,10 @@ allOf: 
          minItems: 3

          maxItems: 3



        interrupt-names:

          minItems: 3

          maxItems: 3



        clocks:

          minItems: 4

          maxItems: 4
@@ -146,6 +166,8 @@ allOf: 
            - const: gp1

            - const: gp2



        sram: false



        mediatek,infracfg: false



        mediatek,wed: false
@@ -166,6 +188,9 @@ allOf: 
        interrupts:

          maxItems: 1



        interrupt-names:

          maxItems: 1



        clocks:

          minItems: 2

          maxItems: 2
@@ -175,6 +200,8 @@ allOf: 
            - const: ethif

            - const: fe



        sram: false



        mediatek,infracfg: false



        mediatek,wed: false
@@ -192,6 +219,10 @@ allOf: 
          minItems: 3

          maxItems: 3



        interrupt-names:

          minItems: 3

          maxItems: 3



        clocks:

          minItems: 11

          maxItems: 11
@@ -210,6 +241,8 @@ allOf: 
            - const: sgmii_ck

            - const: eth2pll



        sram: false



        mediatek,infracfg: false



        mediatek,sgmiisys:
@@ -232,6 +265,10 @@ allOf: 
          minItems: 3

          maxItems: 3



        interrupt-names:

          minItems: 3

          maxItems: 3



        clocks:

          minItems: 17

          maxItems: 17
@@ -256,6 +293,8 @@ allOf: 
            - const: sgmii_ck

            - const: eth2pll



        sram: false



        mediatek,sgmiisys:

          minItems: 2

          maxItems: 2
@@ -272,7 +311,10 @@ allOf: 
    then:

      properties:

        interrupts:

          minItems: 4

          minItems: 8



        interrupt-names:

          minItems: 8



        clocks:

          minItems: 15
@@ -310,7 +352,10 @@ allOf: 
    then:

      properties:

        interrupts:

          minItems: 4

          minItems: 8



        interrupt-names:

          minItems: 8



        clocks:

          minItems: 15
@@ -348,7 +393,10 @@ allOf: 
    then:

      properties:

        interrupts:

          minItems: 4

          minItems: 8



        interrupt-names:

          minItems: 8



        clocks:

          minItems: 24
@@ -382,7 +430,7 @@ allOf: 
            - const: xgp3



patternProperties:

  "^mac@[0-1]$":

  "^mac@[0-2]$":

    type: object

    unevaluatedProperties: false

    allOf:
@@ -507,7 +555,11 @@ examples: 
        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 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>;

        clocks = <&ethsys CLK_ETH_FE_EN>,

                 <&ethsys CLK_ETH_GP2_EN>,

                 <&ethsys CLK_ETH_GP1_EN>,