From 20ba3c74e5a1b0ee687920d495b3d0e3b8af1b98 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Thu, 28 Mar 2013 17:35:20 +0100 Subject: [PATCH] --- yaml --- r: 370477 b: refs/heads/master c: 09ebf366599d691ef25c343cb66fe19ce2a74d52 h: refs/heads/master i: 370475: 26380155f3af1c9b52df8023dbf2a1e0447e19d6 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/imx6q.dtsi | 1 + trunk/arch/arm/boot/dts/imx6qdl.dtsi | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 64b19e86fdfb..ecd1c1c6cecf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41c043428804b34def308f1fd34ce50cca70c36c +refs/heads/master: 09ebf366599d691ef25c343cb66fe19ce2a74d52 diff --git a/trunk/arch/arm/boot/dts/imx6q.dtsi b/trunk/arch/arm/boot/dts/imx6q.dtsi index 83bc61cac61e..21e675848bd1 100644 --- a/trunk/arch/arm/boot/dts/imx6q.dtsi +++ b/trunk/arch/arm/boot/dts/imx6q.dtsi @@ -335,6 +335,7 @@ interrupts = <0 8 0x4 0 7 0x4>; clocks = <&clks 133>, <&clks 134>, <&clks 137>; clock-names = "bus", "di0", "di1"; + resets = <&src 4>; }; }; }; diff --git a/trunk/arch/arm/boot/dts/imx6qdl.dtsi b/trunk/arch/arm/boot/dts/imx6qdl.dtsi index 804c0ec32399..8b6dfd1a1b2f 100644 --- a/trunk/arch/arm/boot/dts/imx6qdl.dtsi +++ b/trunk/arch/arm/boot/dts/imx6qdl.dtsi @@ -523,6 +523,7 @@ compatible = "fsl,imx6q-src"; reg = <0x020d8000 0x4000>; interrupts = <0 91 0x04 0 96 0x04>; + #reset-cells = <1>; }; gpc: gpc@020dc000 { @@ -822,6 +823,7 @@ interrupts = <0 6 0x4 0 5 0x4>; clocks = <&clks 130>, <&clks 131>, <&clks 132>; clock-names = "bus", "di0", "di1"; + resets = <&src 2>; }; }; };