Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[platform/kernel/linux-rpi.git] / drivers / mfd / db8500-prcmu.c

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index 2971056..dc8826d 100644 (file)
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2763,7 +2763,7 @@ static int db8500_irq_init(struct device_node *np)
 
 void __init db8500_prcmu_early_init(void)
 {
-       if (cpu_is_u8500v2()) {
+       if (cpu_is_u8500v2() || cpu_is_u9540()) {
                void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K);
 
                if (tcpm_base != NULL) {
@@ -2781,7 +2781,11 @@ void __init db8500_prcmu_early_init(void)
                        iounmap(tcpm_base);
                }
 
-               tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
+               if (cpu_is_u9540())
+                       tcdm_base = ioremap_nocache(U8500_PRCMU_TCDM_BASE,
+                                               SZ_4K + SZ_8K) + SZ_8K;
+               else
+                       tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE);
        } else {
                pr_err("prcmu: Unsupported chip version\n");
                BUG();