Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85ad3dee authored by Murali Karicheri's avatar Murali Karicheri Committed by Santosh Shilimkar
Browse files

ARM: dts: keystone: Fix the mdio bindings by moving it to soc specific file 



Currently mdio bindings are defined in keystone.dtsi and this results
in incorrect unit address for the node on K2E and K2L SoCs. Fix this
by moving them to SoC specific DTS file.

Signed-off-by: default avatarMurali Karicheri <m-karicheri2@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <ssantosh@kernel.org>
parent e61eee7c

arch/arm/boot/dts/k2e.dtsi

+11 −4
Original line number Diff line number Diff line
@@ -130,10 +130,17 @@ 
					<GIC_SPI 376 IRQ_TYPE_EDGE_RISING>;

			};

		};

		/include/ "k2e-netcp.dtsi"

	};

};



&mdio {

		mdio: mdio@24200f00 {

			compatible	= "ti,keystone_mdio", "ti,davinci_mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x24200f00 0x100>;

			status = "disabled";

			clocks = <&clkcpgmac>;

			clock-names = "fck";

			bus_freq	= <2500000>;

		};

		/include/ "k2e-netcp.dtsi"

	};

};

arch/arm/boot/dts/k2hk.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -98,6 +98,17 @@ 
			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x25c>;

		};



		mdio: mdio@02090300 {

			compatible	= "ti,keystone_mdio", "ti,davinci_mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x02090300 0x100>;

			status = "disabled";

			clocks = <&clkcpgmac>;

			clock-names = "fck";

			bus_freq	= <2500000>;

		};

		/include/ "k2hk-netcp.dtsi"

	};

};

arch/arm/boot/dts/k2l.dtsi

+11 −5
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
	};



	soc {



		/include/ "k2l-clocks.dtsi"



		uart2: serial@02348400 {
@@ -79,6 +78,17 @@ 
			#gpio-cells = <2>;

			gpio,syscon-dev = <&devctrl 0x24c>;

		};



		mdio: mdio@26200f00 {

			compatible	= "ti,keystone_mdio", "ti,davinci_mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x26200f00 0x100>;

			status = "disabled";

			clocks = <&clkcpgmac>;

			clock-names = "fck";

			bus_freq	= <2500000>;

		};

		/include/ "k2l-netcp.dtsi"

	};

};
@@ -96,7 +106,3 @@ 
       /* Pin muxed. Enabled and configured by Bootloader */

       status = "disabled";

};
 


&mdio {

	reg = <0x26200f00 0x100>;

};

arch/arm/boot/dts/keystone.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -267,17 +267,6 @@ 
				  1 0 0x21000A00 0x00000100>;

		};



		mdio: mdio@02090300 {

			compatible	= "ti,keystone_mdio", "ti,davinci_mdio";

			#address-cells = <1>;

			#size-cells = <0>;

			reg		= <0x02090300 0x100>;

			status = "disabled";

			clocks = <&clkcpgmac>;

			clock-names = "fck";

			bus_freq	= <2500000>;

		};



		kirq0: keystone_irq@26202a0 {

			compatible = "ti,keystone-irq";

			interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;