summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2013-03-28 17:35:20 +0100
committerShawn Guo <shawn.guo@linaro.org>2013-04-09 22:52:57 +0800
commit09ebf366599d691ef25c343cb66fe19ce2a74d52 (patch)
treeb6a39f2d8900719c9e6f7d6a8a2a9240c1fa6d91 /arch/arm
parent41c043428804b34def308f1fd34ce50cca70c36c (diff)
downloadop-kernel-dev-09ebf366599d691ef25c343cb66fe19ce2a74d52.zip
op-kernel-dev-09ebf366599d691ef25c343cb66fe19ce2a74d52.tar.gz
ARM i.MX6q: Link system reset controller (SRC) to IPU in DT
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> Reviewed-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Marek Vasut <marex@denx.de> Reviewed-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/imx6q.dtsi1
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 83bc61c..21e6758 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/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/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 804c0ec..8b6dfd1 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/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>;
};
};
};
OpenPOWER on IntegriCloud