diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-02-10 16:23:47 +0100 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-02-10 16:23:47 +0100 |
| commit | d441667c7838d56bcace9a2465f0c1ff677bf2c0 (patch) | |
| tree | f7e7f1b060d6aadb5c9e1ca8b3eb01410ec9201f /arch | |
| parent | Linux 3.8-rc5 (diff) | |
| parent | ARM: dts: imx6: fix fec ptp clock slow 10 time (diff) | |
| download | linux-d441667c7838d56bcace9a2465f0c1ff677bf2c0.tar.xz linux-d441667c7838d56bcace9a2465f0c1ff677bf2c0.zip | |
Merge tag 'imx-fixes-3.8-4' into imx/dt
Diffstat (limited to 'arch')
| -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"; }; |