From: Shawn Guo <shawn.guo@linaro.org>
Date: Mon, 17 Sep 2012 07:12:28 +0000 (+0800)
Subject: Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cb32b4e0fc53ebd45708dd7aa8d7fa224e97308c;p=deliverable%2Flinux.git

Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2

Conflicts:
	arch/arm/boot/dts/imx6q.dtsi
---

cb32b4e0fc53ebd45708dd7aa8d7fa224e97308c
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 */