diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-05 22:33:01 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-05 22:33:01 +0400 |
| commit | 9916c159821b3f712f585348154918d65bc2f5b7 (patch) | |
| tree | 49bd1eee33db08492ba9b4876af8cde6c8853dea /arch/arm/boot | |
| parent | 34178c585422be69fdcbcacdbf048d96c2f8c671 (diff) | |
| parent | 8dd5c66bc6b12d86b1656851c20946efd587875e (diff) | |
| download | linux-9916c159821b3f712f585348154918d65bc2f5b7.tar.xz | |
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
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index d6265ca97119..ff1205ea5719 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi @@ -866,7 +866,7 @@ compatible = "fsl,imx6q-fec"; reg = <0x02188000 0x4000>; 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"; status = "disabled"; }; |