arm64: dts: ti: k3-am62a: Add cpsw-mac-efuse node to wkup_conf

The WKUP system controller address region contains an eFuse block with
MAC addresses to be used by the Ethernet controller. The property
“ti,syscon-efuse” contains a phandle to a syscon region and an offset
into this region where the MAC addresses can be found. Currently
"ti,syscon-efuse" points to the entire system controller address space
node with an offset to the eFuse IP address.

Instead add a cpsw-mac-efuse node to describe the exact eFuse area. Then
point the Ethernet controller directly to this region, no offset needed.

This makes it so the system controller memory area does not need to be one
big syscon area, describe this bus address area as the simple-bus it is.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240628151518.40100-7-afd@ti.com
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
index ae9560632fbef2a22ee28d10eb8b81081741eaa4..916fcf3cc57d1314c1d7cc36edd151d74a38c474 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
@@ -739,7 +739,7 @@
                                label = "port1";
                                phys = <&phy_gmii_sel 1>;
                                mac-address = [00 00 00 00 00 00];
-                               ti,syscon-efuse = <&wkup_conf 0x200>;
+                               ti,syscon-efuse = <&cpsw_mac_syscon 0x0>;
                        };
 
                        cpsw_port2: port@2 {

diff --git a/arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi
index 5c5aca4bb925818b7254c4a37b4d51c5883d75a9..f5ac101a04dfa0bdae8ac4f43b01473725433c51 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi
@@ -6,9 +6,8 @@
  */
 
 &cbass_wakeup {
-       wkup_conf: syscon@43000000 {
-               compatible = "ti,j721e-system-controller", "syscon", "simple-mfd";
-               reg = <0x00 0x43000000 0x00 0x20000>;
+       wkup_conf: bus@43000000 {
+               compatible = "simple-bus";
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x00 0x00 0x43000000 0x20000>;
@@ -18,6 +17,11 @@
                        reg = <0x14 0x4>;
                };
 
+               cpsw_mac_syscon: ethernet-mac-syscon@200 {
+                       compatible = "ti,am62p-cpsw-mac-efuse", "syscon";
+                       reg = <0x200 0x8>;
+               };
+
                usb0_phy_ctrl: syscon@4008 {
                        compatible = "ti,am62-usb-phy-ctrl", "syscon";
                        reg = <0x4008 0x4>;