Commit a57ba56b authored by Andrew Davis's avatar Andrew Davis Committed by Nishanth Menon
Browse files

arm64: dts: ti: k3-am64: Merge the two main_conf nodes 



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: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20230802174521.236255-2-afd@ti.com


Signed-off-by: default avatarNishanth Menon <nm@ti.com>
parent b9d801db

arch/arm64/boot/dts/ti/k3-am64-main.dtsi

+17 −25
Original line number Diff line number Diff line
@@ -44,11 +44,28 @@ main_conf: syscon@43000000 { 
		#size-cells = <1>;

		ranges = <0x0 0x0 0x43000000 0x20000>;



		chipid@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@4044 {

			compatible = "ti,am654-phy-gmii-sel";

			reg = <0x4044 0x8>;

			#phy-cells = <1>;

		};



		epwm_tbclk: clock@4140 {

			compatible = "ti,am64-epwm-tbclk";

			reg = <0x4130 0x4>;

			#clock-cells = <1>;

		};

	};



	gic500: interrupt-controller@1800000 {
@@ -203,31 +220,6 @@ main_pmx0: pinctrl@f4000 { 
		pinctrl-single,function-mask = <0xffffffff>;

	};



	main_conf: syscon@43000000 {

		compatible = "syscon", "simple-mfd";

		reg = <0x00 0x43000000 0x00 0x20000>;

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0x00 0x00 0x43000000 0x20000>;



		chipid@14 {

			compatible = "ti,am654-chipid";

			reg = <0x00000014 0x4>;

		};



		phy_gmii_sel: phy@4044 {

			compatible = "ti,am654-phy-gmii-sel";

			reg = <0x4044 0x8>;

			#phy-cells = <1>;

		};



		epwm_tbclk: clock@4140 {

			compatible = "ti,am64-epwm-tbclk";

			reg = <0x4130 0x4>;

			#clock-cells = <1>;

		};

	};



	main_timer0: timer@2400000 {

		compatible = "ti,am654-timer";

		reg = <0x00 0x2400000 0x00 0x400>;