OSDN Git Service

drivers: sh: Stop using the legacy clock domain on ARM
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 20 May 2016 07:50:54 +0000 (09:50 +0200)
committerSimon Horman <horms+renesas@verge.net.au>
Mon, 30 May 2016 00:41:11 +0000 (09:41 +0900)
Since commits 71d076ceb245f0d9 ("ARM: shmobile: Enable PM and
PM_GENERIC_DOMAINS for SoCs with PM Domains") and 2ee98234b88174f2
("arm64: renesas: Enable PM and PM_GENERIC_DOMAINS for SoCs with PM
Domains"), CONFIG_PM and CONFIG_PM_GENERIC_DOMAINS are enabled
unconditionally for Renesas ARM-based SoCs. Hence the legacy clock
domain is no longer used on these SoCs.

Remove the related support code, and stop entering drivers/sh/ on ARM.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
drivers/Makefile
drivers/sh/pm_runtime.c

index 0b6f3d6..a7187b9 100644 (file)
@@ -128,7 +128,6 @@ obj-$(CONFIG_SGI_SN)                += sn/
 obj-y                          += firmware/
 obj-$(CONFIG_CRYPTO)           += crypto/
 obj-$(CONFIG_SUPERH)           += sh/
-obj-$(CONFIG_ARCH_SHMOBILE)    += sh/
 ifndef CONFIG_ARCH_USES_GETTIMEOFFSET
 obj-y                          += clocksource/
 endif
index a9bac3b..c887ecd 100644 (file)
@@ -34,15 +34,6 @@ static struct pm_clk_notifier_block platform_bus_notifier = {
 
 static int __init sh_pm_runtime_init(void)
 {
-       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;
-       }
-
        pm_clk_add_notifier(&platform_bus_type, &platform_bus_notifier);
        return 0;
 }