diff mbox

[1/5] mfd : ux500 - Cleanup duplicate definitions

Message ID 1330465569-567-1-git-send-email-daniel.lezcano@linaro.org
State Accepted
Commit 801448e0672008acec050fbef3b8a7df7c5edcc1
Headers show

Commit Message

Daniel Lezcano Feb. 28, 2012, 9:46 p.m. UTC 
From: Daniel Lezcano <daniel.lezcano@linaro.org>

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>
---
 drivers/mfd/db8500-prcmu.c |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

Comments

Daniel Lezcano March 1, 2012, 11:34 a.m. UTC | #1 
On 03/01/2012 12:39 PM, Samuel Ortiz wrote:
> Hi Daniel,
>
> On Tue, Feb 28, 2012 at 10:46:05PM +0100, daniel.lezcano@linaro.org wrote:
>> From: Daniel Lezcano<daniel.lezcano@linaro.org>
>>
>> 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.
> This one and the 4 other patches applied. Thanks.

Thanks Samuel.

   -- Daniel
Samuel Ortiz March 1, 2012, 11:39 a.m. UTC | #2 
Hi Daniel,

On Tue, Feb 28, 2012 at 10:46:05PM +0100, daniel.lezcano@linaro.org wrote:
> From: Daniel Lezcano <daniel.lezcano@linaro.org>
> 
> 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.
This one and the 4 other patches applied. Thanks.

Cheers,
Samuel.
diff mbox

Patch

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index b320cc6..d2244dc 100644
--- 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;
 }