Merge branches 'intel_pstate', 'pm-cpufreq' and 'pm-cpufreq-sched'

[sfrench/cifs-2.6.git] / arch / arm / mach-at91 / at91sam9.c

diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c
index ba28e9cc584d9a336eb5561599525d32cfc075fe..3dbdef4d3cbf5a5f979046abcf6de8241365ae71 100644 (file)
--- a/arch/arm/mach-at91/at91sam9.c
+++ b/arch/arm/mach-at91/at91sam9.c
@@ -14,60 +14,12 @@
 #include <asm/system_misc.h>
 
 #include "generic.h"
-#include "soc.h"
 
-static const struct at91_soc at91sam9_socs[] = {
-       AT91_SOC(AT91SAM9260_CIDR_MATCH, 0, "at91sam9260", NULL),
-       AT91_SOC(AT91SAM9261_CIDR_MATCH, 0, "at91sam9261", NULL),
-       AT91_SOC(AT91SAM9263_CIDR_MATCH, 0, "at91sam9263", NULL),
-       AT91_SOC(AT91SAM9G20_CIDR_MATCH, 0, "at91sam9g20", NULL),
-       AT91_SOC(AT91SAM9RL64_CIDR_MATCH, 0, "at91sam9rl64", NULL),
-       AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9M11_EXID_MATCH,
-                "at91sam9m11", "at91sam9g45"),
-       AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9M10_EXID_MATCH,
-                "at91sam9m10", "at91sam9g45"),
-       AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9G46_EXID_MATCH,
-                "at91sam9g46", "at91sam9g45"),
-       AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9G45_EXID_MATCH,
-                "at91sam9g45", "at91sam9g45"),
-       AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G15_EXID_MATCH,
-                "at91sam9g15", "at91sam9x5"),
-       AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G35_EXID_MATCH,
-                "at91sam9g35", "at91sam9x5"),
-       AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9X35_EXID_MATCH,
-                "at91sam9x35", "at91sam9x5"),
-       AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G25_EXID_MATCH,
-                "at91sam9g25", "at91sam9x5"),
-       AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9X25_EXID_MATCH,
-                "at91sam9x25", "at91sam9x5"),
-       AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9CN12_EXID_MATCH,
-                "at91sam9cn12", "at91sam9n12"),
-       AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9N12_EXID_MATCH,
-                "at91sam9n12", "at91sam9n12"),
-       AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9CN11_EXID_MATCH,
-                "at91sam9cn11", "at91sam9n12"),
-       AT91_SOC(AT91SAM9XE128_CIDR_MATCH, 0, "at91sam9xe128", "at91sam9xe128"),
-       AT91_SOC(AT91SAM9XE256_CIDR_MATCH, 0, "at91sam9xe256", "at91sam9xe256"),
-       AT91_SOC(AT91SAM9XE512_CIDR_MATCH, 0, "at91sam9xe512", "at91sam9xe512"),
-       { /* sentinel */ },
-};
-
-static void __init at91sam9_common_init(void)
+static void __init at91sam9_init(void)
 {
-       struct soc_device *soc;
-       struct device *soc_dev = NULL;
-
-       soc = at91_soc_init(at91sam9_socs);
-       if (soc != NULL)
-               soc_dev = soc_device_to_device(soc);
+       of_platform_default_populate(NULL, NULL, NULL);
 
-       of_platform_default_populate(NULL, NULL, soc_dev);
-}
-
-static void __init at91sam9_dt_device_init(void)
-{
-       at91sam9_common_init();
-       at91sam9260_pm_init();
+       at91sam9_pm_init();
 }
 
 static const char *const at91_dt_board_compat[] __initconst = {
@@ -77,41 +29,6 @@ static const char *const at91_dt_board_compat[] __initconst = {
 
 DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")
        /* Maintainer: Atmel */
-       .init_machine   = at91sam9_dt_device_init,
+       .init_machine   = at91sam9_init,
        .dt_compat      = at91_dt_board_compat,
 MACHINE_END
-
-static void __init at91sam9g45_dt_device_init(void)
-{
-       at91sam9_common_init();
-       at91sam9g45_pm_init();
-}
-
-static const char *const at91sam9g45_board_compat[] __initconst = {
-       "atmel,at91sam9g45",
-       NULL
-};
-
-DT_MACHINE_START(at91sam9g45_dt, "Atmel AT91SAM9G45")
-       /* Maintainer: Atmel */
-       .init_machine   = at91sam9g45_dt_device_init,
-       .dt_compat      = at91sam9g45_board_compat,
-MACHINE_END
-
-static void __init at91sam9x5_dt_device_init(void)
-{
-       at91sam9_common_init();
-       at91sam9x5_pm_init();
-}
-
-static const char *const at91sam9x5_board_compat[] __initconst = {
-       "atmel,at91sam9x5",
-       "atmel,at91sam9n12",
-       NULL
-};
-
-DT_MACHINE_START(at91sam9x5_dt, "Atmel AT91SAM9")
-       /* Maintainer: Atmel */
-       .init_machine   = at91sam9x5_dt_device_init,
-       .dt_compat      = at91sam9x5_board_compat,
-MACHINE_END