From: Olof Johansson <olof@lixom.net>
Date: Thu, 13 Sep 2012 06:20:33 +0000 (-0700)
Subject: Merge tag 'imx-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6 into... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=73f5ae3132f8a3f1be76a6d3e76d783defbc22fc;p=deliverable%2Flinux.git

Merge tag 'imx-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt

It replaces the clk_register_clkdev in imx6q clock driver with DT
lookup.  It depends on Mike's clk-3.7 branch.

* tag 'imx-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx6q: replace clk_register_clkdev with clock DT lookup

Resolved context add/remove conflict in arch/arm/boot/dts/imx6q.dtsi
---

73f5ae3132f8a3f1be76a6d3e76d783defbc22fc
diff --cc arch/arm/boot/dts/imx6q.dtsi
index 1d07be2530b5,925da33420e2..e45476dc6d32
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@@ -362,6 -382,8 +382,7 @@@
  				compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
  				reg = <0x020bc000 0x4000>;
  				interrupts = <0 80 0x04>;
+ 				clocks = <&clks 0>;
 -				status = "disabled";
  			};
  
  			wdog@020c0000 { /* WDOG2 */