* [PATCH 0/2] ARM: shmobile: R-Mobile: Clean up and move pm-rmobile driver
@ 2018-11-29 11:09 ` Geert Uytterhoeven
0 siblings, 0 replies; 10+ messages in thread
From: Geert Uytterhoeven @ 2018-11-29 11:09 UTC (permalink / raw)
To: Simon Horman, Magnus Damm
Cc: linux-arm-kernel, linux-renesas-soc, Geert Uytterhoeven
Hi Simon, Magnus,
This is a patch series for the pm-rmobile driver, used on R-Mobile A1 and
APE6, and on SH-Mobile AG5, to clean up the driver, move it to
drivers/soc/renesas/, and enable compile-testing.
Thanks!
Geert Uytterhoeven (2):
ARM: shmobile: R-Mobile: Clean up struct rmobile_pm_domain
ARM: shmobile: R-Mobile: Move pm-rmobile to drivers/soc/renesas/
arch/arm/mach-shmobile/Kconfig | 5 ---
arch/arm/mach-shmobile/Makefile | 1 -
arch/arm/mach-shmobile/pm-rmobile.h | 22 -----------
drivers/soc/renesas/Kconfig | 7 +++-
drivers/soc/renesas/Makefile | 1 +
.../soc/renesas/rmobile-sysc.c | 37 +++++++++----------
6 files changed, 25 insertions(+), 48 deletions(-)
delete mode 100644 arch/arm/mach-shmobile/pm-rmobile.h
rename arch/arm/mach-shmobile/pm-rmobile.c => drivers/soc/renesas/rmobile-sysc.c (93%)
--
2.17.1
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 0/2] ARM: shmobile: R-Mobile: Clean up and move pm-rmobile driver @ 2018-11-29 11:09 ` Geert Uytterhoeven 0 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2018-11-29 11:09 UTC (permalink / raw) To: linux-arm-kernel Hi Simon, Magnus, This is a patch series for the pm-rmobile driver, used on R-Mobile A1 and APE6, and on SH-Mobile AG5, to clean up the driver, move it to drivers/soc/renesas/, and enable compile-testing. Thanks! Geert Uytterhoeven (2): ARM: shmobile: R-Mobile: Clean up struct rmobile_pm_domain ARM: shmobile: R-Mobile: Move pm-rmobile to drivers/soc/renesas/ arch/arm/mach-shmobile/Kconfig | 5 --- arch/arm/mach-shmobile/Makefile | 1 - arch/arm/mach-shmobile/pm-rmobile.h | 22 ----------- drivers/soc/renesas/Kconfig | 7 +++- drivers/soc/renesas/Makefile | 1 + .../soc/renesas/rmobile-sysc.c | 37 +++++++++---------- 6 files changed, 25 insertions(+), 48 deletions(-) delete mode 100644 arch/arm/mach-shmobile/pm-rmobile.h rename arch/arm/mach-shmobile/pm-rmobile.c => drivers/soc/renesas/rmobile-sysc.c (93%) -- 2.17.1 Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/2] ARM: shmobile: R-Mobile: Clean up struct rmobile_pm_domain 2018-11-29 11:09 ` Geert Uytterhoeven @ 2018-11-29 11:09 ` Geert Uytterhoeven -1 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2018-11-29 11:09 UTC (permalink / raw) To: Simon Horman, Magnus Damm Cc: linux-arm-kernel, linux-renesas-soc, Geert Uytterhoeven Commit 59b89af1d5551c12 ("ARM: shmobile: sh7372: Remove Legacy C SoC code") removed the last user of the rmobile_pm_domain.resume() callback. Commit 44d88c754e57a6d9 ("ARM: shmobile: Remove legacy SoC code for R-Mobile A1") removed the last user of the rmobile_pm_domain.no_debug flag and of the "pm-rmobile.h" header file (outside the actual driver). Hence remove no longer used rmobile_pm_domain members, and absorb the header file into the driver. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/pm-rmobile.c | 37 ++++++++++++++--------------- arch/arm/mach-shmobile/pm-rmobile.h | 22 ----------------- 2 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 arch/arm/mach-shmobile/pm-rmobile.h diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c index c6a11b5ec6dbc704..421ae1c887d824d0 100644 --- a/arch/arm/mach-shmobile/pm-rmobile.c +++ b/arch/arm/mach-shmobile/pm-rmobile.c @@ -18,12 +18,11 @@ #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_clock.h> +#include <linux/pm_domain.h> #include <linux/slab.h> #include <asm/io.h> -#include "pm-rmobile.h" - /* SYSC */ #define SPDCR 0x08 /* SYS Power Down Control Register */ #define SWUCR 0x14 /* SYS Wakeup Control Register */ @@ -32,6 +31,14 @@ #define PSTR_RETRIES 100 #define PSTR_DELAY_US 10 +struct rmobile_pm_domain { + struct generic_pm_domain genpd; + struct dev_power_governor *gov; + int (*suspend)(void); + void __iomem *base; + unsigned int bit_shift; +}; + static inline struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d) { @@ -65,16 +72,13 @@ static int rmobile_pd_power_down(struct generic_pm_domain *genpd) } } - if (!rmobile_pd->no_debug) - pr_debug("%s: Power off, 0x%08x -> PSTR = 0x%08x\n", - genpd->name, mask, - __raw_readl(rmobile_pd->base + PSTR)); + pr_debug("%s: Power off, 0x%08x -> PSTR = 0x%08x\n", genpd->name, mask, + __raw_readl(rmobile_pd->base + PSTR)); return 0; } -static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd, - bool do_resume) +static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd) { unsigned int mask; unsigned int retry_count; @@ -85,7 +89,7 @@ static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd, mask = BIT(rmobile_pd->bit_shift); if (__raw_readl(rmobile_pd->base + PSTR) & mask) - goto out; + return ret; __raw_writel(mask, rmobile_pd->base + SWUCR); @@ -100,21 +104,16 @@ static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd, if (!retry_count) ret = -EIO; - if (!rmobile_pd->no_debug) - pr_debug("%s: Power on, 0x%08x -> PSTR = 0x%08x\n", - rmobile_pd->genpd.name, mask, - __raw_readl(rmobile_pd->base + PSTR)); - -out: - if (ret == 0 && rmobile_pd->resume && do_resume) - rmobile_pd->resume(); + pr_debug("%s: Power on, 0x%08x -> PSTR = 0x%08x\n", + rmobile_pd->genpd.name, mask, + __raw_readl(rmobile_pd->base + PSTR)); return ret; } static int rmobile_pd_power_up(struct generic_pm_domain *genpd) { - return __rmobile_pd_power_up(to_rmobile_pd(genpd), true); + return __rmobile_pd_power_up(to_rmobile_pd(genpd)); } static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) @@ -127,7 +126,7 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) genpd->power_on = rmobile_pd_power_up; genpd->attach_dev = cpg_mstp_attach_dev; genpd->detach_dev = cpg_mstp_detach_dev; - __rmobile_pd_power_up(rmobile_pd, false); + __rmobile_pd_power_up(rmobile_pd); pm_genpd_init(genpd, gov ? : &simple_qos_governor, false); } diff --git a/arch/arm/mach-shmobile/pm-rmobile.h b/arch/arm/mach-shmobile/pm-rmobile.h deleted file mode 100644 index 69f839259b092002..0000000000000000 --- a/arch/arm/mach-shmobile/pm-rmobile.h +++ /dev/null @@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 - * - * Copyright (C) 2012 Renesas Solutions Corp. - * - * Kuninori Morimoto <morimoto.kuninori@renesas.com> - */ -#ifndef PM_RMOBILE_H -#define PM_RMOBILE_H - -#include <linux/pm_domain.h> - -struct rmobile_pm_domain { - struct generic_pm_domain genpd; - struct dev_power_governor *gov; - int (*suspend)(void); - void (*resume)(void); - void __iomem *base; - unsigned int bit_shift; - bool no_debug; -}; - -#endif /* PM_RMOBILE_H */ -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 1/2] ARM: shmobile: R-Mobile: Clean up struct rmobile_pm_domain @ 2018-11-29 11:09 ` Geert Uytterhoeven 0 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2018-11-29 11:09 UTC (permalink / raw) To: linux-arm-kernel Commit 59b89af1d5551c12 ("ARM: shmobile: sh7372: Remove Legacy C SoC code") removed the last user of the rmobile_pm_domain.resume() callback. Commit 44d88c754e57a6d9 ("ARM: shmobile: Remove legacy SoC code for R-Mobile A1") removed the last user of the rmobile_pm_domain.no_debug flag and of the "pm-rmobile.h" header file (outside the actual driver). Hence remove no longer used rmobile_pm_domain members, and absorb the header file into the driver. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/pm-rmobile.c | 37 ++++++++++++++--------------- arch/arm/mach-shmobile/pm-rmobile.h | 22 ----------------- 2 files changed, 18 insertions(+), 41 deletions(-) delete mode 100644 arch/arm/mach-shmobile/pm-rmobile.h diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/arch/arm/mach-shmobile/pm-rmobile.c index c6a11b5ec6dbc704..421ae1c887d824d0 100644 --- a/arch/arm/mach-shmobile/pm-rmobile.c +++ b/arch/arm/mach-shmobile/pm-rmobile.c @@ -18,12 +18,11 @@ #include <linux/platform_device.h> #include <linux/pm.h> #include <linux/pm_clock.h> +#include <linux/pm_domain.h> #include <linux/slab.h> #include <asm/io.h> -#include "pm-rmobile.h" - /* SYSC */ #define SPDCR 0x08 /* SYS Power Down Control Register */ #define SWUCR 0x14 /* SYS Wakeup Control Register */ @@ -32,6 +31,14 @@ #define PSTR_RETRIES 100 #define PSTR_DELAY_US 10 +struct rmobile_pm_domain { + struct generic_pm_domain genpd; + struct dev_power_governor *gov; + int (*suspend)(void); + void __iomem *base; + unsigned int bit_shift; +}; + static inline struct rmobile_pm_domain *to_rmobile_pd(struct generic_pm_domain *d) { @@ -65,16 +72,13 @@ static int rmobile_pd_power_down(struct generic_pm_domain *genpd) } } - if (!rmobile_pd->no_debug) - pr_debug("%s: Power off, 0x%08x -> PSTR = 0x%08x\n", - genpd->name, mask, - __raw_readl(rmobile_pd->base + PSTR)); + pr_debug("%s: Power off, 0x%08x -> PSTR = 0x%08x\n", genpd->name, mask, + __raw_readl(rmobile_pd->base + PSTR)); return 0; } -static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd, - bool do_resume) +static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd) { unsigned int mask; unsigned int retry_count; @@ -85,7 +89,7 @@ static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd, mask = BIT(rmobile_pd->bit_shift); if (__raw_readl(rmobile_pd->base + PSTR) & mask) - goto out; + return ret; __raw_writel(mask, rmobile_pd->base + SWUCR); @@ -100,21 +104,16 @@ static int __rmobile_pd_power_up(struct rmobile_pm_domain *rmobile_pd, if (!retry_count) ret = -EIO; - if (!rmobile_pd->no_debug) - pr_debug("%s: Power on, 0x%08x -> PSTR = 0x%08x\n", - rmobile_pd->genpd.name, mask, - __raw_readl(rmobile_pd->base + PSTR)); - -out: - if (ret == 0 && rmobile_pd->resume && do_resume) - rmobile_pd->resume(); + pr_debug("%s: Power on, 0x%08x -> PSTR = 0x%08x\n", + rmobile_pd->genpd.name, mask, + __raw_readl(rmobile_pd->base + PSTR)); return ret; } static int rmobile_pd_power_up(struct generic_pm_domain *genpd) { - return __rmobile_pd_power_up(to_rmobile_pd(genpd), true); + return __rmobile_pd_power_up(to_rmobile_pd(genpd)); } static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) @@ -127,7 +126,7 @@ static void rmobile_init_pm_domain(struct rmobile_pm_domain *rmobile_pd) genpd->power_on = rmobile_pd_power_up; genpd->attach_dev = cpg_mstp_attach_dev; genpd->detach_dev = cpg_mstp_detach_dev; - __rmobile_pd_power_up(rmobile_pd, false); + __rmobile_pd_power_up(rmobile_pd); pm_genpd_init(genpd, gov ? : &simple_qos_governor, false); } diff --git a/arch/arm/mach-shmobile/pm-rmobile.h b/arch/arm/mach-shmobile/pm-rmobile.h deleted file mode 100644 index 69f839259b092002..0000000000000000 --- a/arch/arm/mach-shmobile/pm-rmobile.h +++ /dev/null @@ -1,22 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 - * - * Copyright (C) 2012 Renesas Solutions Corp. - * - * Kuninori Morimoto <morimoto.kuninori@renesas.com> - */ -#ifndef PM_RMOBILE_H -#define PM_RMOBILE_H - -#include <linux/pm_domain.h> - -struct rmobile_pm_domain { - struct generic_pm_domain genpd; - struct dev_power_governor *gov; - int (*suspend)(void); - void (*resume)(void); - void __iomem *base; - unsigned int bit_shift; - bool no_debug; -}; - -#endif /* PM_RMOBILE_H */ -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] ARM: shmobile: R-Mobile: Clean up struct rmobile_pm_domain 2018-11-29 11:09 ` Geert Uytterhoeven @ 2018-11-30 10:28 ` Simon Horman -1 siblings, 0 replies; 10+ messages in thread From: Simon Horman @ 2018-11-30 10:28 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Magnus Damm, linux-arm-kernel, linux-renesas-soc On Thu, Nov 29, 2018 at 12:09:30PM +0100, Geert Uytterhoeven wrote: > Commit 59b89af1d5551c12 ("ARM: shmobile: sh7372: Remove Legacy C > SoC code") removed the last user of the rmobile_pm_domain.resume() > callback. > > Commit 44d88c754e57a6d9 ("ARM: shmobile: Remove legacy SoC code > for R-Mobile A1") removed the last user of the rmobile_pm_domain.no_debug > flag and of the "pm-rmobile.h" header file (outside the actual driver). > > Hence remove no longer used rmobile_pm_domain members, and absorb the > header file into the driver. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, applied for v4.21. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 1/2] ARM: shmobile: R-Mobile: Clean up struct rmobile_pm_domain @ 2018-11-30 10:28 ` Simon Horman 0 siblings, 0 replies; 10+ messages in thread From: Simon Horman @ 2018-11-30 10:28 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: linux-renesas-soc, Magnus Damm, linux-arm-kernel On Thu, Nov 29, 2018 at 12:09:30PM +0100, Geert Uytterhoeven wrote: > Commit 59b89af1d5551c12 ("ARM: shmobile: sh7372: Remove Legacy C > SoC code") removed the last user of the rmobile_pm_domain.resume() > callback. > > Commit 44d88c754e57a6d9 ("ARM: shmobile: Remove legacy SoC code > for R-Mobile A1") removed the last user of the rmobile_pm_domain.no_debug > flag and of the "pm-rmobile.h" header file (outside the actual driver). > > Hence remove no longer used rmobile_pm_domain members, and absorb the > header file into the driver. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, applied for v4.21. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 2/2] ARM: shmobile: R-Mobile: Move pm-rmobile to drivers/soc/renesas/ 2018-11-29 11:09 ` Geert Uytterhoeven @ 2018-11-29 11:09 ` Geert Uytterhoeven -1 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2018-11-29 11:09 UTC (permalink / raw) To: Simon Horman, Magnus Damm Cc: linux-arm-kernel, linux-renesas-soc, Geert Uytterhoeven The pm-rmobile driver is really a driver for the System Controller (SYSC) found in R-Mobile SoCs. An equivalent driver for R-Car SoCs is already located under drivers/soc/renesas/. Hence move the pm-rmobile driver from arch/arm/mach-shmobile/ to drivers/soc/renesas/, and rename it to rmobile-sysc. Enable compile-testing on non-ARM and non-R-Mobile SoCs. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/Kconfig | 5 ----- arch/arm/mach-shmobile/Makefile | 1 - drivers/soc/renesas/Kconfig | 7 ++++++- drivers/soc/renesas/Makefile | 1 + .../pm-rmobile.c => drivers/soc/renesas/rmobile-sysc.c | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename arch/arm/mach-shmobile/pm-rmobile.c => drivers/soc/renesas/rmobile-sysc.c (100%) diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 9b798c9dffe4e94a..3683d6f109730ee7 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -1,9 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -config PM_RMOBILE - bool - select PM - select PM_GENERIC_DOMAINS - menuconfig ARCH_RENESAS bool "Renesas ARM SoCs" depends on ARCH_MULTI_V7 && MMU diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 5591646cb9bbfd33..f7bf17b7abaef7a9 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -35,7 +35,6 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o # PM objects obj-$(CONFIG_SUSPEND) += suspend.o -obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o # Framework support diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index fe7f58616cdd6cf7..4d8012e1205c5a7f 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -34,9 +34,11 @@ config ARCH_RCAR_GEN3 config ARCH_RMOBILE bool - select PM_RMOBILE + select PM + select PM_GENERIC_DOMAINS select SYS_SUPPORTS_SH_CMT select SYS_SUPPORTS_SH_TMU + select SYSC_RMOBILE config ARCH_RZN1 bool @@ -297,4 +299,7 @@ config RST_RCAR config SYSC_RCAR bool "R-Car System Controller support" if COMPILE_TEST +config SYSC_RMOBILE + bool "R-Mobile System Controller support" if COMPILE_TEST + endif # SOC_RENESAS diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile index 3bdd7dbc38a9c7a3..00764d5a60b33dfe 100644 --- a/drivers/soc/renesas/Makefile +++ b/drivers/soc/renesas/Makefile @@ -27,3 +27,4 @@ endif # Family obj-$(CONFIG_RST_RCAR) += rcar-rst.o obj-$(CONFIG_SYSC_RCAR) += rcar-sysc.o +obj-$(CONFIG_SYSC_RMOBILE) += rmobile-sysc.o diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/drivers/soc/renesas/rmobile-sysc.c similarity index 100% rename from arch/arm/mach-shmobile/pm-rmobile.c rename to drivers/soc/renesas/rmobile-sysc.c -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/2] ARM: shmobile: R-Mobile: Move pm-rmobile to drivers/soc/renesas/ @ 2018-11-29 11:09 ` Geert Uytterhoeven 0 siblings, 0 replies; 10+ messages in thread From: Geert Uytterhoeven @ 2018-11-29 11:09 UTC (permalink / raw) To: linux-arm-kernel The pm-rmobile driver is really a driver for the System Controller (SYSC) found in R-Mobile SoCs. An equivalent driver for R-Car SoCs is already located under drivers/soc/renesas/. Hence move the pm-rmobile driver from arch/arm/mach-shmobile/ to drivers/soc/renesas/, and rename it to rmobile-sysc. Enable compile-testing on non-ARM and non-R-Mobile SoCs. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/Kconfig | 5 ----- arch/arm/mach-shmobile/Makefile | 1 - drivers/soc/renesas/Kconfig | 7 ++++++- drivers/soc/renesas/Makefile | 1 + .../pm-rmobile.c => drivers/soc/renesas/rmobile-sysc.c | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename arch/arm/mach-shmobile/pm-rmobile.c => drivers/soc/renesas/rmobile-sysc.c (100%) diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 9b798c9dffe4e94a..3683d6f109730ee7 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -1,9 +1,4 @@ # SPDX-License-Identifier: GPL-2.0 -config PM_RMOBILE - bool - select PM - select PM_GENERIC_DOMAINS - menuconfig ARCH_RENESAS bool "Renesas ARM SoCs" depends on ARCH_MULTI_V7 && MMU diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 5591646cb9bbfd33..f7bf17b7abaef7a9 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -35,7 +35,6 @@ smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o # PM objects obj-$(CONFIG_SUSPEND) += suspend.o -obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o obj-$(CONFIG_ARCH_RCAR_GEN2) += pm-rcar-gen2.o # Framework support diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index fe7f58616cdd6cf7..4d8012e1205c5a7f 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -34,9 +34,11 @@ config ARCH_RCAR_GEN3 config ARCH_RMOBILE bool - select PM_RMOBILE + select PM + select PM_GENERIC_DOMAINS select SYS_SUPPORTS_SH_CMT select SYS_SUPPORTS_SH_TMU + select SYSC_RMOBILE config ARCH_RZN1 bool @@ -297,4 +299,7 @@ config RST_RCAR config SYSC_RCAR bool "R-Car System Controller support" if COMPILE_TEST +config SYSC_RMOBILE + bool "R-Mobile System Controller support" if COMPILE_TEST + endif # SOC_RENESAS diff --git a/drivers/soc/renesas/Makefile b/drivers/soc/renesas/Makefile index 3bdd7dbc38a9c7a3..00764d5a60b33dfe 100644 --- a/drivers/soc/renesas/Makefile +++ b/drivers/soc/renesas/Makefile @@ -27,3 +27,4 @@ endif # Family obj-$(CONFIG_RST_RCAR) += rcar-rst.o obj-$(CONFIG_SYSC_RCAR) += rcar-sysc.o +obj-$(CONFIG_SYSC_RMOBILE) += rmobile-sysc.o diff --git a/arch/arm/mach-shmobile/pm-rmobile.c b/drivers/soc/renesas/rmobile-sysc.c similarity index 100% rename from arch/arm/mach-shmobile/pm-rmobile.c rename to drivers/soc/renesas/rmobile-sysc.c -- 2.17.1 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] ARM: shmobile: R-Mobile: Move pm-rmobile to drivers/soc/renesas/ 2018-11-29 11:09 ` Geert Uytterhoeven @ 2018-11-30 10:29 ` Simon Horman -1 siblings, 0 replies; 10+ messages in thread From: Simon Horman @ 2018-11-30 10:29 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: Magnus Damm, linux-arm-kernel, linux-renesas-soc On Thu, Nov 29, 2018 at 12:09:31PM +0100, Geert Uytterhoeven wrote: > The pm-rmobile driver is really a driver for the System Controller > (SYSC) found in R-Mobile SoCs. An equivalent driver for R-Car SoCs is > already located under drivers/soc/renesas/. > > Hence move the pm-rmobile driver from arch/arm/mach-shmobile/ to > drivers/soc/renesas/, and rename it to rmobile-sysc. > > Enable compile-testing on non-ARM and non-R-Mobile SoCs. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, applied for v4.21. ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] ARM: shmobile: R-Mobile: Move pm-rmobile to drivers/soc/renesas/ @ 2018-11-30 10:29 ` Simon Horman 0 siblings, 0 replies; 10+ messages in thread From: Simon Horman @ 2018-11-30 10:29 UTC (permalink / raw) To: Geert Uytterhoeven; +Cc: linux-renesas-soc, Magnus Damm, linux-arm-kernel On Thu, Nov 29, 2018 at 12:09:31PM +0100, Geert Uytterhoeven wrote: > The pm-rmobile driver is really a driver for the System Controller > (SYSC) found in R-Mobile SoCs. An equivalent driver for R-Car SoCs is > already located under drivers/soc/renesas/. > > Hence move the pm-rmobile driver from arch/arm/mach-shmobile/ to > drivers/soc/renesas/, and rename it to rmobile-sysc. > > Enable compile-testing on non-ARM and non-R-Mobile SoCs. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, applied for v4.21. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2018-11-30 21:38 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2018-11-29 11:09 [PATCH 0/2] ARM: shmobile: R-Mobile: Clean up and move pm-rmobile driver Geert Uytterhoeven 2018-11-29 11:09 ` Geert Uytterhoeven 2018-11-29 11:09 ` [PATCH 1/2] ARM: shmobile: R-Mobile: Clean up struct rmobile_pm_domain Geert Uytterhoeven 2018-11-29 11:09 ` Geert Uytterhoeven 2018-11-30 10:28 ` Simon Horman 2018-11-30 10:28 ` Simon Horman 2018-11-29 11:09 ` [PATCH 2/2] ARM: shmobile: R-Mobile: Move pm-rmobile to drivers/soc/renesas/ Geert Uytterhoeven 2018-11-29 11:09 ` Geert Uytterhoeven 2018-11-30 10:29 ` Simon Horman 2018-11-30 10:29 ` Simon Horman
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.