Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[cascardo/linux.git] / drivers / mfd / db8500-prcmu.c

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index a25ab9c..af8e0ef 100644 (file)
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2102,14 +2102,11 @@ static struct irq_chip prcmu_irq_chip = {
 void __init db8500_prcmu_early_init(void)
 {
        unsigned int i;
-
-       if (cpu_is_u8500v1()) {
-               tcdm_base = __io_address(U8500_PRCMU_TCDM_BASE_V1);
-       } else if (cpu_is_u8500v2()) {
+       if (cpu_is_u8500v2()) {
                void *tcpm_base = ioremap_nocache(U8500_PRCMU_TCPM_BASE, SZ_4K);
 
                if (tcpm_base != NULL) {
-                       int version;
+                       u32 version;
                        version = readl(tcpm_base + PRCMU_FW_VERSION_OFFSET);
                        prcmu_version.project_number = version & 0xFF;
                        prcmu_version.api_version = (version >> 8) & 0xFF;