[PATCH 2/3] arm64: dts: ti: k3-am64: Merge the two main_conf nodes

[Andrew Davis]

On 8/2/23 12:45 PM, Andrew Davis wrote:
> There are two nodes representing the same register space, this looks to
> have been created by some merge or copy/paste error. Remove the second
> instance of this node and move its children into the first instance.
> 
> Signed-off-by: Andrew Davis <afd at ti.com>
> ---


Nishanth, this is based/dependent on your -next branch.

Andrew

>   arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 42 ++++++++++--------------
>   1 file changed, 17 insertions(+), 25 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> index d3dd8c426dada..e27eb2e585f14 100644
> --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> @@ -44,11 +44,28 @@ main_conf: syscon at 43000000 {
>   		#size-cells = <1>;
>   		ranges = <0x0 0x0 0x43000000 0x20000>;
>   
> +		chipid at 14 {
> +			compatible = "ti,am654-chipid";
> +			reg = <0x00000014 0x4>;
> +		};
> +
>   		serdes_ln_ctrl: mux-controller {
>   			compatible = "mmio-mux";
>   			#mux-control-cells = <1>;
>   			mux-reg-masks = <0x4080 0x3>; /* SERDES0 lane0 select */
>   		};
> +
> +		phy_gmii_sel: phy at 4044 {
> +			compatible = "ti,am654-phy-gmii-sel";
> +			reg = <0x4044 0x8>;
> +			#phy-cells = <1>;
> +		};
> +
> +		epwm_tbclk: clock at 4140 {
> +			compatible = "ti,am64-epwm-tbclk";
> +			reg = <0x4130 0x4>;
> +			#clock-cells = <1>;
> +		};
>   	};
>   
>   	gic500: interrupt-controller at 1800000 {
> @@ -203,31 +220,6 @@ main_pmx0: pinctrl at f4000 {
>   		pinctrl-single,function-mask = <0xffffffff>;
>   	};
>   
> -	main_conf: syscon at 43000000 {
> -		compatible = "syscon", "simple-mfd";
> -		reg = <0x00 0x43000000 0x00 0x20000>;
> -		#address-cells = <1>;
> -		#size-cells = <1>;
> -		ranges = <0x00 0x00 0x43000000 0x20000>;
> -
> -		chipid at 14 {
> -			compatible = "ti,am654-chipid";
> -			reg = <0x00000014 0x4>;
> -		};
> -
> -		phy_gmii_sel: phy at 4044 {
> -			compatible = "ti,am654-phy-gmii-sel";
> -			reg = <0x4044 0x8>;
> -			#phy-cells = <1>;
> -		};
> -
> -		epwm_tbclk: clock at 4140 {
> -			compatible = "ti,am64-epwm-tbclk";
> -			reg = <0x4130 0x4>;
> -			#clock-cells = <1>;
> -		};
> -	};
> -
>   	main_timer0: timer at 2400000 {
>   		compatible = "ti,am654-timer";
>   		reg = <0x00 0x2400000 0x00 0x400>;