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

Commit 02149517 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'keystone-dts-late-fixes-v2' of... 

Merge tag 'keystone-dts-late-fixes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into fixes

ARM: Couple of Keysyone MDIO DTS fixes for 4.2-rc6+

These are necessary to get the NIC card working on all Keystone
EVMs. Couple of boards are broken without these two fixes.

* tag 'keystone-dts-late-fixes-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone

:
  ARM: dts: keystone: Fix the mdio bindings by moving it to soc specific file
  ARM: dts: keystone: fix the clock node for mdio

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 659181ae 85ad3dee

arch/arm/boot/dts/k2e.dtsi

+11 −4
Original line number Diff line number Diff line
@@ -131,10 +131,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 = <&clkpa>;

			clock-names = "fck";

			bus_freq	= <2500000>;

		};



		kirq0: keystone_irq@26202a0 {

			compatible = "ti,keystone-irq";

			interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;