diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:54 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:54 +0000 |
commit | 588956edf5bb33741de41687677f21f5c37671da (patch) | |
tree | 70508bb41cc7320b3b798cdda405f20deff59a39 /arch/arm/boot/dts/imx25.dtsi | |
parent | 750d40d7dfd65c0b8babb67137843db8a9a99140 (diff) | |
parent | 9347e87f7cd66d6ca96ba7d0b4b1cacebea4d096 (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-rtlsk-v3.14-rt-15.02lsk-v3.14-rt-14.02
Diffstat (limited to 'arch/arm/boot/dts/imx25.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx25.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi index de1611966d8b..6a26e79f0ef4 100644 --- a/arch/arm/boot/dts/imx25.dtsi +++ b/arch/arm/boot/dts/imx25.dtsi @@ -158,7 +158,7 @@ #size-cells = <0>; compatible = "fsl,imx25-cspi", "fsl,imx35-cspi"; reg = <0x43fa4000 0x4000>; - clocks = <&clks 62>, <&clks 62>; + clocks = <&clks 78>, <&clks 78>; clock-names = "ipg", "per"; interrupts = <14>; status = "disabled"; |