* [PATCH 0/3] ARM: shmobile: Misc Cleanups
@ 2015-09-30 15:50 Geert Uytterhoeven
2015-09-30 15:50 ` [PATCH 1/3] ARM: shmobile: smp: Make shmobile_smp_apmu_cpu_shutdown() static Geert Uytterhoeven
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2015-09-30 15:50 UTC (permalink / raw)
To: linux-arm-kernel
Hi Simon, Magnus,
This patch series contains a few cleanups.
Geert Uytterhoeven (3):
ARM: shmobile: smp: Make shmobile_smp_apmu_cpu_shutdown() static
ARM: shmobile: r8a7778: Make r8a7778_init_irq_dt() static
ARM: shmobile: r8a7779: Remove legacy PM Domain remainings
arch/arm/mach-shmobile/platsmp-apmu.c | 2 +-
arch/arm/mach-shmobile/pm-r8a7779.c | 99 ----------------------------------
arch/arm/mach-shmobile/r8a7779.h | 6 ---
arch/arm/mach-shmobile/setup-r8a7778.c | 3 +-
4 files changed, 3 insertions(+), 107 deletions(-)
--
1.9.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] 5+ messages in thread* [PATCH 1/3] ARM: shmobile: smp: Make shmobile_smp_apmu_cpu_shutdown() static 2015-09-30 15:50 [PATCH 0/3] ARM: shmobile: Misc Cleanups Geert Uytterhoeven @ 2015-09-30 15:50 ` Geert Uytterhoeven 2015-09-30 15:50 ` [PATCH 2/3] ARM: shmobile: r8a7778: Make r8a7778_init_irq_dt() static Geert Uytterhoeven ` (2 subsequent siblings) 3 siblings, 0 replies; 5+ messages in thread From: Geert Uytterhoeven @ 2015-09-30 15:50 UTC (permalink / raw) To: linux-arm-kernel shmobile_smp_apmu_cpu_shutdown() is used inside platsmp-apmu.c only. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/platsmp-apmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c index 4e54512bee308312..bcf4cc51b926c479 100644 --- a/arch/arm/mach-shmobile/platsmp-apmu.c +++ b/arch/arm/mach-shmobile/platsmp-apmu.c @@ -170,7 +170,7 @@ static inline void cpu_enter_lowpower_a15(void) dsb(); } -void shmobile_smp_apmu_cpu_shutdown(unsigned int cpu) +static void shmobile_smp_apmu_cpu_shutdown(unsigned int cpu) { /* Select next sleep mode using the APMU */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/3] ARM: shmobile: r8a7778: Make r8a7778_init_irq_dt() static 2015-09-30 15:50 [PATCH 0/3] ARM: shmobile: Misc Cleanups Geert Uytterhoeven 2015-09-30 15:50 ` [PATCH 1/3] ARM: shmobile: smp: Make shmobile_smp_apmu_cpu_shutdown() static Geert Uytterhoeven @ 2015-09-30 15:50 ` Geert Uytterhoeven 2015-09-30 15:50 ` [PATCH 3/3] ARM: shmobile: r8a7779: Remove legacy PM Domain remainings Geert Uytterhoeven 2015-10-01 5:10 ` [PATCH 0/3] ARM: shmobile: Misc Cleanups Simon Horman 3 siblings, 0 replies; 5+ messages in thread From: Geert Uytterhoeven @ 2015-09-30 15:50 UTC (permalink / raw) To: linux-arm-kernel As of commit 4baadb9e05c68962 ("ARM: shmobile: r8a7778: remove obsolete setup code"), r8a7778_init_irq_dt() is no longer used outside setup-r8a7778.c. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/setup-r8a7778.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c index b0c9986d022d8664..0ab9d32728758a9a 100644 --- a/arch/arm/mach-shmobile/setup-r8a7778.c +++ b/arch/arm/mach-shmobile/setup-r8a7778.c @@ -42,7 +42,8 @@ static void __init r8a7778_timer_init(void) #define INT2NTSR0 0x00018 /* 0xfe700018 */ #define INT2NTSR1 0x0002c /* 0xfe70002c */ -void __init r8a7778_init_irq_dt(void) + +static void __init r8a7778_init_irq_dt(void) { void __iomem *base = ioremap_nocache(0xfe700000, 0x00100000); -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/3] ARM: shmobile: r8a7779: Remove legacy PM Domain remainings 2015-09-30 15:50 [PATCH 0/3] ARM: shmobile: Misc Cleanups Geert Uytterhoeven 2015-09-30 15:50 ` [PATCH 1/3] ARM: shmobile: smp: Make shmobile_smp_apmu_cpu_shutdown() static Geert Uytterhoeven 2015-09-30 15:50 ` [PATCH 2/3] ARM: shmobile: r8a7778: Make r8a7778_init_irq_dt() static Geert Uytterhoeven @ 2015-09-30 15:50 ` Geert Uytterhoeven 2015-10-01 5:10 ` [PATCH 0/3] ARM: shmobile: Misc Cleanups Simon Horman 3 siblings, 0 replies; 5+ messages in thread From: Geert Uytterhoeven @ 2015-09-30 15:50 UTC (permalink / raw) To: linux-arm-kernel As of commit c99cd90d98a98aa1 ("ARM: shmobile: r8a7779: Remove legacy SoC code"), r8a7779_init_pm_domains() is no longer called. Remove all related legacy PM Domain code. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/mach-shmobile/pm-r8a7779.c | 99 ------------------------------------- arch/arm/mach-shmobile/r8a7779.h | 6 --- 2 files changed, 105 deletions(-) diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c index 47a862e7f8bab242..14c42a1bdf1ef20d 100644 --- a/arch/arm/mach-shmobile/pm-r8a7779.c +++ b/arch/arm/mach-shmobile/pm-r8a7779.c @@ -9,20 +9,8 @@ * for more details. */ -#include <linux/pm.h> -#include <linux/suspend.h> -#include <linux/err.h> -#include <linux/pm_clock.h> -#include <linux/pm_domain.h> -#include <linux/platform_device.h> -#include <linux/delay.h> -#include <linux/irq.h> -#include <linux/interrupt.h> -#include <linux/console.h> - #include <asm/io.h> -#include "common.h" #include "pm-rcar.h" #include "r8a7779.h" @@ -30,17 +18,6 @@ #define SYSCIER 0x0c #define SYSCIMR 0x10 -struct r8a7779_pm_domain { - struct generic_pm_domain genpd; - struct rcar_sysc_ch ch; -}; - -static inline -const struct rcar_sysc_ch *to_r8a7779_ch(struct generic_pm_domain *d) -{ - return &container_of(d, struct r8a7779_pm_domain, genpd)->ch; -} - #if defined(CONFIG_PM) || defined(CONFIG_SMP) static void __init r8a7779_sysc_init(void) @@ -58,82 +35,6 @@ static inline void r8a7779_sysc_init(void) {} #endif /* CONFIG_PM || CONFIG_SMP */ -#ifdef CONFIG_PM - -static int pd_power_down(struct generic_pm_domain *genpd) -{ - return rcar_sysc_power_down(to_r8a7779_ch(genpd)); -} - -static int pd_power_up(struct generic_pm_domain *genpd) -{ - return rcar_sysc_power_up(to_r8a7779_ch(genpd)); -} - -static bool pd_is_off(struct generic_pm_domain *genpd) -{ - return rcar_sysc_power_is_off(to_r8a7779_ch(genpd)); -} - -static bool pd_active_wakeup(struct device *dev) -{ - return true; -} - -static void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd) -{ - struct generic_pm_domain *genpd = &r8a7779_pd->genpd; - - pm_genpd_init(genpd, NULL, false); - genpd->dev_ops.active_wakeup = pd_active_wakeup; - genpd->power_off = pd_power_down; - genpd->power_on = pd_power_up; - - if (pd_is_off(&r8a7779_pd->genpd)) - pd_power_up(&r8a7779_pd->genpd); -} - -static struct r8a7779_pm_domain r8a7779_pm_domains[] = { - { - .genpd.name = "SH4A", - .ch = { - .chan_offs = 0x80, /* PWRSR1 .. PWRER1 */ - .isr_bit = 16, /* SH4A */ - }, - }, - { - .genpd.name = "SGX", - .ch = { - .chan_offs = 0xc0, /* PWRSR2 .. PWRER2 */ - .isr_bit = 20, /* SGX */ - }, - }, - { - .genpd.name = "VDP1", - .ch = { - .chan_offs = 0x100, /* PWRSR3 .. PWRER3 */ - .isr_bit = 21, /* VDP */ - }, - }, - { - .genpd.name = "IMPX3", - .ch = { - .chan_offs = 0x140, /* PWRSR4 .. PWRER4 */ - .isr_bit = 24, /* IMP */ - }, - }, -}; - -void __init r8a7779_init_pm_domains(void) -{ - int j; - - for (j = 0; j < ARRAY_SIZE(r8a7779_pm_domains); j++) - r8a7779_init_pm_domain(&r8a7779_pm_domains[j]); -} - -#endif /* CONFIG_PM */ - void __init r8a7779_pm_init(void) { static int once; diff --git a/arch/arm/mach-shmobile/r8a7779.h b/arch/arm/mach-shmobile/r8a7779.h index aad833a8f0b8c5f1..e1aaa2ef9376c91d 100644 --- a/arch/arm/mach-shmobile/r8a7779.h +++ b/arch/arm/mach-shmobile/r8a7779.h @@ -3,12 +3,6 @@ extern void r8a7779_pm_init(void); -#ifdef CONFIG_PM -extern void __init r8a7779_init_pm_domains(void); -#else -static inline void r8a7779_init_pm_domains(void) {} -#endif /* CONFIG_PM */ - extern struct smp_operations r8a7779_smp_ops; #endif /* __ASM_R8A7779_H__ */ -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/3] ARM: shmobile: Misc Cleanups 2015-09-30 15:50 [PATCH 0/3] ARM: shmobile: Misc Cleanups Geert Uytterhoeven ` (2 preceding siblings ...) 2015-09-30 15:50 ` [PATCH 3/3] ARM: shmobile: r8a7779: Remove legacy PM Domain remainings Geert Uytterhoeven @ 2015-10-01 5:10 ` Simon Horman 3 siblings, 0 replies; 5+ messages in thread From: Simon Horman @ 2015-10-01 5:10 UTC (permalink / raw) To: linux-arm-kernel On Wed, Sep 30, 2015 at 05:50:17PM +0200, Geert Uytterhoeven wrote: > Hi Simon, Magnus, > > This patch series contains a few cleanups. Thanks, I have queued these up. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-10-01 5:10 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-09-30 15:50 [PATCH 0/3] ARM: shmobile: Misc Cleanups Geert Uytterhoeven 2015-09-30 15:50 ` [PATCH 1/3] ARM: shmobile: smp: Make shmobile_smp_apmu_cpu_shutdown() static Geert Uytterhoeven 2015-09-30 15:50 ` [PATCH 2/3] ARM: shmobile: r8a7778: Make r8a7778_init_irq_dt() static Geert Uytterhoeven 2015-09-30 15:50 ` [PATCH 3/3] ARM: shmobile: r8a7779: Remove legacy PM Domain remainings Geert Uytterhoeven 2015-10-01 5:10 ` [PATCH 0/3] ARM: shmobile: Misc Cleanups Simon Horman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).