25 files changed, 35 insertions, 115 deletions

diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index a25c262326dc..322fd1519b09 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -38,6 +38,7 @@
                         compatible = "arm,cortex-a15";
                         reg = <0>;
                         cci-control-port = <&cci_control1>;
+                        cpu-idle-states = <&CLUSTER_SLEEP_BIG>;
                 };
 
                 cpu1: cpu@1 {
@@ -45,6 +46,7 @@
                         compatible = "arm,cortex-a15";
                         reg = <1>;
                         cci-control-port = <&cci_control1>;
+                        cpu-idle-states = <&CLUSTER_SLEEP_BIG>;
                 };
 
                 cpu2: cpu@2 {
@@ -52,6 +54,7 @@
                         compatible = "arm,cortex-a7";
                         reg = <0x100>;
                         cci-control-port = <&cci_control2>;
+                        cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>;
                 };
 
                 cpu3: cpu@3 {
@@ -59,6 +62,7 @@
                         compatible = "arm,cortex-a7";
                         reg = <0x101>;
                         cci-control-port = <&cci_control2>;
+                        cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>;
                 };
 
                 cpu4: cpu@4 {
@@ -66,6 +70,25 @@
                         compatible = "arm,cortex-a7";
                         reg = <0x102>;
                         cci-control-port = <&cci_control2>;
+                        cpu-idle-states = <&CLUSTER_SLEEP_LITTLE>;
+                };
+
+                idle-states {
+                        CLUSTER_SLEEP_BIG: cluster-sleep-big {
+                                compatible = "arm,idle-state";
+                                local-timer-stop;
+                                entry-latency-us = <1000>;
+                                exit-latency-us = <700>;
+                                min-residency-us = <2000>;
+                        };
+
+                        CLUSTER_SLEEP_LITTLE: cluster-sleep-little {
+                                compatible = "arm,idle-state";
+                                local-timer-stop;
+                                entry-latency-us = <1000>;
+                                exit-latency-us = <500>;
+                                min-residency-us = <2500>;
+                        };
                 };
         };
 
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 6a24e111d6e1..b89e5f35db84 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -193,7 +193,6 @@ static void __init exynos_init_late(void)
                 /* to be supported later */
                 return;
 
-        pm_genpd_poweroff_unused();
         exynos_pm_init();
 }
 
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c
index fd76e1b5a471..20f267121b3e 100644
--- a/arch/arm/mach-exynos/pm_domains.c
+++ b/arch/arm/mach-exynos/pm_domains.c
@@ -105,78 +105,6 @@ static int exynos_pd_power_off(struct generic_pm_domain *domain)
         return exynos_pd_power(domain, false);
 }
 
-static void exynos_add_device_to_domain(struct exynos_pm_domain *pd,
-                                         struct device *dev)
-{
-        int ret;
-
-        dev_dbg(dev, "adding to power domain %s\n", pd->pd.name);
-
-        while (1) {
-                ret = pm_genpd_add_device(&pd->pd, dev);
-                if (ret != -EAGAIN)
-                        break;
-                cond_resched();
-        }
-
-        pm_genpd_dev_need_restore(dev, true);
-}
-
-static void exynos_remove_device_from_domain(struct device *dev)
-{
-        struct generic_pm_domain *genpd = dev_to_genpd(dev);
-        int ret;
-
-        dev_dbg(dev, "removing from power domain %s\n", genpd->name);
-
-        while (1) {
-                ret = pm_genpd_remove_device(genpd, dev);
-                if (ret != -EAGAIN)
-                        break;
-                cond_resched();
-        }
-}
-
-static void exynos_read_domain_from_dt(struct device *dev)
-{
-        struct platform_device *pd_pdev;
-        struct exynos_pm_domain *pd;
-        struct device_node *node;
-
-        node = of_parse_phandle(dev->of_node, "samsung,power-domain", 0);
-        if (!node)
-                return;
-        pd_pdev = of_find_device_by_node(node);
-        if (!pd_pdev)
-                return;
-        pd = platform_get_drvdata(pd_pdev);
-        exynos_add_device_to_domain(pd, dev);
-}
-
-static int exynos_pm_notifier_call(struct notifier_block *nb,
-                                    unsigned long event, void *data)
-{
-        struct device *dev = data;
-
-        switch (event) {
-        case BUS_NOTIFY_BIND_DRIVER:
-                if (dev->of_node)
-                        exynos_read_domain_from_dt(dev);
-
-                break;
-
-        case BUS_NOTIFY_UNBOUND_DRIVER:
-                exynos_remove_device_from_domain(dev);
-
-                break;
-        }
-        return NOTIFY_DONE;
-}
-
-static struct notifier_block platform_nb = {
-        .notifier_call = exynos_pm_notifier_call,
-};
-
 static __init int exynos4_pm_init_power_domain(void)
 {
         struct platform_device *pdev;
@@ -202,7 +130,6 @@ static __init int exynos4_pm_init_power_domain(void)
                 pd->base = of_iomap(np, 0);
                 pd->pd.power_off = exynos_pd_power_off;
                 pd->pd.power_on = exynos_pd_power_on;
-                pd->pd.of_node = np;
 
                 pd->oscclk = clk_get(dev, "oscclk");
                 if (IS_ERR(pd->oscclk))
@@ -228,15 +155,12 @@ static __init int exynos4_pm_init_power_domain(void)
                         clk_put(pd->oscclk);
 
 no_clk:
-                platform_set_drvdata(pdev, pd);
-
                 on = __raw_readl(pd->base + 0x4) & INT_LOCAL_PWR_EN;
 
                 pm_genpd_init(&pd->pd, NULL, !on);
+                of_genpd_add_provider_simple(np, &pd->pd);
         }
 
