summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-06-28 18:18:36 +0530
committerRobert Marklund <robert.marklund@stericsson.com>2011-10-05 13:01:36 +0200
commit6f59148a2e42de7556d42d5dfb6d038abf50e2b7 (patch)
treec942362c1aed098e49ad79f1631ef265f27802aa
parentee52352376e121140b26f6dbe24351b8cf9c63c8 (diff)
u5500: handle SDMMC0 clock change on DB5500v2
On DB5500v2, SDMMC0 is parented to SPARE1CLK instead of SDMMCCLK. Also, correct the PRCM_IRDACLK_MGT register address which is wrong even for v1. ST-Ericsson Linux next: - ST-Ericsson ID: 349062 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I7b9fda3af42a5cdf4804e721cd8030344b2ea894 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25979 Reviewed-by: QATEST Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32441 Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--drivers/mfd/db5500-prcmu.c1
-rw-r--r--include/linux/mfd/dbx500-prcmu.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/db5500-prcmu.c b/drivers/mfd/db5500-prcmu.c
index 1f821a58910..901e84a8ef8 100644
--- a/drivers/mfd/db5500-prcmu.c
+++ b/drivers/mfd/db5500-prcmu.c
@@ -422,6 +422,7 @@ static struct clk_mgt clk_mgt[PRCMU_NUM_REG_CLOCKS] = {
CLK_MGT_ENTRY(MSP02CLK),
CLK_MGT_ENTRY(I2CCLK),
CLK_MGT_ENTRY(SDMMCCLK),
+ CLK_MGT_ENTRY(SPARE1CLK),
CLK_MGT_ENTRY(PER1CLK),
CLK_MGT_ENTRY(PER2CLK),
CLK_MGT_ENTRY(PER3CLK),
diff --git a/include/linux/mfd/dbx500-prcmu.h b/include/linux/mfd/dbx500-prcmu.h
index 98367ad7d2b..7e9e8d90f62 100644
--- a/include/linux/mfd/dbx500-prcmu.h
+++ b/include/linux/mfd/dbx500-prcmu.h
@@ -112,6 +112,7 @@ enum prcmu_clock {
PRCMU_MSP1CLK,
PRCMU_I2CCLK,
PRCMU_SDMMCCLK,
+ PRCMU_SPARE1CLK,
PRCMU_SLIMCLK,
PRCMU_PER1CLK,
PRCMU_PER2CLK,