* [PATCH net-next v2 1/9] dt-bindings: net: Document 2500Mbits/sec fixed link
2021-12-01 17:56 [PATCH net-next v2 0/9] Broadcom DT bindings conversion to YAML Florian Fainelli
@ 2021-12-01 17:56 ` Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 2/9] dt-bindings: net: brcm,unimac-mdio: reg-names is optional Florian Fainelli
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Florian Fainelli @ 2021-12-01 17:56 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski, Rob Herring,
Rafał Miłecki,
maintainer:BROADCOM IPROC GBIT ETHERNET DRIVER, Doug Berger,
Ray Jui, Scott Branden, Kishon Vijay Abraham I, Vinod Koul,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, moderated list:BROADCOM IPROC ARM ARCHITECTURE,
open list:GENERIC PHY FRAMEWORK
There are Device Trees with a fixed link rate of 2.5Gbits/sec, add this
value to the supported enumeration of speeds for a fixed link.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Documentation/devicetree/bindings/net/ethernet-controller.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
index b0933a8c295a..ff4909e1fdda 100644
--- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml
+++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
@@ -178,7 +178,7 @@ properties:
Duplex configuration. 0 for half duplex or 1 for
full duplex
- - enum: [10, 100, 1000]
+ - enum: [10, 100, 1000, 2500]
description:
Link speed in Mbits/sec.
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next v2 2/9] dt-bindings: net: brcm,unimac-mdio: reg-names is optional
2021-12-01 17:56 [PATCH net-next v2 0/9] Broadcom DT bindings conversion to YAML Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 1/9] dt-bindings: net: Document 2500Mbits/sec fixed link Florian Fainelli
@ 2021-12-01 17:56 ` Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 3/9] dt-bindings: net: brcm,unimac-mdio: Update maintainers for binding Florian Fainelli
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Florian Fainelli @ 2021-12-01 17:56 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski, Rob Herring,
Rafał Miłecki,
maintainer:BROADCOM IPROC GBIT ETHERNET DRIVER, Doug Berger,
Ray Jui, Scott Branden, Kishon Vijay Abraham I, Vinod Koul,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, moderated list:BROADCOM IPROC ARM ARCHITECTURE,
open list:GENERIC PHY FRAMEWORK
The UniMAC MDIO controller integrated into GENET does not provide a
reg-names property since it is optional, reflect that in the binding.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml | 1 -
1 file changed, 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml b/Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
index f4f4c37f1d4e..cda52f98340f 100644
--- a/Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
+++ b/Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
@@ -64,7 +64,6 @@ unevaluatedProperties: false
required:
- reg
- - reg-names
- '#address-cells'
- '#size-cells'
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next v2 3/9] dt-bindings: net: brcm,unimac-mdio: Update maintainers for binding
2021-12-01 17:56 [PATCH net-next v2 0/9] Broadcom DT bindings conversion to YAML Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 1/9] dt-bindings: net: Document 2500Mbits/sec fixed link Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 2/9] dt-bindings: net: brcm,unimac-mdio: reg-names is optional Florian Fainelli
@ 2021-12-01 17:56 ` Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 4/9] dt-bindings: net: Document moca PHY interface Florian Fainelli
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Florian Fainelli @ 2021-12-01 17:56 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski, Rob Herring,
Rafał Miłecki,
maintainer:BROADCOM IPROC GBIT ETHERNET DRIVER, Doug Berger,
Ray Jui, Scott Branden, Kishon Vijay Abraham I, Vinod Koul,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, moderated list:BROADCOM IPROC ARM ARCHITECTURE,
open list:GENERIC PHY FRAMEWORK
Add Doug and myself as maintainers since this binding is used by the
GENET Ethernet controller for its internal MDIO controller.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml b/Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
index cda52f98340f..0be426ee1e44 100644
--- a/Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
+++ b/Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
@@ -7,6 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Broadcom UniMAC MDIO bus controller
maintainers:
+ - Doug Berger <opendmb@gmail.com>
+ - Florian Fainelli <f.fainelli@gmail.com>
- Rafał Miłecki <rafal@milecki.pl>
allOf:
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next v2 4/9] dt-bindings: net: Document moca PHY interface
2021-12-01 17:56 [PATCH net-next v2 0/9] Broadcom DT bindings conversion to YAML Florian Fainelli
` (2 preceding siblings ...)
2021-12-01 17:56 ` [PATCH net-next v2 3/9] dt-bindings: net: brcm,unimac-mdio: Update maintainers for binding Florian Fainelli
@ 2021-12-01 17:56 ` Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 5/9] dt-bindings: net: Convert GENET binding to YAML Florian Fainelli
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Florian Fainelli @ 2021-12-01 17:56 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski, Rob Herring,
Rafał Miłecki,
maintainer:BROADCOM IPROC GBIT ETHERNET DRIVER, Doug Berger,
Ray Jui, Scott Branden, Kishon Vijay Abraham I, Vinod Koul,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, moderated list:BROADCOM IPROC ARM ARCHITECTURE,
open list:GENERIC PHY FRAMEWORK
MoCA (Multimedia over Coaxial) is used by the internal GENET/MOCA cores
and will be needed in order to convert GENET to YAML in subsequent
changes.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
Documentation/devicetree/bindings/net/ethernet-controller.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
index ff4909e1fdda..404035754db6 100644
--- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml
+++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
@@ -69,6 +69,7 @@ properties:
- rev-mii
- rmii
- rev-rmii
+ - moca
# RX and TX delays are added by the MAC when required
- rgmii
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next v2 5/9] dt-bindings: net: Convert GENET binding to YAML
2021-12-01 17:56 [PATCH net-next v2 0/9] Broadcom DT bindings conversion to YAML Florian Fainelli
` (3 preceding siblings ...)
2021-12-01 17:56 ` [PATCH net-next v2 4/9] dt-bindings: net: Document moca PHY interface Florian Fainelli
@ 2021-12-01 17:56 ` Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 6/9] dt-bindings: net: Convert AMAC " Florian Fainelli
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Florian Fainelli @ 2021-12-01 17:56 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski, Rob Herring,
Rafał Miłecki,
maintainer:BROADCOM IPROC GBIT ETHERNET DRIVER, Doug Berger,
Ray Jui, Scott Branden, Kishon Vijay Abraham I, Vinod Koul,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, moderated list:BROADCOM IPROC ARM ARCHITECTURE,
open list:GENERIC PHY FRAMEWORK
Convert the GENET binding to YAML, leveraging brcm,unimac-mdio.yaml and
the standard ethernet-controller.yaml files.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
.../devicetree/bindings/net/brcm,bcmgenet.txt | 125 ---------------
.../bindings/net/brcm,bcmgenet.yaml | 145 ++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 146 insertions(+), 126 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
create mode 100644 Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
diff --git a/Documentation/devicetree/bindings/net/brcm,bcmgenet.txt b/Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
deleted file mode 100644
index 0b5994fba35f..000000000000
--- a/Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
+++ /dev/null
@@ -1,125 +0,0 @@
-* Broadcom BCM7xxx Ethernet Controller (GENET)
-
-Required properties:
-- compatible: should contain one of "brcm,genet-v1", "brcm,genet-v2",
- "brcm,genet-v3", "brcm,genet-v4", "brcm,genet-v5", "brcm,bcm2711-genet-v5" or
- "brcm,bcm7712-genet-v5".
-- reg: address and length of the register set for the device
-- interrupts and/or interrupts-extended: must be two cells, the first cell
- is the general purpose interrupt line, while the second cell is the
- interrupt for the ring RX and TX queues operating in ring mode. An
- optional third interrupt cell for Wake-on-LAN can be specified.
- See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
- for information on the property specifics.
-- phy-mode: see ethernet.txt file in the same directory
-- #address-cells: should be 1
-- #size-cells: should be 1
-
-Optional properties:
-- clocks: When provided, must be two phandles to the functional clocks nodes
- of the GENET block. The first phandle is the main GENET clock used during
- normal operation, while the second phandle is the Wake-on-LAN clock.
-- clock-names: When provided, names of the functional clock phandles, first
- name should be "enet" and second should be "enet-wol".
-
-- phy-handle: See ethernet.txt file in the same directory; used to describe
- configurations where a PHY (internal or external) is used.
-
-- fixed-link: When the GENET interface is connected to a MoCA hardware block or
- when operating in a RGMII to RGMII type of connection, or when the MDIO bus is
- voluntarily disabled, this property should be used to describe the "fixed link".
- See Documentation/devicetree/bindings/net/fixed-link.txt for information on
- the property specifics
-
-Required child nodes:
-
-- mdio bus node: this node should always be present regardless of the PHY
- configuration of the GENET instance
-
-MDIO bus node required properties:
-
-- compatible: should contain one of "brcm,genet-mdio-v1", "brcm,genet-mdio-v2"
- "brcm,genet-mdio-v3", "brcm,genet-mdio-v4", "brcm,genet-mdio-v5", the version
- has to match the parent node compatible property (e.g: brcm,genet-v4 pairs
- with brcm,genet-mdio-v4)
-- reg: address and length relative to the parent node base register address
-- #address-cells: address cell for MDIO bus addressing, should be 1
-- #size-cells: size of the cells for MDIO bus addressing, should be 0
-
-Ethernet PHY node properties:
-
-See Documentation/devicetree/bindings/net/phy.txt for the list of required and
-optional properties.
-
-Internal Gigabit PHY example:
-
-ethernet@f0b60000 {
- phy-mode = "internal";
- phy-handle = <&phy1>;
- mac-address = [ 00 10 18 36 23 1a ];
- compatible = "brcm,genet-v4";
- #address-cells = <0x1>;
- #size-cells = <0x1>;
- reg = <0xf0b60000 0xfc4c>;
- interrupts = <0x0 0x14 0x0>, <0x0 0x15 0x0>;
-
- mdio@e14 {
- compatible = "brcm,genet-mdio-v4";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
- reg = <0xe14 0x8>;
-
- phy1: ethernet-phy@1 {
- max-speed = <1000>;
- reg = <0x1>;
- compatible = "ethernet-phy-ieee802.3-c22";
- };
- };
-};
-
-MoCA interface / MAC to MAC example:
-
-ethernet@f0b80000 {
- phy-mode = "moca";
- fixed-link = <1 0 1000 0 0>;
- mac-address = [ 00 10 18 36 24 1a ];
- compatible = "brcm,genet-v4";
- #address-cells = <0x1>;
- #size-cells = <0x1>;
- reg = <0xf0b80000 0xfc4c>;
- interrupts = <0x0 0x16 0x0>, <0x0 0x17 0x0>;
-
- mdio@e14 {
- compatible = "brcm,genet-mdio-v4";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
- reg = <0xe14 0x8>;
- };
-};
-
-
-External MDIO-connected Gigabit PHY/switch:
-
-ethernet@f0ba0000 {
- phy-mode = "rgmii";
- phy-handle = <&phy0>;
- mac-address = [ 00 10 18 36 26 1a ];
- compatible = "brcm,genet-v4";
- #address-cells = <0x1>;
- #size-cells = <0x1>;
- reg = <0xf0ba0000 0xfc4c>;
- interrupts = <0x0 0x18 0x0>, <0x0 0x19 0x0>;
-
- mdio@e14 {
- compatible = "brcm,genet-mdio-v4";
- #address-cells = <0x1>;
- #size-cells = <0x0>;
- reg = <0xe14 0x8>;
-
- phy0: ethernet-phy@0 {
- max-speed = <1000>;
- reg = <0x0>;
- compatible = "ethernet-phy-ieee802.3-c22";
- };
- };
-};
diff --git a/Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml b/Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
new file mode 100644
index 000000000000..ba9a6d156815
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
@@ -0,0 +1,145 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/brcm,bcmgenet.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom BCM7xxx Ethernet Controller (GENET) binding
+
+maintainers:
+ - Doug Berger <opendmb@gmail.com>
+ - Florian Fainelli <f.fainelli@gmail.com>
+
+properties:
+ compatible:
+ enum:
+ - brcm,genet-v1
+ - brcm,genet-v2
+ - brcm,genet-v3
+ - brcm,genet-v4
+ - brcm,genet-v5
+ - brcm,bcm2711-genet-v5
+ - brcm,bcm7712-genet-v5
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ minItems: 2
+ items:
+ - description: general purpose interrupt line
+ - description: RX and TX rings interrupt line
+ - description: Wake-on-LAN interrupt line
+
+
+ clocks:
+ minItems: 1
+ items:
+ - description: main clock
+ - description: EEE clock
+ - description: Wake-on-LAN clock
+
+ clock-names:
+ minItems: 1
+ items:
+ - const: enet
+ - const: enet-eee
+ - const: enet-wol
+
+ "#address-cells":
+ const: 1
+
+ "#size-cells":
+ const: 1
+
+patternProperties:
+ "^mdio@[0-9a-f]+$":
+ type: object
+ $ref: "brcm,unimac-mdio.yaml"
+
+ description:
+ GENET internal UniMAC MDIO bus
+
+required:
+ - reg
+ - interrupts
+ - phy-mode
+ - "#address-cells"
+ - "#size-cells"
+
+allOf:
+ - $ref: ethernet-controller.yaml
+
+additionalProperties: true
+
+examples:
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ - |
+ ethernet@f0b60000 {
+ phy-mode = "internal";
+ phy-handle = <&phy1>;
+ mac-address = [ 00 10 18 36 23 1a ];
+ compatible = "brcm,genet-v4";
+ reg = <0xf0b60000 0xfc4c>;
+ interrupts = <0x0 0x14 0x0>, <0x0 0x15 0x0>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ mdio0: mdio@e14 {
+ compatible = "brcm,genet-mdio-v4";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0xe14 0x8>;
+
+ phy1: ethernet-phy@1 {
+ max-speed = <1000>;
+ reg = <1>;
+ compatible = "ethernet-phy-ieee802.3-c22";
+ };
+ };
+ };
+
+ - |
+ ethernet@f0b80000 {
+ phy-mode = "moca";
+ fixed-link = <1 0 1000 0 0>;
+ mac-address = [ 00 10 18 36 24 1a ];
+ compatible = "brcm,genet-v4";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0xf0b80000 0xfc4c>;
+ interrupts = <0x0 0x16 0x0>, <0x0 0x17 0x0>;
+
+ mdio1: mdio@e14 {
+ compatible = "brcm,genet-mdio-v4";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0xe14 0x8>;
+ };
+ };
+
+ - |
+ ethernet@f0ba0000 {
+ phy-mode = "rgmii";
+ phy-handle = <&phy0>;
+ mac-address = [ 00 10 18 36 26 1a ];
+ compatible = "brcm,genet-v4";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0xf0ba0000 0xfc4c>;
+ interrupts = <0x0 0x18 0x0>, <0x0 0x19 0x0>;
+
+ mdio2: mdio@e14 {
+ compatible = "brcm,genet-mdio-v4";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ reg = <0xe14 0x8>;
+
+ phy0: ethernet-phy@0 {
+ max-speed = <1000>;
+ reg = <0>;
+ compatible = "ethernet-phy-ieee802.3-c22";
+ };
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index da2fb287c4b3..eb0f6caf0062 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3830,7 +3830,7 @@ M: Florian Fainelli <f.fainelli@gmail.com>
L: bcm-kernel-feedback-list@broadcom.com
L: netdev@vger.kernel.org
S: Supported
-F: Documentation/devicetree/bindings/net/brcm,bcmgenet.txt
+F: Documentation/devicetree/bindings/net/brcm,bcmgenet.yaml
F: Documentation/devicetree/bindings/net/brcm,unimac-mdio.yaml
F: drivers/net/ethernet/broadcom/genet/
F: drivers/net/ethernet/broadcom/unimac.h
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next v2 6/9] dt-bindings: net: Convert AMAC to YAML
2021-12-01 17:56 [PATCH net-next v2 0/9] Broadcom DT bindings conversion to YAML Florian Fainelli
` (4 preceding siblings ...)
2021-12-01 17:56 ` [PATCH net-next v2 5/9] dt-bindings: net: Convert GENET binding to YAML Florian Fainelli
@ 2021-12-01 17:56 ` Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 7/9] dt-bindings: net: Convert SYSTEMPORT " Florian Fainelli
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Florian Fainelli @ 2021-12-01 17:56 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski, Rob Herring,
Rafał Miłecki,
maintainer:BROADCOM IPROC GBIT ETHERNET DRIVER, Doug Berger,
Ray Jui, Scott Branden, Kishon Vijay Abraham I, Vinod Koul,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, moderated list:BROADCOM IPROC ARM ARCHITECTURE,
open list:GENERIC PHY FRAMEWORK
Convert the Broadcom AMAC Device Tree binding to YAML to help with
schema and dtbs checking.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
.../devicetree/bindings/net/brcm,amac.txt | 30 -------
.../devicetree/bindings/net/brcm,amac.yaml | 88 +++++++++++++++++++
MAINTAINERS | 2 +-
3 files changed, 89 insertions(+), 31 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/net/brcm,amac.txt
create mode 100644 Documentation/devicetree/bindings/net/brcm,amac.yaml
diff --git a/Documentation/devicetree/bindings/net/brcm,amac.txt b/Documentation/devicetree/bindings/net/brcm,amac.txt
deleted file mode 100644
index 0120ebe93262..000000000000
--- a/Documentation/devicetree/bindings/net/brcm,amac.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Broadcom AMAC Ethernet Controller Device Tree Bindings
--------------------------------------------------------------
-
-Required properties:
- - compatible: "brcm,amac"
- "brcm,nsp-amac"
- "brcm,ns2-amac"
- - reg: Address and length of the register set for the device. It
- contains the information of registers in the same order as
- described by reg-names
- - reg-names: Names of the registers.
- "amac_base": Address and length of the GMAC registers
- "idm_base": Address and length of the GMAC IDM registers
- (required for NSP and Northstar2)
- "nicpm_base": Address and length of the NIC Port Manager
- registers (required for Northstar2)
- - interrupts: Interrupt number
-
-The MAC address will be determined using the optional properties
-defined in ethernet.txt.
-
-Examples:
-
-amac0: ethernet@18022000 {
- compatible = "brcm,nsp-amac";
- reg = <0x18022000 0x1000>,
- <0x18110000 0x1000>;
- reg-names = "amac_base", "idm_base";
- interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
-};
diff --git a/Documentation/devicetree/bindings/net/brcm,amac.yaml b/Documentation/devicetree/bindings/net/brcm,amac.yaml
new file mode 100644
index 000000000000..d9de68aba7d3
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/brcm,amac.yaml
@@ -0,0 +1,88 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/brcm,amac.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom AMAC Ethernet Controller Device Tree Bindings
+
+maintainers:
+ - Florian Fainelli <f.fainelli@gmail.com>
+
+allOf:
+ - $ref: "ethernet-controller.yaml#"
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - brcm,amac
+ then:
+ properties:
+ reg:
+ minItems: 1
+ maxItems: 2
+ reg-names:
+ minItems: 1
+ maxItems: 2
+ items:
+ - const: amac_base
+ - const: idm_base
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - brcm,nsp-amac
+ then:
+ properties:
+ reg:
+ minItems: 2
+ maxItems: 2
+ reg-names:
+ items:
+ - const: amac_base
+ - const: idm_base
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - brcm,ns2-amac
+ then:
+ properties:
+ reg:
+ minItems: 3
+ maxItems: 3
+ reg-names:
+ items:
+ - const: amac_base
+ - const: idm_base
+ - const: nicpm_base
+
+properties:
+ compatible:
+ enum:
+ - brcm,amac
+ - brcm,nsp-amac
+ - brcm,ns2-amac
+
+ interrupts:
+ maxItems: 1
+
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+ amac0: ethernet@18022000 {
+ compatible = "brcm,nsp-amac";
+ reg = <0x18022000 0x1000>,
+ <0x18110000 0x1000>;
+ reg-names = "amac_base", "idm_base";
+ interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index eb0f6caf0062..6b32420bd9bd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3872,7 +3872,7 @@ M: Rafał Miłecki <rafal@milecki.pl>
M: bcm-kernel-feedback-list@broadcom.com
L: netdev@vger.kernel.org
S: Maintained
-F: Documentation/devicetree/bindings/net/brcm,amac.txt
+F: Documentation/devicetree/bindings/net/brcm,amac.yaml
F: drivers/net/ethernet/broadcom/bgmac*
F: drivers/net/ethernet/broadcom/unimac.h
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next v2 7/9] dt-bindings: net: Convert SYSTEMPORT to YAML
2021-12-01 17:56 [PATCH net-next v2 0/9] Broadcom DT bindings conversion to YAML Florian Fainelli
` (5 preceding siblings ...)
2021-12-01 17:56 ` [PATCH net-next v2 6/9] dt-bindings: net: Convert AMAC " Florian Fainelli
@ 2021-12-01 17:56 ` Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 8/9] dt-bindings: phy: Convert Northstar 2 PCIe PHY " Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 9/9] dt-bindings: net: Convert iProc MDIO mux " Florian Fainelli
8 siblings, 0 replies; 10+ messages in thread
From: Florian Fainelli @ 2021-12-01 17:56 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski, Rob Herring,
Rafał Miłecki,
maintainer:BROADCOM IPROC GBIT ETHERNET DRIVER, Doug Berger,
Ray Jui, Scott Branden, Kishon Vijay Abraham I, Vinod Koul,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, moderated list:BROADCOM IPROC ARM ARCHITECTURE,
open list:GENERIC PHY FRAMEWORK
Convert the Broadcom SYSTEMPORT Ethernet controller Device Tree binding
to YAML.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
.../bindings/net/brcm,systemport.txt | 38 ---------
.../bindings/net/brcm,systemport.yaml | 82 +++++++++++++++++++
MAINTAINERS | 1 +
3 files changed, 83 insertions(+), 38 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/net/brcm,systemport.txt
create mode 100644 Documentation/devicetree/bindings/net/brcm,systemport.yaml
diff --git a/Documentation/devicetree/bindings/net/brcm,systemport.txt b/Documentation/devicetree/bindings/net/brcm,systemport.txt
deleted file mode 100644
index 75736739bfdd..000000000000
--- a/Documentation/devicetree/bindings/net/brcm,systemport.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-* Broadcom BCM7xxx Ethernet Systemport Controller (SYSTEMPORT)
-
-Required properties:
-- compatible: should be one of:
- "brcm,systemport-v1.00"
- "brcm,systemportlite-v1.00" or
- "brcm,systemport"
-- reg: address and length of the register set for the device.
-- interrupts: interrupts for the device, first cell must be for the rx
- interrupts, and the second cell should be for the transmit queues. An
- optional third interrupt cell for Wake-on-LAN can be specified
-- local-mac-address: Ethernet MAC address (48 bits) of this adapter
-- phy-mode: Should be a string describing the PHY interface to the
- Ethernet switch/PHY, see Documentation/devicetree/bindings/net/ethernet.txt
-- fixed-link: see Documentation/devicetree/bindings/net/fixed-link.txt for
- the property specific details
-
-Optional properties:
-- systemport,num-tier2-arb: number of tier 2 arbiters, an integer
-- systemport,num-tier1-arb: number of tier 1 arbiters, an integer
-- systemport,num-txq: number of HW transmit queues, an integer
-- systemport,num-rxq: number of HW receive queues, an integer
-- clocks: When provided, must be two phandles to the functional clocks nodes of
- the SYSTEMPORT block. The first phandle is the main SYSTEMPORT clock used
- during normal operation, while the second phandle is the Wake-on-LAN clock.
-- clock-names: When provided, names of the functional clock phandles, first
- name should be "sw_sysport" and second should be "sw_sysportwol".
-
-Example:
-ethernet@f04a0000 {
- compatible = "brcm,systemport-v1.00";
- reg = <0xf04a0000 0x4650>;
- local-mac-address = [ 00 11 22 33 44 55 ];
- fixed-link = <0 1 1000 0 0>;
- phy-mode = "gmii";
- interrupts = <0x0 0x16 0x0>,
- <0x0 0x17 0x0>;
-};
diff --git a/Documentation/devicetree/bindings/net/brcm,systemport.yaml b/Documentation/devicetree/bindings/net/brcm,systemport.yaml
new file mode 100644
index 000000000000..44781027ed37
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/brcm,systemport.yaml
@@ -0,0 +1,82 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/brcm,systemport.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom BCM7xxx Ethernet Systemport Controller (SYSTEMPORT)
+
+maintainers:
+ - Florian Fainelli <f.fainelli@gmail.com>
+
+properties:
+ compatible:
+ enum:
+ - brcm,systemport-v1.00
+ - brcm,systemportlite-v1.00
+ - brcm,systemport
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ minItems: 2
+ items:
+ - description: interrupt line for RX queues
+ - description: interrupt line for TX queues
+ - description: interrupt line for Wake-on-LAN
+
+ clocks:
+ items:
+ - description: main clock
+ - description: Wake-on-LAN clock
+
+ clock-names:
+ items:
+ - const: sw_sysport
+ - const: sw_sysportwol
+
+ "systemport,num-tier2-arb":
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Number of tier 2 arbiters
+
+ "systemport,num-tier1-arb":
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Number of tier 2 arbiters
+
+ "systemport,num-txq":
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Number of HW transmit queues
+
+ "systemport,num-rxq":
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Number of HW receive queues
+
+required:
+ - reg
+ - interrupts
+ - phy-mode
+
+allOf:
+ - $ref: "ethernet-controller.yaml#"
+
+additionalProperties: true
+
+examples:
+ - |
+ ethernet@f04a0000 {
+ compatible = "brcm,systemport-v1.00";
+ reg = <0xf04a0000 0x4650>;
+ local-mac-address = [ 00 11 22 33 44 55 ];
+ phy-mode = "gmii";
+ interrupts = <0x0 0x16 0x0>,
+ <0x0 0x17 0x0>;
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 6b32420bd9bd..8f544447ef94 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3983,6 +3983,7 @@ L: netdev@vger.kernel.org
S: Supported
F: drivers/net/ethernet/broadcom/bcmsysport.*
F: drivers/net/ethernet/broadcom/unimac.h
+F: Documentation/devicetree/bindings/net/brcm,systemport.yaml
BROADCOM TG3 GIGABIT ETHERNET DRIVER
M: Siva Reddy Kallam <siva.kallam@broadcom.com>
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next v2 8/9] dt-bindings: phy: Convert Northstar 2 PCIe PHY to YAML
2021-12-01 17:56 [PATCH net-next v2 0/9] Broadcom DT bindings conversion to YAML Florian Fainelli
` (6 preceding siblings ...)
2021-12-01 17:56 ` [PATCH net-next v2 7/9] dt-bindings: net: Convert SYSTEMPORT " Florian Fainelli
@ 2021-12-01 17:56 ` Florian Fainelli
2021-12-01 17:56 ` [PATCH net-next v2 9/9] dt-bindings: net: Convert iProc MDIO mux " Florian Fainelli
8 siblings, 0 replies; 10+ messages in thread
From: Florian Fainelli @ 2021-12-01 17:56 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski, Rob Herring,
Rafał Miłecki,
maintainer:BROADCOM IPROC GBIT ETHERNET DRIVER, Doug Berger,
Ray Jui, Scott Branden, Kishon Vijay Abraham I, Vinod Koul,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, moderated list:BROADCOM IPROC ARM ARCHITECTURE,
open list:GENERIC PHY FRAMEWORK
Convert the Broadcom Northstar 2 PCIe PHY Device Tree binding to YAML
and rename it accordingly in the process since it had nothing to do with
a MDIO mux on the PCI(e) bus. This is a pre-requisite to updating
another binding file to YAML.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
.../bindings/phy/brcm,mdio-mux-bus-pci.txt | 27 ------------
.../bindings/phy/brcm,ns2-pcie-phy.yaml | 41 +++++++++++++++++++
2 files changed, 41 insertions(+), 27 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt
create mode 100644 Documentation/devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml
diff --git a/Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt b/Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt
deleted file mode 100644
index 5b51007c6f24..000000000000
--- a/Documentation/devicetree/bindings/phy/brcm,mdio-mux-bus-pci.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-* Broadcom NS2 PCIe PHY binding document
-
-Required bus properties:
-- reg: MDIO Bus number for the MDIO interface
-- #address-cells: must be 1
-- #size-cells: must be 0
-
-Required PHY properties:
-- compatible: should be "brcm,ns2-pcie-phy"
-- reg: MDIO Phy ID for the MDIO interface
-- #phy-cells: must be 0
-
-This is a child bus node of "brcm,mdio-mux-iproc" node.
-
-Example:
-
-mdio@0 {
- reg = <0x0>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pci_phy0: pci-phy@0 {
- compatible = "brcm,ns2-pcie-phy";
- reg = <0x0>;
- #phy-cells = <0>;
- };
-};
diff --git a/Documentation/devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml b/Documentation/devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml
new file mode 100644
index 000000000000..70eb48b391c9
--- /dev/null
+++ b/Documentation/devicetree/bindings/phy/brcm,ns2-pcie-phy.yaml
@@ -0,0 +1,41 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/phy/brcm,ns2-pcie-phy.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom NS2 PCIe PHY binding document
+
+maintainers:
+ - Ray Jui <ray.jui@broadcom.com>
+ - Scott Branden <scott.branden@broadcom.com>
+
+properties:
+ compatible:
+ const: brcm,ns2-pcie-phy
+
+ reg:
+ maxItems: 1
+
+ "#phy-cells":
+ const: 0
+
+required:
+ - compatible
+ - reg
+ - "#phy-cells"
+
+additionalProperties: false
+
+examples:
+ - |
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pci-phy@0 {
+ compatible = "brcm,ns2-pcie-phy";
+ reg = <0x0>;
+ #phy-cells = <0>;
+ };
+ };
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH net-next v2 9/9] dt-bindings: net: Convert iProc MDIO mux to YAML
2021-12-01 17:56 [PATCH net-next v2 0/9] Broadcom DT bindings conversion to YAML Florian Fainelli
` (7 preceding siblings ...)
2021-12-01 17:56 ` [PATCH net-next v2 8/9] dt-bindings: phy: Convert Northstar 2 PCIe PHY " Florian Fainelli
@ 2021-12-01 17:56 ` Florian Fainelli
8 siblings, 0 replies; 10+ messages in thread
From: Florian Fainelli @ 2021-12-01 17:56 UTC (permalink / raw)
To: netdev
Cc: Florian Fainelli, David S. Miller, Jakub Kicinski, Rob Herring,
Rafał Miłecki,
maintainer:BROADCOM IPROC GBIT ETHERNET DRIVER, Doug Berger,
Ray Jui, Scott Branden, Kishon Vijay Abraham I, Vinod Koul,
open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS,
open list, moderated list:BROADCOM IPROC ARM ARCHITECTURE,
open list:GENERIC PHY FRAMEWORK
Conver the Broadcom iProc MDIO mux Device Tree binding to YAML.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
.../bindings/net/brcm,mdio-mux-iproc.txt | 62 --------------
.../bindings/net/brcm,mdio-mux-iproc.yaml | 80 +++++++++++++++++++
2 files changed, 80 insertions(+), 62 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt
create mode 100644 Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.yaml
diff --git a/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt b/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt
deleted file mode 100644
index deb9e852ea27..000000000000
--- a/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.txt
+++ /dev/null
@@ -1,62 +0,0 @@
-Properties for an MDIO bus multiplexer found in Broadcom iProc based SoCs.
-
-This MDIO bus multiplexer defines buses that could be internal as well as
-external to SoCs and could accept MDIO transaction compatible to C-22 or
-C-45 Clause. When child bus is selected, one needs to select these two
-properties as well to generate desired MDIO transaction on appropriate bus.
-
-Required properties in addition to the generic multiplexer properties:
-
-MDIO multiplexer node:
-- compatible: brcm,mdio-mux-iproc.
-
-Every non-ethernet PHY requires a compatible so that it could be probed based
-on this compatible string.
-
-Optional properties:
-- clocks: phandle of the core clock which drives the mdio block.
-
-Additional information regarding generic multiplexer properties can be found
-at- Documentation/devicetree/bindings/net/mdio-mux.yaml
-
-
-for example:
- mdio_mux_iproc: mdio-mux@66020000 {
- compatible = "brcm,mdio-mux-iproc";
- reg = <0x66020000 0x250>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- mdio@0 {
- reg = <0x0>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pci_phy0: pci-phy@0 {
- compatible = "brcm,ns2-pcie-phy";
- reg = <0x0>;
- #phy-cells = <0>;
- };
- };
-
- mdio@7 {
- reg = <0x7>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- pci_phy1: pci-phy@0 {
- compatible = "brcm,ns2-pcie-phy";
- reg = <0x0>;
- #phy-cells = <0>;
- };
- };
- mdio@10 {
- reg = <0x10>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- gphy0: eth-phy@10 {
- reg = <0x10>;
- };
- };
- };
diff --git a/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.yaml b/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.yaml
new file mode 100644
index 000000000000..a576fb87bfc8
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/brcm,mdio-mux-iproc.yaml
@@ -0,0 +1,80 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/brcm,mdio-mux-iproc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: MDIO bus multiplexer found in Broadcom iProc based SoCs.
+
+maintainers:
+ - Florian Fainelli <f.fainelli@gmail.com>
+
+description:
+ This MDIO bus multiplexer defines buses that could be internal as well as
+ external to SoCs and could accept MDIO transaction compatible to C-22 or
+ C-45 Clause. When child bus is selected, one needs to select these two
+ properties as well to generate desired MDIO transaction on appropriate bus.
+
+allOf:
+ - $ref: /schemas/net/mdio-mux.yaml#
+
+properties:
+ compatible:
+ const: brcm,mdio-mux-iproc
+
+ reg:
+ maxItems: 1
+
+ clocks:
+ maxItems: 1
+ description: core clock driving the MDIO block
+
+
+required:
+ - compatible
+ - reg
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ mdio_mux_iproc: mdio-mux@66020000 {
+ compatible = "brcm,mdio-mux-iproc";
+ reg = <0x66020000 0x250>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ mdio@0 {
+ reg = <0x0>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pci_phy0: pci-phy@0 {
+ compatible = "brcm,ns2-pcie-phy";
+ reg = <0x0>;
+ #phy-cells = <0>;
+ };
+ };
+
+ mdio@7 {
+ reg = <0x7>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ pci_phy1: pci-phy@0 {
+ compatible = "brcm,ns2-pcie-phy";
+ reg = <0x0>;
+ #phy-cells = <0>;
+ };
+ };
+
+ mdio@10 {
+ reg = <0x10>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ gphy0: eth-phy@10 {
+ reg = <0x10>;
+ };
+ };
+ };
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread