* [PATCH v5 02/12] dt-bindings: net: mediatek,net: add mt7981-eth binding
2023-02-11 16:01 [PATCH v5 00/12] net: ethernet: mtk_eth_soc: various enhancements Daniel Golle
@ 2023-02-11 16:02 ` Daniel Golle
2023-02-13 9:14 ` Krzysztof Kozlowski
2023-02-11 16:02 ` [PATCH v5 03/12] dt-bindings: arm: mediatek: sgmiisys: Convert to DT schema Daniel Golle
2023-02-11 16:02 ` [PATCH v5 04/12] dt-bindings: arm: mediatek: sgmiisys: add MT7981 SoC Daniel Golle
2 siblings, 1 reply; 7+ messages in thread
From: Daniel Golle @ 2023-02-11 16:02 UTC (permalink / raw)
To: devicetree, Rob Herring, Krzysztof Kozlowski, netdev,
linux-mediatek, linux-arm-kernel, linux-kernel, Russell King,
Heiner Kallweit, Lorenzo Bianconi, Mark Lee, John Crispin,
Felix Fietkau, AngeloGioacchino Del Regno, Matthias Brugger,
DENG Qingfang, Landen Chao, Sean Wang, Paolo Abeni,
Jakub Kicinski, Eric Dumazet, David S. Miller, Vladimir Oltean,
Florian Fainelli, Andrew Lunn
Cc: Jianhui Zhao, Bjørn Mork
Introduce DT bindings for the MT7981 SoC to mediatek,net.yaml.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
.../devicetree/bindings/net/mediatek,net.yaml | 43 ++++++++++++++++++-
1 file changed, 41 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/mediatek,net.yaml b/Documentation/devicetree/bindings/net/mediatek,net.yaml
index 7ef696204c5a..76a46a7b8228 100644
--- a/Documentation/devicetree/bindings/net/mediatek,net.yaml
+++ b/Documentation/devicetree/bindings/net/mediatek,net.yaml
@@ -21,6 +21,7 @@ properties:
- mediatek,mt7623-eth
- mediatek,mt7622-eth
- mediatek,mt7629-eth
+ - mediatek,mt7981-eth
- mediatek,mt7986-eth
- ralink,rt5350-eth
@@ -210,7 +211,7 @@ allOf:
properties:
compatible:
contains:
- const: mediatek,mt7986-eth
+ const: mediatek,mt7981-eth
then:
properties:
interrupts:
@@ -225,8 +226,8 @@ allOf:
- const: fe
- const: gp2
- const: gp1
- - const: wocpu1
- const: wocpu0
+ - const: sgmii_ck
- const: sgmii_tx250m
- const: sgmii_rx250m
- const: sgmii_cdr_ref
@@ -247,6 +248,44 @@ allOf:
description:
Phandle to the mediatek wed-pcie controller.
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: mediatek,mt7986-eth
+ then:
+ properties:
+ interrupts:
+ minItems: 4
+
+ clocks:
+ minItems: 15
+ maxItems: 15
+
+ clock-names:
+ items:
+ - const: fe
+ - const: gp2
+ - const: gp1
+ - const: wocpu1
+ - const: wocpu0
+ - const: sgmii_tx250m
+ - const: sgmii_rx250m
+ - const: sgmii_cdr_ref
+ - const: sgmii_cdr_fb
+ - const: sgmii2_tx250m
+ - const: sgmii2_rx250m
+ - const: sgmii2_cdr_ref
+ - const: sgmii2_cdr_fb
+ - const: netsys0
+ - const: netsys1
+
+ mediatek,sgmiisys:
+ minItems: 2
+ maxItems: 2
+
+ mediatek,wed-pcie: true
+
patternProperties:
"^mac@[0-1]$":
type: object
--
2.39.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v5 02/12] dt-bindings: net: mediatek,net: add mt7981-eth binding
2023-02-11 16:02 ` [PATCH v5 02/12] dt-bindings: net: mediatek,net: add mt7981-eth binding Daniel Golle
@ 2023-02-13 9:14 ` Krzysztof Kozlowski
0 siblings, 0 replies; 7+ messages in thread
From: Krzysztof Kozlowski @ 2023-02-13 9:14 UTC (permalink / raw)
To: Daniel Golle, devicetree, Rob Herring, Krzysztof Kozlowski,
netdev, linux-mediatek, linux-arm-kernel, linux-kernel,
Russell King, Heiner Kallweit, Lorenzo Bianconi, Mark Lee,
John Crispin, Felix Fietkau, AngeloGioacchino Del Regno,
Matthias Brugger, DENG Qingfang, Landen Chao, Sean Wang,
Paolo Abeni, Jakub Kicinski, Eric Dumazet, David S. Miller,
Vladimir Oltean, Florian Fainelli, Andrew Lunn
Cc: Jianhui Zhao, Bjørn Mork
On 11/02/2023 17:02, Daniel Golle wrote:
> Introduce DT bindings for the MT7981 SoC to mediatek,net.yaml.
>
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> ---
Confusing diff but in general looks ok except:
> +
> + mediatek,wed-pcie: true
This is now anything. I propose to cleanup the bindings first, before
adding new compatible.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v5 03/12] dt-bindings: arm: mediatek: sgmiisys: Convert to DT schema
2023-02-11 16:01 [PATCH v5 00/12] net: ethernet: mtk_eth_soc: various enhancements Daniel Golle
2023-02-11 16:02 ` [PATCH v5 02/12] dt-bindings: net: mediatek,net: add mt7981-eth binding Daniel Golle
@ 2023-02-11 16:02 ` Daniel Golle
2023-02-13 9:16 ` Krzysztof Kozlowski
2023-02-11 16:02 ` [PATCH v5 04/12] dt-bindings: arm: mediatek: sgmiisys: add MT7981 SoC Daniel Golle
2 siblings, 1 reply; 7+ messages in thread
From: Daniel Golle @ 2023-02-11 16:02 UTC (permalink / raw)
To: devicetree, Rob Herring, Krzysztof Kozlowski, netdev,
linux-mediatek, linux-arm-kernel, linux-kernel, Russell King,
Heiner Kallweit, Lorenzo Bianconi, Mark Lee, John Crispin,
Felix Fietkau, AngeloGioacchino Del Regno, Matthias Brugger,
DENG Qingfang, Landen Chao, Sean Wang, Paolo Abeni,
Jakub Kicinski, Eric Dumazet, David S. Miller, Vladimir Oltean,
Florian Fainelli, Andrew Lunn
Cc: Jianhui Zhao, Bjørn Mork
Convert mediatek,sgmiiisys bindings to DT schema format.
Add maintainer Matthias Brugger, no maintainers were listed in the
original documentation.
As this node is also referenced by the Ethernet controller and used
as SGMII PCS add this fact to the description.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
.../arm/mediatek/mediatek,sgmiisys.txt | 27 ----------
.../arm/mediatek/mediatek,sgmiisys.yaml | 53 +++++++++++++++++++
2 files changed, 53 insertions(+), 27 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt
create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt
deleted file mode 100644
index d2c24c277514..000000000000
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-MediaTek SGMIISYS controller
-============================
-
-The MediaTek SGMIISYS controller provides various clocks to the system.
-
-Required Properties:
-
-- compatible: Should be:
- - "mediatek,mt7622-sgmiisys", "syscon"
- - "mediatek,mt7629-sgmiisys", "syscon"
- - "mediatek,mt7981-sgmiisys_0", "syscon"
- - "mediatek,mt7981-sgmiisys_1", "syscon"
- - "mediatek,mt7986-sgmiisys_0", "syscon"
- - "mediatek,mt7986-sgmiisys_1", "syscon"
-- #clock-cells: Must be 1
-
-The SGMIISYS controller uses the common clk binding from
-Documentation/devicetree/bindings/clock/clock-bindings.txt
-The available clocks are defined in dt-bindings/clock/mt*-clk.h.
-
-Example:
-
-sgmiisys: sgmiisys@1b128000 {
- compatible = "mediatek,mt7622-sgmiisys", "syscon";
- reg = <0 0x1b128000 0 0x1000>;
- #clock-cells = <1>;
-};
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
new file mode 100644
index 000000000000..99ceb08ad7c0
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: "http://devicetree.org/schemas/arm/mediatek/mediatek,sgmiisys.yaml#"
+$schema: "http://devicetree.org/meta-schemas/core.yaml#"
+
+title: MediaTek SGMIISYS Controller
+
+maintainers:
+ - Matthias Brugger <matthias.bgg@gmail.com>
+
+description:
+ The MediaTek SGMIISYS controller provides SGMII related clocks to the system
+ and is used by the Ethernet controller as SGMII PCS.
+
+properties:
+ $nodename:
+ pattern: "^syscon@[0-9a-f]+$"
+
+ compatible:
+ oneOf:
+ - items:
+ - enum:
+ - mediatek,mt7622-sgmiisys
+ - mediatek,mt7629-sgmiisys
+ - mediatek,mt7986-sgmiisys_0
+ - mediatek,mt7986-sgmiisys_1
+ - const: syscon
+
+ reg:
+ maxItems: 1
+
+ '#clock-cells':
+ const: 1
+
+required:
+ - compatible
+ - reg
+ - '#clock-cells'
+
+additionalProperties: false
+
+examples:
+ - |
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ sgmiisys: syscon@1b128000 {
+ compatible = "mediatek,mt7622-sgmiisys", "syscon";
+ reg = <0 0x1b128000 0 0x1000>;
+ #clock-cells = <1>;
+ };
+ };
--
2.39.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v5 03/12] dt-bindings: arm: mediatek: sgmiisys: Convert to DT schema
2023-02-11 16:02 ` [PATCH v5 03/12] dt-bindings: arm: mediatek: sgmiisys: Convert to DT schema Daniel Golle
@ 2023-02-13 9:16 ` Krzysztof Kozlowski
0 siblings, 0 replies; 7+ messages in thread
From: Krzysztof Kozlowski @ 2023-02-13 9:16 UTC (permalink / raw)
To: Daniel Golle, devicetree, Rob Herring, Krzysztof Kozlowski,
netdev, linux-mediatek, linux-arm-kernel, linux-kernel,
Russell King, Heiner Kallweit, Lorenzo Bianconi, Mark Lee,
John Crispin, Felix Fietkau, AngeloGioacchino Del Regno,
Matthias Brugger, DENG Qingfang, Landen Chao, Sean Wang,
Paolo Abeni, Jakub Kicinski, Eric Dumazet, David S. Miller,
Vladimir Oltean, Florian Fainelli, Andrew Lunn
Cc: Jianhui Zhao, Bjørn Mork
On 11/02/2023 17:02, Daniel Golle wrote:
> Convert mediatek,sgmiiisys bindings to DT schema format.
> Add maintainer Matthias Brugger, no maintainers were listed in the
> original documentation.
> As this node is also referenced by the Ethernet controller and used
> as SGMII PCS add this fact to the description.
>
Thank you for your patch. There is something to discuss/improve.
> diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
> new file mode 100644
> index 000000000000..99ceb08ad7c0
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
> @@ -0,0 +1,53 @@
> +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: "http://devicetree.org/schemas/arm/mediatek/mediatek,sgmiisys.yaml#"
> +$schema: "http://devicetree.org/meta-schemas/core.yaml#"
Drop quotes from both.
> +
> +title: MediaTek SGMIISYS Controller
> +
> +maintainers:
> + - Matthias Brugger <matthias.bgg@gmail.com>
> +
> +description:
> + The MediaTek SGMIISYS controller provides SGMII related clocks to the system
> + and is used by the Ethernet controller as SGMII PCS.
> +
> +properties:
> + $nodename:
> + pattern: "^syscon@[0-9a-f]+$"
Drop nodename, we do not require it per binding.
> +
> + compatible:
> + oneOf:
Drop oneOf, unless you plan to use it soon?
> + - items:
> + - enum:
> + - mediatek,mt7622-sgmiisys
> + - mediatek,mt7629-sgmiisys
> + - mediatek,mt7986-sgmiisys_0
> + - mediatek,mt7986-sgmiisys_1
> + - const: syscon
> +
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v5 04/12] dt-bindings: arm: mediatek: sgmiisys: add MT7981 SoC
2023-02-11 16:01 [PATCH v5 00/12] net: ethernet: mtk_eth_soc: various enhancements Daniel Golle
2023-02-11 16:02 ` [PATCH v5 02/12] dt-bindings: net: mediatek,net: add mt7981-eth binding Daniel Golle
2023-02-11 16:02 ` [PATCH v5 03/12] dt-bindings: arm: mediatek: sgmiisys: Convert to DT schema Daniel Golle
@ 2023-02-11 16:02 ` Daniel Golle
2023-02-13 9:16 ` Krzysztof Kozlowski
2 siblings, 1 reply; 7+ messages in thread
From: Daniel Golle @ 2023-02-11 16:02 UTC (permalink / raw)
To: devicetree, Rob Herring, Krzysztof Kozlowski, netdev,
linux-mediatek, linux-arm-kernel, linux-kernel, Russell King,
Heiner Kallweit, Lorenzo Bianconi, Mark Lee, John Crispin,
Felix Fietkau, AngeloGioacchino Del Regno, Matthias Brugger,
DENG Qingfang, Landen Chao, Sean Wang, Paolo Abeni,
Jakub Kicinski, Eric Dumazet, David S. Miller, Vladimir Oltean,
Florian Fainelli, Andrew Lunn
Cc: Jianhui Zhao, Bjørn Mork
Add mediatek,pnswap boolean property as well as an example for the
MediaTek MT7981 SoC making use of that new property.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
.../arm/mediatek/mediatek,sgmiisys.yaml | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
index 99ceb08ad7c0..97d4ab70e541 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
@@ -23,6 +23,8 @@ properties:
- enum:
- mediatek,mt7622-sgmiisys
- mediatek,mt7629-sgmiisys
+ - mediatek,mt7981-sgmiisys_0
+ - mediatek,mt7981-sgmiisys_1
- mediatek,mt7986-sgmiisys_0
- mediatek,mt7986-sgmiisys_1
- const: syscon
@@ -33,6 +35,10 @@ properties:
'#clock-cells':
const: 1
+ mediatek,pnswap:
+ description: Invert polarity of the SGMII data lanes
+ type: boolean
+
required:
- compatible
- reg
@@ -51,3 +57,19 @@ examples:
#clock-cells = <1>;
};
};
+ - |
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+ sgmiisys0: syscon@10060000 {
+ compatible = "mediatek,mt7981-sgmiisys_0", "syscon";
+ reg = <0 0x10060000 0 0x1000>;
+ mediatek,pnswap;
+ #clock-cells = <1>;
+ };
+ sgmiisys1: syscon@10070000 {
+ compatible = "mediatek,mt7981-sgmiisys_1", "syscon";
+ reg = <0 0x10070000 0 0x1000>;
+ #clock-cells = <1>;
+ };
+ };
--
2.39.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH v5 04/12] dt-bindings: arm: mediatek: sgmiisys: add MT7981 SoC
2023-02-11 16:02 ` [PATCH v5 04/12] dt-bindings: arm: mediatek: sgmiisys: add MT7981 SoC Daniel Golle
@ 2023-02-13 9:16 ` Krzysztof Kozlowski
0 siblings, 0 replies; 7+ messages in thread
From: Krzysztof Kozlowski @ 2023-02-13 9:16 UTC (permalink / raw)
To: Daniel Golle, devicetree, Rob Herring, Krzysztof Kozlowski,
netdev, linux-mediatek, linux-arm-kernel, linux-kernel,
Russell King, Heiner Kallweit, Lorenzo Bianconi, Mark Lee,
John Crispin, Felix Fietkau, AngeloGioacchino Del Regno,
Matthias Brugger, DENG Qingfang, Landen Chao, Sean Wang,
Paolo Abeni, Jakub Kicinski, Eric Dumazet, David S. Miller,
Vladimir Oltean, Florian Fainelli, Andrew Lunn
Cc: Jianhui Zhao, Bjørn Mork
On 11/02/2023 17:02, Daniel Golle wrote:
> Add mediatek,pnswap boolean property as well as an example for the
> MediaTek MT7981 SoC making use of that new property.
>
> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
> ---
> .../arm/mediatek/mediatek,sgmiisys.yaml | 22 +++++++++++++++++++
> 1 file changed, 22 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
> index 99ceb08ad7c0..97d4ab70e541 100644
> --- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
> +++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sgmiisys.yaml
> @@ -23,6 +23,8 @@ properties:
> - enum:
> - mediatek,mt7622-sgmiisys
> - mediatek,mt7629-sgmiisys
> + - mediatek,mt7981-sgmiisys_0
> + - mediatek,mt7981-sgmiisys_1
> - mediatek,mt7986-sgmiisys_0
> - mediatek,mt7986-sgmiisys_1
> - const: syscon
> @@ -33,6 +35,10 @@ properties:
> '#clock-cells':
> const: 1
>
> + mediatek,pnswap:
> + description: Invert polarity of the SGMII data lanes
> + type: boolean
> +
> required:
> - compatible
> - reg
> @@ -51,3 +57,19 @@ examples:
> #clock-cells = <1>;
> };
> };
> + - |
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
> + sgmiisys0: syscon@10060000 {
> + compatible = "mediatek,mt7981-sgmiisys_0", "syscon";
> + reg = <0 0x10060000 0 0x1000>;
> + mediatek,pnswap;
No really need for three almost the same nodes. Just choose one - with
or without pnswap.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 7+ messages in thread