-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OMAP: clockdomain code/data: remove omap_chip bitmask from struct clo…
…ckdomain At Tony's request, remove the omap_chip bitmasks from the clockdomain and clockdomain dependency definitions. Instead, initialize clockdomains based on one or more lists that are applicable to a particular SoC family, variant, and silicon revision. Tony Lindgren <tony@atomide.com> found a bug in a previous version of this patch - thanks Tony. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Tony Lindgren <tony@atomide.com>
- Loading branch information
Paul Walmsley
committed
Sep 14, 2011
1 parent
08cb970
commit a5ffef6
Showing
11 changed files
with
842 additions
and
1,156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,154 @@ | ||
| /* | ||
| * OMAP2420 clockdomains | ||
| * | ||
| * Copyright (C) 2008-2011 Texas Instruments, Inc. | ||
| * Copyright (C) 2008-2010 Nokia Corporation | ||
| * | ||
| * Paul Walmsley, Jouni Högander | ||
| * | ||
| * This file contains clockdomains and clockdomain wakeup dependencies | ||
| * for OMAP2420 chips. Some notes: | ||
| * | ||
| * A useful validation rule for struct clockdomain: Any clockdomain | ||
| * referenced by a wkdep_srcs must have a dep_bit assigned. So | ||
| * wkdep_srcs are really just software-controllable dependencies. | ||
| * Non-software-controllable dependencies do exist, but they are not | ||
| * encoded below (yet). | ||
| * | ||
| * 24xx does not support programmable sleep dependencies (SLEEPDEP) | ||
| * | ||
| * The overly-specific dep_bit names are due to a bit name collision | ||
| * with CM_FCLKEN_{DSP,IVA2}. The DSP/IVA2 PM_WKDEP and CM_SLEEPDEP shift | ||
| * value are the same for all powerdomains: 2 | ||
| * | ||
| * XXX should dep_bit be a mask, so we can test to see if it is 0 as a | ||
| * sanity check? | ||
| * XXX encode hardware fixed wakeup dependencies -- esp. for 3430 CORE | ||
| */ | ||
|
|
||
| /* | ||
| * To-Do List | ||
| * -> Port the Sleep/Wakeup dependencies for the domains | ||
| * from the Power domain framework | ||
| */ | ||
|
|
||
| #include <linux/kernel.h> | ||
| #include <linux/io.h> | ||
|
|
||
| #include "clockdomain.h" | ||
| #include "prm2xxx_3xxx.h" | ||
| #include "cm2xxx_3xxx.h" | ||
| #include "cm-regbits-24xx.h" | ||
| #include "prm-regbits-24xx.h" | ||
|
|
||
| /* | ||
| * Clockdomain dependencies for wkdeps | ||
| * | ||
| * XXX Hardware dependencies (e.g., dependencies that cannot be | ||
| * changed in software) are not included here yet, but should be. | ||
| */ | ||
|
|
||
| /* Wakeup dependency source arrays */ | ||
|
|
||
| /* 2420-specific possible wakeup dependencies */ | ||
|
|
||
| /* 2420 PM_WKDEP_MPU: CORE, DSP, WKUP */ | ||
| static struct clkdm_dep mpu_2420_wkdeps[] = { | ||
| { .clkdm_name = "core_l3_clkdm" }, | ||
| { .clkdm_name = "core_l4_clkdm" }, | ||
| { .clkdm_name = "dsp_clkdm" }, | ||
| { .clkdm_name = "wkup_clkdm" }, | ||
| { NULL }, | ||
| }; | ||
|
|
||
| /* 2420 PM_WKDEP_CORE: DSP, GFX, MPU, WKUP */ | ||
| static struct clkdm_dep core_2420_wkdeps[] = { | ||
| { .clkdm_name = "dsp_clkdm" }, | ||
| { .clkdm_name = "gfx_clkdm" }, | ||
| { .clkdm_name = "mpu_clkdm" }, | ||
| { .clkdm_name = "wkup_clkdm" }, | ||
| { NULL }, | ||
| }; | ||
|
|
||
| /* | ||
| * 2420-only clockdomains | ||
| */ | ||
|
|
||
| static struct clockdomain mpu_2420_clkdm = { | ||
| .name = "mpu_clkdm", | ||
| .pwrdm = { .name = "mpu_pwrdm" }, | ||
| .flags = CLKDM_CAN_HWSUP, | ||
| .wkdep_srcs = mpu_2420_wkdeps, | ||
| .clktrctrl_mask = OMAP24XX_AUTOSTATE_MPU_MASK, | ||
| }; | ||
|
|
||
| static struct clockdomain iva1_2420_clkdm = { | ||
| .name = "iva1_clkdm", | ||
| .pwrdm = { .name = "dsp_pwrdm" }, | ||
| .flags = CLKDM_CAN_HWSUP_SWSUP, | ||
| .dep_bit = OMAP24XX_PM_WKDEP_MPU_EN_DSP_SHIFT, | ||
| .wkdep_srcs = dsp_24xx_wkdeps, | ||
| .clktrctrl_mask = OMAP2420_AUTOSTATE_IVA_MASK, | ||
| }; | ||
|
|
||
| static struct clockdomain dsp_2420_clkdm = { | ||
| .name = "dsp_clkdm", | ||
| .pwrdm = { .name = "dsp_pwrdm" }, | ||
| .flags = CLKDM_CAN_HWSUP_SWSUP, | ||
| .clktrctrl_mask = OMAP24XX_AUTOSTATE_DSP_MASK, | ||
| }; | ||
|
|
||
| static struct clockdomain gfx_2420_clkdm = { | ||
| .name = "gfx_clkdm", | ||
| .pwrdm = { .name = "gfx_pwrdm" }, | ||
| .flags = CLKDM_CAN_HWSUP_SWSUP, | ||
| .wkdep_srcs = gfx_24xx_wkdeps, | ||
| .clktrctrl_mask = OMAP24XX_AUTOSTATE_GFX_MASK, | ||
| }; | ||
|
|
||
| static struct clockdomain core_l3_2420_clkdm = { | ||
| .name = "core_l3_clkdm", | ||
| .pwrdm = { .name = "core_pwrdm" }, | ||
| .flags = CLKDM_CAN_HWSUP, | ||
| .wkdep_srcs = core_2420_wkdeps, | ||
| .clktrctrl_mask = OMAP24XX_AUTOSTATE_L3_MASK, | ||
| }; | ||
|
|
||
| static struct clockdomain core_l4_2420_clkdm = { | ||
| .name = "core_l4_clkdm", | ||
| .pwrdm = { .name = "core_pwrdm" }, | ||
| .flags = CLKDM_CAN_HWSUP, | ||
| .wkdep_srcs = core_2420_wkdeps, | ||
| .clktrctrl_mask = OMAP24XX_AUTOSTATE_L4_MASK, | ||
| }; | ||
|
|
||
| static struct clockdomain dss_2420_clkdm = { | ||
| .name = "dss_clkdm", | ||
| .pwrdm = { .name = "core_pwrdm" }, | ||
| .flags = CLKDM_CAN_HWSUP, | ||
| .clktrctrl_mask = OMAP24XX_AUTOSTATE_DSS_MASK, | ||
| }; | ||
|
|
||
| static struct clockdomain *clockdomains_omap242x[] __initdata = { | ||
| &wkup_common_clkdm, | ||
| &cm_common_clkdm, | ||
| &prm_common_clkdm, | ||
| &mpu_2420_clkdm, | ||
| &iva1_2420_clkdm, | ||
| &dsp_2420_clkdm, | ||
| &gfx_2420_clkdm, | ||
| &core_l3_2420_clkdm, | ||
| &core_l4_2420_clkdm, | ||
| &dss_2420_clkdm, | ||
| NULL, | ||
| }; | ||
|
|
||
| void __init omap242x_clockdomains_init(void) | ||
| { | ||
| if (!cpu_is_omap242x()) | ||
| return; | ||
|
|
||
| clkdm_register_platform_funcs(&omap2_clkdm_operations); | ||
| clkdm_register_clkdms(clockdomains_omap242x); | ||
| clkdm_complete_init(); | ||
| } |
Oops, something went wrong.