mfd : Cleanup duplicate db8500 definitions

I missed in my previous patch the A9_MASK_REQ[_MASK] were
already defined. Let's remove the duplicate definitions.

The PRCMU_GIC_DELAY macro could be removed as it is not
really useful here.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index b320cc602668317b9b351c9def8935e9f9d6489a..d2244dc5d3b16d54eee188999ddc5e3974950b4a 100644 (file)
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -821,23 +821,20 @@ u8 db8500_prcmu_get_power_state_result(void)
        return readb(tcdm_base + PRCM_ACK_MB0_AP_PWRSTTR_STATUS);
 }
 
-#define PRCMU_A9_MASK_REQ               0x00000328
-#define PRCMU_A9_MASK_REQ_MASK          0x00000001
-#define PRCMU_GIC_DELAY                 1
-
 /* This function decouple the gic from the prcmu */
 int db8500_prcmu_gic_decouple(void)
 {
-       u32 val = readl(_PRCMU_BASE + PRCMU_A9_MASK_REQ);
+       u32 val = readl(PRCM_A9_MASK_REQ);
 
        /* Set bit 0 register value to 1 */
-       writel(val | PRCMU_A9_MASK_REQ_MASK, _PRCMU_BASE + PRCMU_A9_MASK_REQ);
+       writel(val | PRCM_A9_MASK_REQ_PRCM_A9_MASK_REQ,
+              PRCM_A9_MASK_REQ);
 
        /* Make sure the register is updated */
-       readl(_PRCMU_BASE + PRCMU_A9_MASK_REQ);
+       readl(PRCM_A9_MASK_REQ);
 
        /* Wait a few cycles for the gic mask completion */
-       udelay(PRCMU_GIC_DELAY);
+       udelay(1);
 
        return 0;
 }
@@ -845,10 +842,10 @@ int db8500_prcmu_gic_decouple(void)
 /* This function recouple the gic with the prcmu */
 int db8500_prcmu_gic_recouple(void)
 {
-       u32 val = readl(_PRCMU_BASE + PRCMU_A9_MASK_REQ);
+       u32 val = readl(PRCM_A9_MASK_REQ);
 
        /* Set bit 0 register value to 0 */
-       writel(val & ~PRCMU_A9_MASK_REQ_MASK, _PRCMU_BASE + PRCMU_A9_MASK_REQ);
+       writel(val & ~PRCM_A9_MASK_REQ_PRCM_A9_MASK_REQ, PRCM_A9_MASK_REQ);
 
        return 0;
 }