-        bus_register_notifier(&platform_bus_type, &platform_nb);
-
         return 0;
 }
 arch_initcall(exynos4_pm_init_power_domain);
diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c
index 080e66c6a1d0..dc8f1a6f45f2 100644
--- a/arch/arm/mach-imx/imx27-dt.c
+++ b/arch/arm/mach-imx/imx27-dt.c
@@ -20,7 +20,7 @@
 
 static void __init imx27_dt_init(void)
 {
-        struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
+        struct platform_device_info devinfo = { .name = "cpufreq-dt", };
 
         mxc_arch_reset_init_dt();
 
diff --git a/arch/arm/mach-imx/mach-imx51.c b/arch/arm/mach-imx/mach-imx51.c
index c77deb3f0893..2c5fcaf8675b 100644
--- a/arch/arm/mach-imx/mach-imx51.c
+++ b/arch/arm/mach-imx/mach-imx51.c
@@ -51,7 +51,7 @@ static void __init imx51_ipu_mipi_setup(void)
 
 static void __init imx51_dt_init(void)
 {
-        struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
+        struct platform_device_info devinfo = { .name = "cpufreq-dt", };
 
         mxc_arch_reset_init_dt();
         imx51_ipu_mipi_setup();
diff --git a/arch/arm/mach-mvebu/pmsu.c b/arch/arm/mach-mvebu/pmsu.c
index 8a70a51533fd..bbd8664d1bac 100644
--- a/arch/arm/mach-mvebu/pmsu.c
+++ b/arch/arm/mach-mvebu/pmsu.c
@@ -644,7 +644,7 @@ static int __init armada_xp_pmsu_cpufreq_init(void)
                 }
         }
 
-        platform_device_register_simple("cpufreq-generic", -1, NULL, 0);
+        platform_device_register_simple("cpufreq-dt", -1, NULL, 0);
         return 0;
 }
 
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 828aee9ea6a8..58920bc8807b 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -282,7 +282,7 @@ static inline void omap_init_cpufreq(void)
         if (!of_have_populated_dt())
                 devinfo.name = "omap-cpufreq";
         else
-                devinfo.name = "cpufreq-cpu0";
+                devinfo.name = "cpufreq-dt";
         platform_device_register_full(&devinfo);
 }
 
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c
index 5c45aae675b6..16547f2641a3 100644
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@ -440,8 +440,3 @@ void s3c64xx_restart(enum reboot_mode mode, const char *cmd)
         /* if all else fails, or mode was for soft, jump to 0 */
         soft_restart(0);
 }
-
-void __init s3c64xx_init_late(void)
-{
-        s3c64xx_pm_late_initcall();
-}
diff --git a/arch/arm/mach-s3c64xx/common.h b/arch/arm/mach-s3c64xx/common.h
index 7043e7a3a67e..9eb864412911 100644
--- a/arch/arm/mach-s3c64xx/common.h
+++ b/arch/arm/mach-s3c64xx/common.h
@@ -23,7 +23,6 @@ void s3c64xx_init_irq(u32 vic0, u32 vic1);
 void s3c64xx_init_io(struct map_desc *mach_desc, int size);
 
 void s3c64xx_restart(enum reboot_mode mode, const char *cmd);
-void s3c64xx_init_late(void);
 
 void s3c64xx_clk_init(struct device_node *np, unsigned long xtal_f,
         unsigned long xusbxti_f, bool is_s3c6400, void __iomem *reg_base);
@@ -52,12 +51,6 @@ extern void s3c6410_map_io(void);
 #define s3c6410_init NULL
 #endif
 
