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

Commit 9916c159 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-3.8-4' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes 

From Shawn Guo:
imx fixes for 3.8, take 4

 - It fixes fec ptp clock pointer in device tree source.

* tag 'imx-fixes-3.8-4' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: imx6: fix fec ptp clock slow 10 time
parents 34178c58 8dd5c66b

arch/arm/boot/dts/imx6q.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -866,7 +866,7 @@ 
				compatible = "fsl,imx6q-fec";

				compatible = "fsl,imx6q-fec";

				reg = <0x02188000 0x4000>;

				reg = <0x02188000 0x4000>;

				interrupts = <0 118 0x04 0 119 0x04>;

				interrupts = <0 118 0x04 0 119 0x04>;

				clocks = <&clks 117>, <&clks 117>, <&clks 177>;

				clocks = <&clks 117>, <&clks 117>, <&clks 190>;

				clock-names = "ipg", "ahb", "ptp";

				clock-names = "ipg", "ahb", "ptp";

				status = "disabled";

				status = "disabled";

			};

			};