diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2016-05-20 09:50:54 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2016-05-30 09:41:11 +0900 |
| commit | 4c6d7e228968bdc238ae7213d919f34b7838fe59 (patch) | |
| tree | b759a3502ba42dd8ae4f6e906cdd54f8bf1a4a09 | |
| parent | 1a695a905c18548062509178b98bc91e67510864 (diff) | |
| download | linux-4c6d7e228968bdc238ae7213d919f34b7838fe59.tar.bz2 | |
drivers: sh: Stop using the legacy clock domain on ARM
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>
| -rw-r--r-- | drivers/Makefile | 1 | ||||
| -rw-r--r-- | drivers/sh/pm_runtime.c | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 0b6f3d60193d..a7187b999c5e 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -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 diff --git a/drivers/sh/pm_runtime.c b/drivers/sh/pm_runtime.c index a9bac3bf20de..c887ecdaf19b 100644 --- a/drivers/sh/pm_runtime.c +++ b/drivers/sh/pm_runtime.c @@ -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; } |