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

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

Merge tag 'keystone-dts' of... 

Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

Merge "Keystone DTS update for 3.17" from Santosh Shilimkar:

Keystone DTS update for 3.17
 - Ethernet clock tree fix.
 - MDIO device tree node. Respective driver update is already queued.
 - Ethernet phy node. Respective driver update is already queued.

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

:
  ARM: dts: keystone-evm: add 1g ethernet phys nodes
  ARM: dts: keystone: add mdio devices entries
  ARM: dts: keystone: fix netcp's clocks definitions

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 412a9bbd 6592f671

arch/arm/boot/dts/k2e-clocks.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ clocks { 
		#clock-cells = <0>;

		compatible = "ti,keystone,pll-clock";

		clocks = <&refclkpass>;

		clock-output-names = "pa-pll-clk";

		clock-output-names = "papllclk";

		reg = <0x02620358 4>;

		reg-names = "control";

	};

arch/arm/boot/dts/k2hk-clocks.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ clocks { 
		#clock-cells = <0>;

		compatible = "ti,keystone,pll-clock";

		clocks = <&refclkpass>;

		clock-output-names = "pa-pll-clk";

		clock-output-names = "papllclk";

		reg = <0x02620358 4>;

		reg-names = "control";

	};

arch/arm/boot/dts/k2hk-evm.dts

+12 −0
Original line number Diff line number Diff line
@@ -167,3 +167,15 @@ 
		};

	};

};



&mdio {

	ethphy0: ethernet-phy@0 {

		compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";

		reg = <0>;

	};



	ethphy1: ethernet-phy@1 {

		compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";

		reg = <1>;

	};

};

arch/arm/boot/dts/k2l-clocks.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ clocks { 
		#clock-cells = <0>;

		compatible = "ti,keystone,pll-clock";

		clocks = <&refclksys>;

		clock-output-names = "pa-pll-clk";

		clock-output-names = "papllclk";

		reg = <0x02620358 4>;

		reg-names = "control";

	};

arch/arm/boot/dts/keystone-clocks.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ clocks { 
	clkpa: clkpa {

		#clock-cells = <0>;

		compatible = "ti,keystone,psc-clock";

		clocks = <&chipclk16>;

		clocks = <&paclk13>;

		clock-output-names = "pa";

		reg = <0x0235001c 0xb00>, <0x02350008 0x400>;

		reg-names = "control", "domain";