Santosh Shilimkar <santosh.shilimkar@xxxxxx> writes:
> OMAP5 has backward compatible PRCM block and it's programming
> model is mostly similar to OMAP4. Same is going to be maintained
> for future OMAP4 based SOCs. Hence consolidate the OMAP4 power
> management code so that it can be re-used on OMAP5 and later devices.
>
> With consolidated code, let basic power management code build
> for OMAP5 devices. While at it, update the kernel-doc for omap4_pm_init().
>
> Acked-by: Nishanth Menon <nm@xxxxxx>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
> ---
> arch/arm/mach-omap2/Makefile | 9 ++--
> arch/arm/mach-omap2/{pm44xx.c => pm_omap4plus.c} | 54 ++++++++++++++++----
> .../mach-omap2/{sleep44xx.S => sleep_omap4plus.S} | 0
> 3 files changed, 49 insertions(+), 14 deletions(-)
> rename arch/arm/mach-omap2/{pm44xx.c => pm_omap4plus.c} (86%)
> rename arch/arm/mach-omap2/{sleep44xx.S => sleep_omap4plus.S} (100%)
>
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index 5d5ff91..d91ae0f 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -35,14 +35,14 @@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o
> obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o
> obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o
> omap-4-5-common = omap4-common.o omap-wakeupgen.o \
> - sleep44xx.o
> + sleep_omap4plus.o
> obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common)
> obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common)
>
> plus_sec := $(call as-instr,.arch_extension sec,+sec)
> AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec)
> AFLAGS_omap-smc.o :=-Wa,-march=armv7-a$(plus_sec)
> -AFLAGS_sleep44xx.o :=-Wa,-march=armv7-a$(plus_sec)
> +AFLAGS_sleep_omap4plus.o :=-Wa,-march=armv7-a$(plus_sec)
>
> # Functions loaded to SRAM
> obj-$(CONFIG_SOC_OMAP2420) += sram242x.o
> @@ -80,11 +80,12 @@ endif
> obj-$(CONFIG_OMAP_PM_NOOP) += omap-pm-noop.o
>
> ifeq ($(CONFIG_PM),y)
> +omap4plus-common-pm = omap-mpuss-lowpower.o pm_omap4plus.o
> obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o
> obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o
> obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o
> -obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o omap-mpuss-lowpower.o
> -obj-$(CONFIG_SOC_OMAP5) += omap-mpuss-lowpower.o
> +obj-$(CONFIG_ARCH_OMAP4) += $(omap4plus-common-pm)
> +obj-$(CONFIG_SOC_OMAP5) += $(omap4plus-common-pm)
> obj-$(CONFIG_PM_DEBUG) += pm-debug.o
>
> obj-$(CONFIG_POWER_AVS_OMAP) += sr_device.o
> diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm_omap4plus.c
> similarity index 86%
> rename from arch/arm/mach-omap2/pm44xx.c
> rename to arch/arm/mach-omap2/pm_omap4plus.c
> index 5ba6d88..e920c34 100644
> --- a/arch/arm/mach-omap2/pm44xx.c
> +++ b/arch/arm/mach-omap2/pm_omap4plus.c
> @@ -1,7 +1,7 @@
> /*
> - * OMAP4 Power Management Routines
> + * OMAP4PLUS Power Management Routines
nit: OMAP4+ (you only need to spell out "plus" in the filename.
> *
> - * Copyright (C) 2010-2011 Texas Instruments, Inc.
> + * Copyright (C) 2010-2013 Texas Instruments, Inc.
> * Rajendra Nayak <rnayak@xxxxxx>
> * Santosh Shilimkar <santosh.shilimkar@xxxxxx>
> *
> @@ -135,16 +135,16 @@ static void omap_default_idle(void)
> }
>
> /**
> - * omap4_pm_init - Init routine for OMAP4 PM
> + * omap4_init_static_deps - Add OMAP4 static dependencies
> *
> - * Initializes all powerdomain and clockdomain target states
> - * and all PRCM settings.
> + * Add needed static clockdomain dependencies on OMAP4 devices.
> + * Return: 0 on success or 'err' on failures
> */
> -int __init omap4_pm_init(void)
> +static inline int omap4_init_static_deps(void)
You dropped the __init here, but it's still only called from another
__init function, so I suspect it should stay.
> {
> - int ret;
> struct clockdomain *emif_clkdm, *mpuss_clkdm, *l3_1_clkdm;
> struct clockdomain *ducati_clkdm, *l3_2_clkdm;
> + int ret = 0;
>
> if (omap_rev() == OMAP4430_REV_ES1_0) {
> WARN(1, "Power Management not supported on OMAP4430 ES1.0\n");
> @@ -163,7 +163,7 @@ int __init omap4_pm_init(void)
> ret = pwrdm_for_each(pwrdms_setup, NULL);
> if (ret) {
> pr_err("Failed to setup powerdomains\n");
> - goto err2;
> + return ret;
> }
>
> /*
> @@ -179,7 +179,7 @@ int __init omap4_pm_init(void)
> ducati_clkdm = clkdm_lookup("ducati_clkdm");
> if ((!mpuss_clkdm) || (!emif_clkdm) || (!l3_1_clkdm) ||
> (!l3_2_clkdm) || (!ducati_clkdm))
> - goto err2;
> + return -EINVAL;
> ret = clkdm_add_wkdep(mpuss_clkdm, emif_clkdm);
> ret |= clkdm_add_wkdep(mpuss_clkdm, l3_1_clkdm);
> @@ -188,9 +188,42 @@ int __init omap4_pm_init(void)
> ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm);
> if (ret) {
> pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 wakeup dependency\n");
> + return -EINVAL;
> + }
> +
> + return ret;
> +}
> +
> +/**
> + * omap4_pm_init - Init routine for OMAP4+ devices
> + *
> + * Initializes all powerdomain and clockdomain target states
> + * and all PRCM settings.
> + * Return: Returns the error code returned by called functions.
> + */
> +int __init omap4_pm_init(void)
> +{
> + int ret = 0;
> +
> + if (omap_rev() == OMAP4430_REV_ES1_0) {
> + WARN(1, "Power Management not supported on OMAP4430 ES1.0\n");
> + return -ENODEV;
> + }
> +
> + pr_info("Power Management for TI OMAP4PLUS devices.\n");
s/PLUS/+/
Kevin
> +
> + ret = pwrdm_for_each(pwrdms_setup, NULL);
> + if (ret) {
> + pr_err("Failed to setup powerdomains.\n");
> goto err2;
> }
>
> + if (cpu_is_omap44xx()) {
> + ret = omap4_init_static_deps();
> + if (ret)
> + goto err2;
> + }
> +
> ret = omap4_mpuss_init();
> if (ret) {
> pr_err("Failed to initialise OMAP4 MPUSS\n");
> @@ -206,7 +239,8 @@ int __init omap4_pm_init(void)
> /* Overwrite the default cpu_do_idle() */
> arm_pm_idle = omap_default_idle;
>
> - omap4_idle_init();
> + if (cpu_is_omap44xx())
> + omap4_idle_init();
>
> err2:
> return ret;
> diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep_omap4plus.S
> similarity index 100%
> rename from arch/arm/mach-omap2/sleep44xx.S
> rename to arch/arm/mach-omap2/sleep_omap4plus.S
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
