diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-04-12 18:59:30 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-12 18:59:30 +0800 |
| commit | 7c3c1b8c90e0f226610b9932cd66678d99e42176 (patch) | |
| tree | d3a26bcdc5d852c71d245118abc16d36ef43a508 /arch/arm/boot/dts/imx6qdl.dtsi | |
| parent | 31880c37c11e28cb81c70757e38392b42e695dc6 (diff) | |
| parent | e8094b2c17126c7dfdeafa296f206a4a3b122d23 (diff) | |
Merge tag 'imx-fixes-3.9-5' into imx/soc
The imx fixes for 3.9, take 5:
* A couple imx35 clock fixes for regressions caused by common clock
framework conversion. The admux and iomux get disabled by common
clock framework late initcall, and hence causes problems.
* Add missing twd clock lookup in device tree. This becomes required
since commit bd60345 (ARM: use device tree to get smp_twd clock)
forces all DT boot to find lookup from device tree.
* Fix imx6q ldb_di clock parents mismatch per reference manual.
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 06ec460b458..281a223591f 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -91,6 +91,7 @@ compatible = "arm,cortex-a9-twd-timer"; reg = <0x00a00600 0x20>; interrupts = <1 13 0xf01>; + clocks = <&clks 15>; }; L2: l2-cache@00a02000 { |