Re: [PATCH] arm: omap3: am35x: Set proper powerdomain states

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Mark,

On Mon, Apr 30, 2012 at 11:26 PM, Mark A. Greer <mgreer@xxxxxxxxxxxxxxx> wrote:
> From: "Mark A. Greer" <mgreer@xxxxxxxxxxxxxxx>
>
> The am35x family of SoCs only support the PWRSTS_ON
> state so create a new set of powerdomain structures
> that ensure that only the ON state is entered.
>
> Signed-off-by: Mark A. Greer <mgreer@xxxxxxxxxxxxxxx>
> ---
>
> These patches apply on top of Kevin's patch series,
>    "[PATCH/RFT 0/8] ARM: OMAP: remove IP checks from SoC family detection"
>
> Tested on an am3517 evm and am37x evm.
>
>  arch/arm/mach-omap2/powerdomains3xxx_data.c |  136 ++++++++++++++++++++++++---
>  1 file changed, 124 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c b/arch/arm/mach-omap2/powerdomains3xxx_data.c
> index fb0a0a6..6ec06ad 100644
> --- a/arch/arm/mach-omap2/powerdomains3xxx_data.c
> +++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c
> @@ -71,6 +71,22 @@ static struct powerdomain mpu_3xxx_pwrdm = {
>        .voltdm           = { .name = "mpu_iva" },
>  };
>
> +static struct powerdomain mpu_am35x_pwrdm = {
> +       .name             = "mpu_pwrdm",
> +       .prcm_offs        = MPU_MOD,
> +       .pwrsts           = PWRSTS_ON,
> +       .pwrsts_logic_ret = PWRSTS_ON,
> +       .flags            = PWRDM_HAS_MPU_QUIRK,
> +       .banks            = 1,
> +       .pwrsts_mem_ret   = {
> +               [0] = PWRSTS_ON,
> +       },
> +       .pwrsts_mem_on    = {
> +               [0] = PWRSTS_ON,
> +       },
> +       .voltdm           = { .name = "mpu_iva" },
> +};
> +
>  /*
>  * The USBTLL Save-and-Restore mechanism is broken on
>  * 3430s up to ES3.0 and 3630ES1.0. Hence this feature
> @@ -120,6 +136,23 @@ static struct powerdomain core_3xxx_es3_1_pwrdm = {
>        .voltdm           = { .name = "core" },
>  };
>
> +static struct powerdomain core_am35x_pwrdm = {
> +       .name             = "core_pwrdm",
> +       .prcm_offs        = CORE_MOD,
> +       .pwrsts           = PWRSTS_ON,
> +       .pwrsts_logic_ret = PWRSTS_ON,
> +       .banks            = 2,
> +       .pwrsts_mem_ret   = {
> +               [0] = PWRSTS_ON,         /* MEM1RETSTATE */
> +               [1] = PWRSTS_ON,         /* MEM2RETSTATE */
> +       },
> +       .pwrsts_mem_on    = {
> +               [0] = PWRSTS_ON, /* MEM1ONSTATE */
> +               [1] = PWRSTS_ON, /* MEM2ONSTATE */
> +       },
> +       .voltdm           = { .name = "core" },
> +};
> +
>  static struct powerdomain dss_pwrdm = {
>        .name             = "dss_pwrdm",
>        .prcm_offs        = OMAP3430_DSS_MOD,
> @@ -135,6 +168,21 @@ static struct powerdomain dss_pwrdm = {
>        .voltdm           = { .name = "core" },
>  };
>
> +static struct powerdomain dss_am35x_pwrdm = {
> +       .name             = "dss_pwrdm",
> +       .prcm_offs        = OMAP3430_DSS_MOD,
> +       .pwrsts           = PWRSTS_ON,
> +       .pwrsts_logic_ret = PWRSTS_ON,
> +       .banks            = 1,
> +       .pwrsts_mem_ret   = {
> +               [0] = PWRSTS_ON, /* MEMRETSTATE */
> +       },
> +       .pwrsts_mem_on    = {
> +               [0] = PWRSTS_ON,  /* MEMONSTATE */
> +       },
> +       .voltdm           = { .name = "core" },
> +};
> +
>  /*
>  * Although the 34XX TRM Rev K Table 4-371 notes that retention is a
>  * possible SGX powerstate, the SGX device itself does not support
> @@ -156,6 +204,21 @@ static struct powerdomain sgx_pwrdm = {
>        .voltdm           = { .name = "core" },
>  };
>
> +static struct powerdomain sgx_am35x_pwrdm = {
> +       .name             = "sgx_pwrdm",
> +       .prcm_offs        = OMAP3430ES2_SGX_MOD,
> +       .pwrsts           = PWRSTS_ON,
> +       .pwrsts_logic_ret = PWRSTS_ON,
> +       .banks            = 1,
> +       .pwrsts_mem_ret   = {
> +               [0] = PWRSTS_ON, /* MEMRETSTATE */
> +       },
> +       .pwrsts_mem_on    = {
> +               [0] = PWRSTS_ON,  /* MEMONSTATE */
> +       },
> +       .voltdm           = { .name = "core" },
> +};
> +
>  static struct powerdomain cam_pwrdm = {
>        .name             = "cam_pwrdm",
>        .prcm_offs        = OMAP3430_CAM_MOD,
> @@ -186,6 +249,21 @@ static struct powerdomain per_pwrdm = {
>        .voltdm           = { .name = "core" },
>  };
>
> +static struct powerdomain per_am35x_pwrdm = {
> +       .name             = "per_pwrdm",
> +       .prcm_offs        = OMAP3430_PER_MOD,
> +       .pwrsts           = PWRSTS_ON,
> +       .pwrsts_logic_ret = PWRSTS_ON,
> +       .banks            = 1,
> +       .pwrsts_mem_ret   = {
> +               [0] = PWRSTS_ON, /* MEMRETSTATE */
> +       },
> +       .pwrsts_mem_on    = {
> +               [0] = PWRSTS_ON,  /* MEMONSTATE */
> +       },
> +       .voltdm           = { .name = "core" },
> +};
> +
>  static struct powerdomain emu_pwrdm = {
>        .name           = "emu_pwrdm",
>        .prcm_offs      = OMAP3430_EMU_MOD,
> @@ -200,6 +278,14 @@ static struct powerdomain neon_pwrdm = {
>        .voltdm           = { .name = "mpu_iva" },
>  };
>
> +static struct powerdomain neon_am35x_pwrdm = {
> +       .name             = "neon_pwrdm",
> +       .prcm_offs        = OMAP3430_NEON_MOD,
> +       .pwrsts           = PWRSTS_ON,
> +       .pwrsts_logic_ret = PWRSTS_ON,
> +       .voltdm           = { .name = "mpu_iva" },
> +};
> +
>  static struct powerdomain usbhost_pwrdm = {
>        .name             = "usbhost_pwrdm",
>        .prcm_offs        = OMAP3430ES2_USBHOST_MOD,
> @@ -293,6 +379,22 @@ static struct powerdomain *powerdomains_omap3430es3_1plus[] __initdata = {
>        NULL
>  };
>
> +static struct powerdomain *powerdomains_am35x[] __initdata = {
> +       &wkup_omap2_pwrdm,
> +       &mpu_am35x_pwrdm,
> +       &neon_am35x_pwrdm,
> +       &core_am35x_pwrdm,
> +       &sgx_am35x_pwrdm,
> +       &dss_am35x_pwrdm,
> +       &per_am35x_pwrdm,
> +       &emu_pwrdm,
> +       &dpll1_pwrdm,
> +       &dpll3_pwrdm,
> +       &dpll4_pwrdm,
> +       &dpll5_pwrdm,
> +       NULL
> +};
> +
This looks good!

>  void __init omap3xxx_powerdomains_init(void)
>  {
>        unsigned int rev;
> @@ -301,21 +403,31 @@ void __init omap3xxx_powerdomains_init(void)
>                return;
>
>        pwrdm_register_platform_funcs(&omap3_pwrdm_operations);
> -       pwrdm_register_pwrdms(powerdomains_omap3430_common);
>
>        rev = omap_rev();
>
> -       if (rev == OMAP3430_REV_ES1_0)
> -               pwrdm_register_pwrdms(powerdomains_omap3430es1);
> -       else if (rev == OMAP3430_REV_ES2_0 || rev == OMAP3430_REV_ES2_1 ||
> -                rev == OMAP3430_REV_ES3_0 || rev == OMAP3630_REV_ES1_0)
> -               pwrdm_register_pwrdms(powerdomains_omap3430es2_es3_0);
> -       else if (rev == OMAP3430_REV_ES3_1 || rev == OMAP3430_REV_ES3_1_2 ||
> -                rev == AM35XX_REV_ES1_0 || rev == AM35XX_REV_ES1_1 ||
> -                rev == OMAP3630_REV_ES1_1 || rev == OMAP3630_REV_ES1_2)
> -               pwrdm_register_pwrdms(powerdomains_omap3430es3_1plus);
> -       else
> -               WARN(1, "OMAP3 powerdomain init: unknown chip type\n");
> +       if (rev == AM35XX_REV_ES1_0 || rev == AM35XX_REV_ES1_1) {
> +               pwrdm_register_pwrdms(powerdomains_am35x);
> +       } else {
> +               pwrdm_register_pwrdms(powerdomains_omap3430_common);
Is there a way to avoid the big 'if else' here and have the code
organized per chipset revision? A mutliple if-else or -even better
IMO- a switch-case would make the code more readable.

> +
> +               if (rev == OMAP3430_REV_ES1_0)
> +                       pwrdm_register_pwrdms(powerdomains_omap3430es1);
> +               else if (rev == OMAP3430_REV_ES2_0 ||
> +                        rev == OMAP3430_REV_ES2_1 ||
> +                        rev == OMAP3430_REV_ES3_0 ||
> +                        rev == OMAP3630_REV_ES1_0)
> +                       pwrdm_register_pwrdms(powerdomains_omap3430es2_es3_0);
> +               else if (rev == OMAP3430_REV_ES3_1 ||
> +                        rev == OMAP3430_REV_ES3_1_2 ||
> +                        rev == AM35XX_REV_ES1_0 ||
> +                        rev == AM35XX_REV_ES1_1 ||
> +                        rev == OMAP3630_REV_ES1_1 ||
> +                        rev == OMAP3630_REV_ES1_2)
> +                       pwrdm_register_pwrdms(powerdomains_omap3430es3_1plus);
> +               else
> +                       WARN(1, "OMAP3 powerdomain init: unknown chip type\n");
> +       }
>
>        pwrdm_complete_init();
>  }

Thanks,
Jean

> --
> 1.7.9.4
>
> --
> 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
--
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


[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux