aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-11-05 10:10:36 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2012-11-11 17:35:04 -0500
commitb851c06c241d4a2e43ee6007705765a9b1b3abb7 (patch)
tree4690d64eca68fcdef42a1d93f5c0bff4bbbe0481 /drivers
parent8c4203cb5814f53169dc4ff084a65dcf509b6f60 (diff)
mfd: Differentiate between u8500 and u9540 TCDM address mapping
The TCDM mappings are quite different from u8500 to u9540. If these aren't correctly specified for a given board, it will fail to boot. Here we add the correct TCDM base for the u9540. Please note that although this patch allows us to boot the u9540, it doesn't provide us with full enablement. For that, another patch-set will follow which completely re-vamps the way the PRCMU is passed TCDM mappings. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/db8500-prcmu.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 00b8b0f3dfb6..c56ceddf8581 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2711,7 +2711,7 @@ static int db8500_irq_init(struct device_node *np)
2711 2711
2712void __init db8500_prcmu_early_init(void) 2712void __init db8500_prcmu_early_init(void)
2713{ 2713{
2714 if (cpu_is_u8500v2()) { 2714 if (cpu_is_u8500v2() || cpu_is_u9540()) {
2715 void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K); 2715 void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K);
2716 2716
2717 if (tcpm_base != NULL) { 2717 if (tcpm_base != NULL) {
@@ -2729,7 +2729,11 @@ void __init db8500_prcmu_early_init(void)
2729 iounmap(tcpm_base); 2729 iounmap(tcpm_base);
2730 } 2730 }
2731 2731
2732 tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE); 2732 if (cpu_is_u9540())
2733 tcdm_base = ioremap_nocache(U8500_PRCMU_TCDM_BASE,
2734 SZ_4K + SZ_8K) + SZ_8K;
2735 else
2736 tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
2733 } else { 2737 } else {
2734 pr_err("prcmu: Unsupported chip version\n"); 2738 pr_err("prcmu: Unsupported chip version\n");
2735 BUG(); 2739 BUG();