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

Commit 3c91f97a authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'fixes-v3.17-rc4' of... 

Merge tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into fixes

Keystone Edision dts fix for -rc cycle. Fix the PCIE and USB nodes.

* tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone

:
  ARM: keystone: dts: fix bindings for pcie and usb clock nodes

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 9e1ac462 99897500

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

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

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

		clocks = <&chipclk16>;

		clock-output-names = "usb";

		clock-output-names = "usb1";

		reg = <0x02350004 0xb00>, <0x02350000 0x400>;

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

		domain-id = <0>;
@@ -60,8 +60,8 @@ clocks { 
		#clock-cells = <0>;

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

		clocks = <&chipclk12>;

		clock-output-names = "pcie";

		reg = <0x0235006c 0xb00>, <0x02350000 0x400>;

		clock-output-names = "pcie1";

		reg = <0x0235006c 0xb00>, <0x02350048 0x400>;

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

		domain-id = <18>;

	};