diff options
author | Mark A. Greer <mgreer@mvista.com> | 2009-04-15 15:39:33 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-05-26 11:16:46 -0400 |
commit | d81d188cafecbc9e01df51527ac4c84a5b19e033 (patch) | |
tree | 40b26ea71d32547e50913dbdc4a2adec5fc8e809 /arch/arm/mach-davinci/dm355.c | |
parent | 66e0c3991c5a1735dd8add77ab8aff5005f57681 (diff) |
davinci: Add support for multiple PSCs
The current code to support the DaVinci Power and Sleep Controller (PSC)
assumes that there is only one controller. This assumption is no longer
valid so expand the support to allow greater than one PSC.
To accomplish this, put the base addresses for the PSCs in the SoC
infrastructure so it can be referenced by the PSC code. This also
requires adding an extra parameter to davinci_psc_config() to specify
the PSC that is to be enabled/disabled.
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/dm355.c')
-rw-r--r-- | arch/arm/mach-davinci/dm355.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c index e93840a814ed..37f20a7214be 100644 --- a/arch/arm/mach-davinci/dm355.c +++ b/arch/arm/mach-davinci/dm355.c | |||
@@ -545,6 +545,10 @@ static struct davinci_id dm355_ids[] = { | |||
545 | }, | 545 | }, |
546 | }; | 546 | }; |
547 | 547 | ||
548 | static void __iomem *dm355_psc_bases[] = { | ||
549 | IO_ADDRESS(DAVINCI_PWR_SLEEP_CNTRL_BASE), | ||
550 | }; | ||
551 | |||
548 | static struct davinci_soc_info davinci_soc_info_dm355 = { | 552 | static struct davinci_soc_info davinci_soc_info_dm355 = { |
549 | .io_desc = dm355_io_desc, | 553 | .io_desc = dm355_io_desc, |
550 | .io_desc_num = ARRAY_SIZE(dm355_io_desc), | 554 | .io_desc_num = ARRAY_SIZE(dm355_io_desc), |
@@ -552,6 +556,8 @@ static struct davinci_soc_info davinci_soc_info_dm355 = { | |||
552 | .ids = dm355_ids, | 556 | .ids = dm355_ids, |
553 | .ids_num = ARRAY_SIZE(dm355_ids), | 557 | .ids_num = ARRAY_SIZE(dm355_ids), |
554 | .cpu_clks = dm355_clks, | 558 | .cpu_clks = dm355_clks, |
559 | .psc_bases = dm355_psc_bases, | ||
560 | .psc_bases_num = ARRAY_SIZE(dm355_psc_bases), | ||
555 | }; | 561 | }; |
556 | 562 | ||
557 | void __init dm355_init(void) | 563 | void __init dm355_init(void) |