-#ifdef CONFIG_PM
-int __init s3c64xx_pm_late_initcall(void);
-#else
-static inline int s3c64xx_pm_late_initcall(void) { return 0; }
-#endif
-
 #ifdef CONFIG_S3C64XX_PL080
 extern struct pl08x_platform_data s3c64xx_dma0_plat_data;
 extern struct pl08x_platform_data s3c64xx_dma1_plat_data;
diff --git a/arch/arm/mach-s3c64xx/mach-anw6410.c b/arch/arm/mach-s3c64xx/mach-anw6410.c
index 60576dfbea8d..6224c67f5061 100644
--- a/arch/arm/mach-s3c64xx/mach-anw6410.c
+++ b/arch/arm/mach-s3c64xx/mach-anw6410.c
@@ -233,7 +233,6 @@ MACHINE_START(ANW6410, "A&W6410")
         .init_irq       = s3c6410_init_irq,
         .map_io         = anw6410_map_io,
         .init_machine   = anw6410_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index fe116334afda..10b913baab28 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -857,7 +857,6 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410")
         .init_irq       = s3c6410_init_irq,
         .map_io         = crag6410_map_io,
         .init_machine   = crag6410_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index 19e8feb908fd..e4b087c58ee6 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -277,7 +277,6 @@ MACHINE_START(HMT, "Airgoo-HMT")
         .init_irq       = s3c6410_init_irq,
         .map_io         = hmt_map_io,
         .init_machine   = hmt_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-mini6410.c b/arch/arm/mach-s3c64xx/mach-mini6410.c
index 9cbc07602ef3..ab61af50bfb9 100644
--- a/arch/arm/mach-s3c64xx/mach-mini6410.c
+++ b/arch/arm/mach-s3c64xx/mach-mini6410.c
@@ -366,7 +366,6 @@ MACHINE_START(MINI6410, "MINI6410")
         .init_irq       = s3c6410_init_irq,
         .map_io         = mini6410_map_io,
         .init_machine   = mini6410_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-ncp.c b/arch/arm/mach-s3c64xx/mach-ncp.c
index 4bae7dc49eea..80cb1446f69f 100644
--- a/arch/arm/mach-s3c64xx/mach-ncp.c
+++ b/arch/arm/mach-s3c64xx/mach-ncp.c
@@ -103,7 +103,6 @@ MACHINE_START(NCP, "NCP")
         .init_irq       = s3c6410_init_irq,
         .map_io         = ncp_map_io,
         .init_machine   = ncp_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-real6410.c b/arch/arm/mach-s3c64xx/mach-real6410.c
index fbad2af1ef16..85fa9598b980 100644
--- a/arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/arch/arm/mach-s3c64xx/mach-real6410.c
@@ -335,7 +335,6 @@ MACHINE_START(REAL6410, "REAL6410")
         .init_irq       = s3c6410_init_irq,
         .map_io         = real6410_map_io,
         .init_machine   = real6410_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-smartq5.c b/arch/arm/mach-s3c64xx/mach-smartq5.c
index dec4c08e834f..33224ab36fac 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq5.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq5.c
@@ -156,7 +156,6 @@ MACHINE_START(SMARTQ5, "SmartQ 5")
         .init_irq       = s3c6410_init_irq,
         .map_io         = smartq_map_io,
         .init_machine   = smartq5_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-smartq7.c b/arch/arm/mach-s3c64xx/mach-smartq7.c
index 27b322069c7d..fc7fece22fb0 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq7.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq7.c
@@ -172,7 +172,6 @@ MACHINE_START(SMARTQ7, "SmartQ 7")
         .init_irq       = s3c6410_init_irq,
         .map_io         = smartq_map_io,
         .init_machine   = smartq7_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6400.c b/arch/arm/mach-s3c64xx/mach-smdk6400.c
index 910749768340..6f425126a735 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6400.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6400.c
@@ -92,7 +92,6 @@ MACHINE_START(SMDK6400, "SMDK6400")
         .init_irq       = s3c6400_init_irq,
         .map_io         = smdk6400_map_io,
         .init_machine   = smdk6400_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index 1dc86d76b530..661eb662d051 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -705,7 +705,6 @@ MACHINE_START(SMDK6410, "SMDK6410")
         .init_irq       = s3c6410_init_irq,
         .map_io         = smdk6410_map_io,
         .init_machine   = smdk6410_machine_init,
-        .init_late      = s3c64xx_init_late,
         .init_time      = samsung_timer_init,
         .restart        = s3c64xx_restart,
 MACHINE_END
diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
index 6b37694fa335..aaf7bea4032f 100644
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@ -347,10 +347,3 @@ static __init int s3c64xx_pm_initcall(void)
         return 0;
 }
 arch_initcall(s3c64xx_pm_initcall);
-
-int __init s3c64xx_pm_late_initcall(void)
-{
-        pm_genpd_poweroff_unused();
-
-        return 0;
-}
diff --git a/arch/arm/mach-shmobile/cpufreq.c b/arch/arm/mach-shmobile/cpufreq.c
index 8a24b2be46ae..57fbff024dcd 100644
--- a/arch/arm/mach-shmobile/cpufreq.c
+++ b/arch/arm/mach-shmobile/cpufreq.c
@@ -12,6 +12,6 @@
 
 int __init shmobile_cpufreq_init(void)
 {
-        platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0);
+        platform_device_register_simple("cpufreq-dt", -1, NULL, 0);
         return 0;
 }
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c
index 69f70b7f7fb2..82fe3d7f9662 100644
--- a/arch/arm/mach-shmobile/pm-r8a7779.c
+++ b/arch/arm/mach-shmobile/pm-r8a7779.c
@@ -87,7 +87,6 @@ static void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd)
         genpd->dev_ops.stop = pm_clk_suspend;
         genpd->dev_ops.start = pm_clk_resume;
         genpd->dev_ops.active_wakeup = pd_active_wakeup;
-        genpd->dev_irq_safe = true;
         genpd->power_off = pd_power_down;
         genpd->power_on = pd_power_up;
 
diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c
index a88079af7914..717e6413d29c 100644
--- a/arch/arm/mach-shmobile/pm-rmobile.c
+++ b/arch/arm/mach-shmobile/pm-rmobile.c
@@ -110,7 +110,6 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd)
         genpd->dev_ops.stop             = pm_clk_suspend;
         genpd->dev_ops.start            = pm_clk_resume;
         genpd->dev_ops.active_wakeup    = rmobile_pd_active_wakeup;
-        genpd->dev_irq_safe             = true;
         genpd->power_off                = rmobile_pd_power_down;
         genpd->power_on                 = rmobile_pd_power_up;
         __rmobile_pd_power_up(rmobile_pd, false);
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 613c476872eb..26f92c28d22b 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -110,7 +110,7 @@ static void __init zynq_init_late(void)
  */
 static void __init zynq_init_machine(void)
 {
-        struct platform_device_info devinfo = { .name = "cpufreq-cpu0", };
+        struct platform_device_info devinfo = { .name = "cpufreq-dt", };
         struct soc_device_attribute *soc_dev_attr;
         struct soc_device *soc_dev;
         struct device *parent = NULL;
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 337ce5a9b15c..1183d545da1e 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2623,6 +2623,7 @@ static struct irq_chip ioapic_chip __read_mostly = {
         .irq_eoi                = ack_apic_level,
         .irq_set_affinity       = native_ioapic_set_affinity,
         .irq_retrigger          = ioapic_retrigger_irq,
+        .flags                  = IRQCHIP_SKIP_SET_WAKE,
 };
 
 static inline void init_IO_APIC_traps(void)
@@ -3173,6 +3174,7 @@ static struct irq_chip msi_chip = {
         .irq_ack                = ack_apic_edge,
         .irq_set_affinity       = msi_set_affinity,
         .irq_retrigger          = ioapic_retrigger_irq,
+        .flags                  = IRQCHIP_SKIP_SET_WAKE,
 };
 
 int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
@@ -3271,6 +3273,7 @@ static struct irq_chip dmar_msi_type = {
         .irq_ack                = ack_apic_edge,
         .irq_set_affinity       = dmar_msi_set_affinity,
         .irq_retrigger          = ioapic_retrigger_irq,
+        .flags                  = IRQCHIP_SKIP_SET_WAKE,
 };
 
 int arch_setup_dmar_msi(unsigned int irq)
@@ -3321,6 +3324,7 @@ static struct irq_chip hpet_msi_type = {
         .irq_ack = ack_apic_edge,
         .irq_set_affinity = hpet_msi_set_affinity,
         .irq_retrigger = ioapic_retrigger_irq,
+        .flags = IRQCHIP_SKIP_SET_WAKE,
 };
 
 int default_setup_hpet_msi(unsigned int irq, unsigned int id)
@@ -3384,6 +3388,7 @@ static struct irq_chip ht_irq_chip = {
         .irq_ack                = ack_apic_edge,
         .irq_set_affinity       = ht_set_affinity,
         .irq_retrigger          = ioapic_retrigger_irq,
+        .flags                  = IRQCHIP_SKIP_SET_WAKE,
 };
 
 int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)