[PATCH] arm64: zynqmp: Describe ethernet controllers via aliases on SOM

[Michal Simek]

On 1/21/25 14:41, Michal Simek wrote:
> Add ethernet aliases to CC (Carrier card) description to create a
> connection which is used by fdt_fixup_ethernet() for updating
> local-mac-address in DT.
> On Kria SOM MAC address is read from i2c eeprom at start and based on it
> environment variables are created. Without creating aliases U-Boot is not
> able to inject local-mac-address DT property and OS won't get the same MAC
> address unless another i2c read is happening in OS.
> Also aliases are using string not phandle that's why full path has to be
> provided but that shouldn't be a big issue because location of ethernet
> controller is fixed.
> 
> Signed-off-by: Michal Simek <michal.simek at amd.com>
> ---
> 
>   arch/arm/dts/zynqmp-sck-kd-g-revA.dtso | 4 ++++
>   arch/arm/dts/zynqmp-sck-kr-g-revA.dtso | 5 +++++
>   arch/arm/dts/zynqmp-sck-kv-g-revA.dtso | 4 ++++
>   arch/arm/dts/zynqmp-sck-kv-g-revB.dtso | 4 ++++
>   4 files changed, 17 insertions(+)
> 
> diff --git a/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso
> index d56e863ce1c5..02be5e1e8686 100644
> --- a/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso
> +++ b/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso
> @@ -22,6 +22,10 @@
>   		     "xlnx,zynqmp-sk-kd240", "xlnx,zynqmp";
>   	model = "ZynqMP KD240 revA/B/1";
>   
> +	aliases {
> +		ethernet0 = "/axi/ethernet at ff0c0000"; /* &gem1 */
> +	};
> +
>   	ina260-u3 {
>   		compatible = "iio-hwmon";
>   		io-channels = <&u3 0>, <&u3 1>, <&u3 2>;
> diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso
> index 9d0c0c2885df..fbacfa984d76 100644
> --- a/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso
> +++ b/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso
> @@ -20,6 +20,11 @@
>   		     "xlnx,zynqmp-sk-kr260", "xlnx,zynqmp";
>   	model = "ZynqMP KR260 revA";
>   
> +	aliases {
> +		ethernet0 = "/axi/ethernet at ff0b0000"; /* &gem0 */
> +		ethernet1 = "/axi/ethernet at ff0c0000"; /* &gem1 */
> +	};
> +
>   	ina260-u14 {
>   		compatible = "iio-hwmon";
>   		io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
> diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso
> index a98a888d1385..3c36eb52e968 100644
> --- a/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso
> +++ b/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso
> @@ -28,6 +28,10 @@
>   		     "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp";
>   	model = "ZynqMP KV260 revA";
>   
> +	aliases {
> +		ethernet0 = "/axi/ethernet at ff0e0000"; /* &gem3 */
> +	};
> +
>   	ina260-u14 {
>   		compatible = "iio-hwmon";
>   		io-channels = <&u14 0>, <&u14 1>, <&u14 2>;
> diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso
> index 7490efea98bd..078d98e8ff34 100644
> --- a/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso
> +++ b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso
> @@ -23,6 +23,10 @@
>   		     "xlnx,zynqmp-sk-kv260", "xlnx,zynqmp";
>   	model = "ZynqMP KV260 revB";
>   
> +	aliases {
> +		ethernet0 = "/axi/ethernet at ff0e0000"; /* &gem3 */
> +	};
> +
>   	ina260-u14 {
>   		compatible = "iio-hwmon";
>   		io-channels = <&u14 0>, <&u14 1>, <&u14 2>;

Applied.
M