| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250527175558.2738342-3-james.hilliard1@gmail.com>
Date: Tue, 27 May 2025 11:55:56 -0600
From: James Hilliard <james.hilliard1@...il.com>
To: netdev@...r.kernel.org
Cc: linux-sunxi@...ts.linux.dev,
James Hilliard <james.hilliard1@...il.com>,
Andrew Lunn <andrew+netdev@...n.ch>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>,
Conor Dooley <conor+dt@...nel.org>,
Chen-Yu Tsai <wens@...e.org>,
Jernej Skrabec <jernej.skrabec@...il.com>,
Samuel Holland <samuel@...lland.org>,
Maxime Ripard <mripard@...nel.org>,
Alexandre Torgue <alexandre.torgue@...s.st.com>,
Giuseppe Cavallaro <peppe.cavallaro@...com>,
Jose Abreu <joabreu@...opsys.com>,
devicetree@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org
Subject: [PATCH v2 3/3] dt-bindings: net: sun8i-emac: Add AC300 EMAC1 nvmem phy selection
The Allwinner H616 EMAC1 can be connected to an copackaged AC200
or AC300 PHY depending upon the variant.
Add a new allwinner,sun50i-h616-emac1 compatible and example, support
for the allwinner,sun50i-h616-emac1 EMAC1 MAC will be added later on.
Add nvmem-cells and nvmem-cell-names properties for the ac300 efuse
based phy selection.
Signed-off-by: James Hilliard <james.hilliard1@...il.com>
---
Changes v1 -> v2:
- fix dt_binding_check
---
.../net/allwinner,sun8i-a83t-emac.yaml | 75 ++++++++++++++++++-
.../bindings/net/ethernet-controller.yaml | 26 +++++--
.../devicetree/bindings/net/snps,dwmac.yaml | 2 +
3 files changed, 94 insertions(+), 9 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml b/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
index 7fe0352dff0f..3a8c31dd9ae7 100644
--- a/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
+++ b/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml
@@ -18,6 +18,7 @@ properties:
- const: allwinner,sun8i-r40-gmac
- const: allwinner,sun8i-v3s-emac
- const: allwinner,sun50i-a64-emac
+ - const: allwinner,sun50i-h616-emac1
- items:
- enum:
- allwinner,sun20i-d1-emac
@@ -58,7 +59,6 @@ required:
- clock-names
- resets
- reset-names
- - phy-handle
- phy-mode
- syscon
@@ -73,6 +73,7 @@ allOf:
- allwinner,sun8i-h3-emac
- allwinner,sun8i-v3s-emac
- allwinner,sun50i-a64-emac
+ - allwinner,sun50i-h616-emac1
then:
properties:
@@ -189,6 +190,42 @@ allOf:
- mdio-parent-bus
- mdio@1
+ - if:
+ not:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - allwinner,sun50i-h616-emac1
+
+ then:
+ required:
+ - phy-handle
+
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - allwinner,sun50i-h616-emac1
+
+ then:
+ properties:
+ nvmem-cells: true
+
+ nvmem-cell-names: true
+
+ phys:
+ maxItems: 2
+
+ phy-names:
+ items:
+ - const: ac200
+ - const: ac300
+
+ mdio:
+ $ref: mdio.yaml#
+
unevaluatedProperties: false
examples:
@@ -321,4 +358,40 @@ examples:
};
};
+ - |
+ ethernet@...0000 {
+ compatible = "allwinner,sun50i-h616-emac1";
+ syscon = <&syscon>;
+ reg = <0x05030000 0x10000>;
+ interrupts = <0 15 4>;
+ interrupt-names = "macirq";
+ resets = <&ccu 31>;
+ reset-names = "stmmaceth";
+ clocks = <&ccu 83>;
+ clock-names = "stmmaceth";
+ phys = <&ac200_rmii_phy>, <&ac300_rmii_phy>;
+ phy-names = "ac200", "ac300";
+ phy-mode = "rgmii";
+ nvmem-cells = <&ephy_acx00>;
+ nvmem-cell-names = "ac300";
+
+ mdio {
+ compatible = "snps,dwmac-mdio";
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ac300_rmii_phy: ac300-ethernet-phy@0 {
+ #phy-cells = <0>;
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ };
+
+ ac200_rmii_phy: ac200-ethernet-phy@1 {
+ #phy-cells = <0>;
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
+ };
+ };
+
...
diff --git a/Documentation/devicetree/bindings/net/ethernet-controller.yaml b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
index a2d4c626f659..710e651851e5 100644
--- a/Documentation/devicetree/bindings/net/ethernet-controller.yaml
+++ b/Documentation/devicetree/bindings/net/ethernet-controller.yaml
@@ -45,14 +45,6 @@ properties:
description:
Specifies maximum speed in Mbit/s supported by the device.
- nvmem-cells:
- maxItems: 1
- description:
- Reference to an nvmem node for the MAC address
-
- nvmem-cell-names:
- const: mac-address
-
phy-connection-type:
description:
Specifies interface type between the Ethernet device and a physical
@@ -260,6 +252,24 @@ dependencies:
pcs-handle-names: [pcs-handle]
allOf:
+ - if:
+ not:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - allwinner,sun50i-h616-emac1
+
+ then:
+ properties:
+ nvmem-cells:
+ maxItems: 1
+ description:
+ Reference to an nvmem node for the MAC address
+
+ nvmem-cell-names:
+ const: mac-address
+
- if:
properties:
phy-mode:
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index 78b3030dc56d..a6dfed00c48f 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -56,6 +56,7 @@ properties:
- allwinner,sun8i-r40-gmac
- allwinner,sun8i-v3s-emac
- allwinner,sun50i-a64-emac
+ - allwinner,sun50i-h616-emac1
- amlogic,meson6-dwmac
- amlogic,meson8b-dwmac
- amlogic,meson8m2-dwmac
@@ -620,6 +621,7 @@ allOf:
- allwinner,sun8i-r40-gmac
- allwinner,sun8i-v3s-emac
- allwinner,sun50i-a64-emac
+ - allwinner,sun50i-h616-emac1
- loongson,ls2k-dwmac
- loongson,ls7a-dwmac
- ingenic,jz4775-mac
--
2.34.1
Powered by blists - more mailing lists