Re: [PATCH] arm64: dts: zynqmp: Remove clock-names from GEM in zynqmp-clk-ccf.dtsi

[Michal Simek]

On 12/9/22 14:58, Michal Simek wrote:
> Remove clock-names from GEM nodes from clk-ccf because they should be only
> present in zynqmp.dtsi. And as is visible both clock-names defined didn't
> really match.
>
> Signed-off-by: Michal Simek <michal.simek@xxxxxxx>
> ---
>
>   arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ----
>   arch/arm64/boot/dts/xilinx/zynqmp.dtsi         | 8 ++++----
>   2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi
> index e172fa05c9a0..3e9979ab60bb 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi
> @@ -135,28 +135,24 @@ &gem0 {
>   	clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM0_REF>,
>   		 <&zynqmp_clk GEM0_TX>, <&zynqmp_clk GEM0_RX>,
>   		 <&zynqmp_clk GEM_TSU>;
> -	clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
>   };
>   
>   &gem1 {
>   	clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM1_REF>,
>   		 <&zynqmp_clk GEM1_TX>, <&zynqmp_clk GEM1_RX>,
>   		 <&zynqmp_clk GEM_TSU>;
> -	clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
>   };
>   
>   &gem2 {
>   	clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM2_REF>,
>   		 <&zynqmp_clk GEM2_TX>, <&zynqmp_clk GEM2_RX>,
>   		 <&zynqmp_clk GEM_TSU>;
> -	clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
>   };
>   
>   &gem3 {
>   	clocks = <&zynqmp_clk LPD_LSBUS>, <&zynqmp_clk GEM3_REF>,
>   		 <&zynqmp_clk GEM3_TX>, <&zynqmp_clk GEM3_RX>,
>   		 <&zynqmp_clk GEM_TSU>;
> -	clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
>   };
>   
>   &gpio {
> diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> index 233127d94204..518a3d98b4b9 100644
> --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
> @@ -512,7 +512,7 @@ gem0: ethernet@ff0b0000 {
>   			interrupt-parent = <&gic>;
>   			interrupts = <0 57 4>, <0 57 4>;
>   			reg = <0x0 0xff0b0000 0x0 0x1000>;
> -			clock-names = "pclk", "hclk", "tx_clk";
> +			clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
>   			#address-cells = <1>;
>   			#size-cells = <0>;
>   			iommus = <&smmu 0x874>;
> @@ -527,7 +527,7 @@ gem1: ethernet@ff0c0000 {
>   			interrupt-parent = <&gic>;
>   			interrupts = <0 59 4>, <0 59 4>;
>   			reg = <0x0 0xff0c0000 0x0 0x1000>;
> -			clock-names = "pclk", "hclk", "tx_clk";
> +			clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
>   			#address-cells = <1>;
>   			#size-cells = <0>;
>   			iommus = <&smmu 0x875>;
> @@ -542,7 +542,7 @@ gem2: ethernet@ff0d0000 {
>   			interrupt-parent = <&gic>;
>   			interrupts = <0 61 4>, <0 61 4>;
>   			reg = <0x0 0xff0d0000 0x0 0x1000>;
> -			clock-names = "pclk", "hclk", "tx_clk";
> +			clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
>   			#address-cells = <1>;
>   			#size-cells = <0>;
>   			iommus = <&smmu 0x876>;
> @@ -557,7 +557,7 @@ gem3: ethernet@ff0e0000 {
>   			interrupt-parent = <&gic>;
>   			interrupts = <0 63 4>, <0 63 4>;
>   			reg = <0x0 0xff0e0000 0x0 0x1000>;
> -			clock-names = "pclk", "hclk", "tx_clk";
> +			clock-names = "pclk", "hclk", "tx_clk", "rx_clk", "tsu_clk";
>   			#address-cells = <1>;
>   			#size-cells = <0>;
>   			iommus = <&smmu 0x877>;

Applied.
M