Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-omap2 / powerdomains2xxx_3xxx_data.c

diff --git a/arch/arm/mach-omap2/powerdomains.h b/arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
similarity index 58%
rename from arch/arm/mach-omap2/powerdomains.h
rename to arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
index 105cbcaefd3b687d4c38ffc6044452ff17b5e92c..5b4dd971320a1f86498a1ee87e731470a9a4ba34 100644 (file)
--- a/arch/arm/mach-omap2/powerdomains.h
+++ b/arch/arm/mach-omap2/powerdomains2xxx_3xxx_data.c
@@ -2,10 +2,9 @@
  * OMAP2/3 common powerdomain definitions
  *
  * Copyright (C) 2007-2008 Texas Instruments, Inc.
- * Copyright (C) 2007-2009 Nokia Corporation
+ * Copyright (C) 2007-2010 Nokia Corporation
  *
- * Written by Paul Walmsley
- * Debugging and integration fixes by Jouni Högander
+ * Paul Walmsley, Jouni Högander
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -18,9 +17,6 @@
  *    Clock Domain Framework
  */
 
-#ifndef ARCH_ARM_MACH_OMAP2_POWERDOMAINS
-#define ARCH_ARM_MACH_OMAP2_POWERDOMAINS
-
 /*
  * This file contains all of the powerdomains that have some element
  * of software control for the OMAP24xx and OMAP34xx chips.
@@ -49,24 +45,18 @@
  * address offset is different between the C55 and C64 DSPs.
  */
 
-#include <plat/powerdomain.h>
+#include "powerdomain.h"
 
 #include "prcm-common.h"
 #include "prm.h"
-#include "cm.h"
-#include "powerdomains24xx.h"
-#include "powerdomains34xx.h"
-#include "powerdomains44xx.h"
 
 /* OMAP2/3-common powerdomains */
 
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-
 /*
  * The GFX powerdomain is not present on 3430ES2, but currently we do not
  * have a macro to filter it out at compile-time.
  */
-static struct powerdomain gfx_omap2_pwrdm = {
+struct powerdomain gfx_omap2_pwrdm = {
        .name             = "gfx_pwrdm",
        .prcm_offs        = GFX_MOD,
        .omap_chip        = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX |
@@ -82,72 +72,8 @@ static struct powerdomain gfx_omap2_pwrdm = {
        },
 };
 
-static struct powerdomain wkup_omap2_pwrdm = {
+struct powerdomain wkup_omap2_pwrdm = {
        .name           = "wkup_pwrdm",
        .prcm_offs      = WKUP_MOD,
        .omap_chip      = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX | CHIP_IS_OMAP3430),
 };
-
-#endif
-
-
-/* As powerdomains are added or removed above, this list must also be changed */
-static struct powerdomain *powerdomains_omap[] __initdata = {
-
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-       &wkup_omap2_pwrdm,
-       &gfx_omap2_pwrdm,
-#endif
-
-#ifdef CONFIG_ARCH_OMAP2
-       &dsp_pwrdm,
-       &mpu_24xx_pwrdm,
-       &core_24xx_pwrdm,
-#endif
-
-#ifdef CONFIG_ARCH_OMAP2430
-       &mdm_pwrdm,
-#endif
-
-#ifdef CONFIG_ARCH_OMAP3
-       &iva2_pwrdm,
-       &mpu_3xxx_pwrdm,
-       &neon_pwrdm,
-       &core_3xxx_pre_es3_1_pwrdm,
-       &core_3xxx_es3_1_pwrdm,
-       &cam_pwrdm,
-       &dss_pwrdm,
-       &per_pwrdm,
-       &emu_pwrdm,
-       &sgx_pwrdm,
-       &usbhost_pwrdm,
-       &dpll1_pwrdm,
-       &dpll2_pwrdm,
-       &dpll3_pwrdm,
-       &dpll4_pwrdm,
-       &dpll5_pwrdm,
-#endif
-
-#ifdef CONFIG_ARCH_OMAP4
-       &core_44xx_pwrdm,
-       &gfx_44xx_pwrdm,
-       &abe_44xx_pwrdm,
-       &dss_44xx_pwrdm,
-       &tesla_44xx_pwrdm,
-       &wkup_44xx_pwrdm,
-       &cpu0_44xx_pwrdm,
-       &cpu1_44xx_pwrdm,
-       &emu_44xx_pwrdm,
-       &mpu_44xx_pwrdm,
-       &ivahd_44xx_pwrdm,
-       &cam_44xx_pwrdm,
-       &l3init_44xx_pwrdm,
-       &l4per_44xx_pwrdm,
-       &always_on_core_44xx_pwrdm,
-       &cefuse_44xx_pwrdm,
-#endif
-       NULL
-};
-
-
-#endif