These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / sh / pm_runtime.c

diff --git a/kernel/drivers/sh/pm_runtime.c b/kernel/drivers/sh/pm_runtime.c
index fe8875f..a9bac3b 100644 (file)
--- a/kernel/drivers/sh/pm_runtime.c
+++ b/kernel/drivers/sh/pm_runtime.c
@@ -20,78 +20,26 @@
 #include <linux/bitmap.h>
 #include <linux/slab.h>
 
-#ifdef CONFIG_PM
-static int sh_pm_runtime_suspend(struct device *dev)
-{
-       int ret;
-
-       ret = pm_generic_runtime_suspend(dev);
-       if (ret) {
-               dev_err(dev, "failed to suspend device\n");
-               return ret;
-       }
-
-       ret = pm_clk_suspend(dev);
-       if (ret) {
-               dev_err(dev, "failed to suspend clock\n");
-               pm_generic_runtime_resume(dev);
-               return ret;
-       }
-
-       return 0;
-}
-
-static int sh_pm_runtime_resume(struct device *dev)
-{
-       int ret;
-
-       ret = pm_clk_resume(dev);
-       if (ret) {
-               dev_err(dev, "failed to resume clock\n");
-               return ret;
-       }
-
-       return pm_generic_runtime_resume(dev);
-}
-
 static struct dev_pm_domain default_pm_domain = {
        .ops = {
-               .runtime_suspend = sh_pm_runtime_suspend,
-               .runtime_resume = sh_pm_runtime_resume,
+               USE_PM_CLK_RUNTIME_OPS
                USE_PLATFORM_PM_SLEEP_OPS
        },
 };
 
-#define DEFAULT_PM_DOMAIN_PTR  (&default_pm_domain)
-
-#else
-
-#define DEFAULT_PM_DOMAIN_PTR  NULL
-
-#endif /* CONFIG_PM */
-
 static struct pm_clk_notifier_block platform_bus_notifier = {
-       .pm_domain = DEFAULT_PM_DOMAIN_PTR,
+       .pm_domain = &default_pm_domain,
        .con_ids = { NULL, },
 };
 
 static int __init sh_pm_runtime_init(void)
 {
-       if (IS_ENABLED(CONFIG_ARCH_SHMOBILE_MULTI)) {
-               if (!of_machine_is_compatible("renesas,emev2") &&
-                   !of_machine_is_compatible("renesas,r7s72100") &&
-#ifndef CONFIG_PM_GENERIC_DOMAINS_OF
-                   !of_machine_is_compatible("renesas,r8a73a4") &&
-                   !of_machine_is_compatible("renesas,r8a7740") &&
-                   !of_machine_is_compatible("renesas,sh73a0") &&
-#endif
-                   !of_machine_is_compatible("renesas,r8a7778") &&
-                   !of_machine_is_compatible("renesas,r8a7779") &&
-                   !of_machine_is_compatible("renesas,r8a7790") &&
-                   !of_machine_is_compatible("renesas,r8a7791") &&
-                   !of_machine_is_compatible("renesas,r8a7792") &&
-                   !of_machine_is_compatible("renesas,r8a7793") &&
-                   !of_machine_is_compatible("renesas,r8a7794"))
+       if (IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_ARCH_SHMOBILE)) {
+               if (!of_find_compatible_node(NULL, NULL,
+                                            "renesas,cpg-mstp-clocks"))
+                       return 0;
+               if (IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS_OF) &&
+                   of_find_node_with_property(NULL, "#power-domain-cells"))
                        return 0;
        }