Merge tag 'renesas-sh-drivers-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

Pull SH drivers updates from Simon Horman:
 "Drop use of SH Drivers on Renesas ARM Based SoCs.

  I expect this to be my last pull request for these drivers as it
  removes usage of them from Renesas ARM Based SoCs and my
  co-maintenance of them.

  The drivers are still used by some SH SoCs and listed under SUPERH in
  the MAINTAINERS file"

* tag 'renesas-sh-drivers-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  MAINTAINERS: Drop drivers/sh/ for Renesas ARM
  drivers: sh: Stop using the legacy clock domain on ARM

3 files changed, 0 insertions, 11 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index c891b41e2b58..452beeeb7fbd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1669,7 +1669,6 @@ F:	arch/arm/boot/dts/sh*
 F:      arch/arm/configs/shmobile_defconfig
 F:      arch/arm/include/debug/renesas-scif.S
 F:      arch/arm/mach-shmobile/
-F:      drivers/sh/
 F:      drivers/soc/renesas/
 F:      include/linux/soc/renesas/
 
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;
 }