Merge tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6 into next/soc

i.MX35/5 AIPS setup

Includes sync up to 3.3-rc6

* tag 'imx35-imx5-aips-setup' of git://git.pengutronix.de/git/imx/linux-2.6:
  ARM: mx35: Setup the AIPS registers
  ARM: mx5: Use common function for configuring AIPS

3 files changed, 12 insertions, 36 deletions

diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c
index 5e2e7a843860..aa15c517d06e 100644
--- a/arch/arm/mach-imx/cpu-imx5.c
+++ b/arch/arm/mach-imx/cpu-imx5.c
@@ -149,39 +149,3 @@ int mx50_revision(void)
         return mx5_cpu_rev;
 }
 EXPORT_SYMBOL(mx50_revision);
-
-static int __init post_cpu_init(void)
-{
-        unsigned int reg;
-        void __iomem *base;
-
-        if (cpu_is_mx51() || cpu_is_mx53()) {
-                if (cpu_is_mx51())
-                        base = MX51_IO_ADDRESS(MX51_AIPS1_BASE_ADDR);
-                else
-                        base = MX53_IO_ADDRESS(MX53_AIPS1_BASE_ADDR);
-
-                __raw_writel(0x0, base + 0x40);
-                __raw_writel(0x0, base + 0x44);
-                __raw_writel(0x0, base + 0x48);
-                __raw_writel(0x0, base + 0x4C);
-                reg = __raw_readl(base + 0x50) & 0x00FFFFFF;
-                __raw_writel(reg, base + 0x50);
-
-                if (cpu_is_mx51())
-                        base = MX51_IO_ADDRESS(MX51_AIPS2_BASE_ADDR);
-                else
-                        base = MX53_IO_ADDRESS(MX53_AIPS2_BASE_ADDR);
-
-                __raw_writel(0x0, base + 0x40);
-                __raw_writel(0x0, base + 0x44);
-                __raw_writel(0x0, base + 0x48);
-                __raw_writel(0x0, base + 0x4C);
-                reg = __raw_readl(base + 0x50) & 0x00FFFFFF;
-                __raw_writel(reg, base + 0x50);
-        }
-
-        return 0;
-}
-
-postcore_initcall(post_cpu_init);
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c
index b23bd3f09a60..2215814c8c2c 100644
--- a/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@ -262,5 +262,9 @@ void __init imx35_soc_init(void)
         }
 
         imx_add_imx_sdma("imx35-sdma", MX35_SDMA_BASE_ADDR, MX35_INT_SDMA, &imx35_sdma_pdata);
+
+        /* Setup AIPS registers */
+        imx_set_aips(MX35_IO_ADDRESS(MX35_AIPS1_BASE_ADDR));
+        imx_set_aips(MX35_IO_ADDRESS(MX35_AIPS2_BASE_ADDR));
 }
 #endif /* ifdef CONFIG_SOC_IMX35 */
diff --git a/arch/arm/mach-imx/mm-imx5.c b/arch/arm/mach-imx/mm-imx5.c
index 49549a72dc7d..92efecec1260 100644
--- a/arch/arm/mach-imx/mm-imx5.c
+++ b/arch/arm/mach-imx/mm-imx5.c
@@ -185,6 +185,10 @@ void __init imx51_soc_init(void)
 
         /* i.mx51 has the i.mx35 type sdma */
         imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata);
+
+        /* Setup AIPS registers */
+        imx_set_aips(MX51_IO_ADDRESS(MX51_AIPS1_BASE_ADDR));
+        imx_set_aips(MX51_IO_ADDRESS(MX51_AIPS2_BASE_ADDR));
 }
 
 void __init imx53_soc_init(void)
@@ -200,4 +204,8 @@ void __init imx53_soc_init(void)
 
         /* i.mx53 has the i.mx35 type sdma */
         imx_add_imx_sdma("imx35-sdma", MX53_SDMA_BASE_ADDR, MX53_INT_SDMA, &imx53_sdma_pdata);
+
+        /* Setup AIPS registers */
+        imx_set_aips(MX53_IO_ADDRESS(MX53_AIPS1_BASE_ADDR));
+        imx_set_aips(MX53_IO_ADDRESS(MX53_AIPS2_BASE_ADDR));
 }