From 5f1feff17fe13872aa379220c9afdfd66dcacddb Mon Sep 17 00:00:00 2001
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: Thu, 28 Mar 2013 17:35:22 +0100
Subject: [PATCH] --- yaml --- r: 370479 b: refs/heads/master c:
 bd3d924d71a45b88941b50ddaa77aadb2ae4ded7 h: refs/heads/master i:   370477:
 20ba3c74e5a1b0ee687920d495b3d0e3b8af1b98   370475:
 26380155f3af1c9b52df8023dbf2a1e0447e19d6   370471:
 485ba8209740ea3284e20c710e51c6cb7efd228f   370463:
 aacb1c44c3f3150a1d2bbe1f3d01f96795654d7d v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/boot/dts/imx6qdl.dtsi | 2 +-
 trunk/arch/arm/mach-imx/Kconfig      | 2 ++
 trunk/arch/arm/mach-imx/mm-imx5.c    | 2 ++
 trunk/arch/arm/mach-imx/src.c        | 4 +++-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e63c7fd77497..5111323b72a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d84c3740fb0c97b5b01ad565f9d4e2ca84bf670
+refs/heads/master: bd3d924d71a45b88941b50ddaa77aadb2ae4ded7
diff --git a/trunk/arch/arm/boot/dts/imx6qdl.dtsi b/trunk/arch/arm/boot/dts/imx6qdl.dtsi
index 8b6dfd1a1b2f..8805adb7c7f6 100644
--- a/trunk/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/trunk/arch/arm/boot/dts/imx6qdl.dtsi
@@ -520,7 +520,7 @@
 			};
 
 			src: src@020d8000 {
-				compatible = "fsl,imx6q-src";
+				compatible = "fsl,imx6q-src", "fsl,imx51-src";
 				reg = <0x020d8000 0x4000>;
 				interrupts = <0 91 0x04 0 96 0x04>;
 				#reset-cells = <1>;
diff --git a/trunk/arch/arm/mach-imx/Kconfig b/trunk/arch/arm/mach-imx/Kconfig
index 6575e4ebe26e..91571a16f986 100644
--- a/trunk/arch/arm/mach-imx/Kconfig
+++ b/trunk/arch/arm/mach-imx/Kconfig
@@ -149,6 +149,7 @@ config SOC_IMX5
 
 config	SOC_IMX51
 	bool
+	select HAVE_IMX_SRC
 	select PINCTRL
 	select PINCTRL_IMX51
 	select SOC_IMX5
@@ -774,6 +775,7 @@ comment "Device tree only"
 config	SOC_IMX53
 	bool "i.MX53 support"
 	select HAVE_CAN_FLEXCAN if CAN
+	select HAVE_IMX_SRC
 	select IMX_HAVE_PLATFORM_IMX2_WDT
 	select PINCTRL
 	select PINCTRL_IMX53
diff --git a/trunk/arch/arm/mach-imx/mm-imx5.c b/trunk/arch/arm/mach-imx/mm-imx5.c
index cf34994cfe28..b7c4e70e5081 100644
--- a/trunk/arch/arm/mach-imx/mm-imx5.c
+++ b/trunk/arch/arm/mach-imx/mm-imx5.c
@@ -84,6 +84,7 @@ void __init imx51_init_early(void)
 	mxc_set_cpu_type(MXC_CPU_MX51);
 	mxc_iomux_v3_init(MX51_IO_ADDRESS(MX51_IOMUXC_BASE_ADDR));
 	mxc_arch_reset_init(MX51_IO_ADDRESS(MX51_WDOG1_BASE_ADDR));
+	imx_src_init();
 }
 
 void __init imx53_init_early(void)
@@ -91,6 +92,7 @@ void __init imx53_init_early(void)
 	mxc_set_cpu_type(MXC_CPU_MX53);
 	mxc_iomux_v3_init(MX53_IO_ADDRESS(MX53_IOMUXC_BASE_ADDR));
 	mxc_arch_reset_init(MX53_IO_ADDRESS(MX53_WDOG1_BASE_ADDR));
+	imx_src_init();
 }
 
 void __init mx51_init_irq(void)
diff --git a/trunk/arch/arm/mach-imx/src.c b/trunk/arch/arm/mach-imx/src.c
index e15f1555c59b..cef5ca7c464d 100644
--- a/trunk/arch/arm/mach-imx/src.c
+++ b/trunk/arch/arm/mach-imx/src.c
@@ -61,7 +61,9 @@ void __init imx_src_init(void)
 	struct device_node *np;
 	u32 val;
 
-	np = of_find_compatible_node(NULL, NULL, "fsl,imx6q-src");
+	np = of_find_compatible_node(NULL, NULL, "fsl,imx51-src");
+	if (!np)
+		return;
 	src_base = of_iomap(np, 0);
 	WARN_ON(!src_base);