summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-10-20 11:14:11 +0530
committerRabin VINCENT <rabin.vincent@stericsson.com>2011-10-20 14:44:54 +0200
commit3f994fe199c5e8d63c2218daa8d29514c223d0bb (patch)
tree4f34587ef4ed7bd1f8f6256bfe4da66a40f85ef9 /arch
parenta913154d0fb9fe6788971c155f92b5ed9bc7fee8 (diff)
u5500: fix handling of IRDACLK and IRRCCLK
IRDACLK needs to be requested from the firmware. IRDACLK and IRRCCLK need to be parented to the SOC1 PLL. ST-Ericsson ID: 361212 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Id336deda4639729dd5b847c168e52c05393c1bfc Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34593 Reviewed-by: QATOOLS Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-ux500/clock-db5500.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/clock-db5500.c b/arch/arm/mach-ux500/clock-db5500.c
index 163c48d9f24..3fab70148a7 100644
--- a/arch/arm/mach-ux500/clock-db5500.c
+++ b/arch/arm/mach-ux500/clock-db5500.c
@@ -236,8 +236,8 @@ static DEF_PRCMU_CLK(msp02clk, PRCMU_MSP02CLK, 13000000);
static DEF_PRCMU_CLIENT_CLK(msp1clk, PRCMU_MSP1CLK, 26000000);
static DEF_PRCMU_CLIENT_CLK(cdclk, PRCMU_CDCLK, 26000000);
static DEF_PRCMU_CLK(i2cclk, PRCMU_I2CCLK, 24000000);
-static DEF_PRCMU_CLK(irdaclk, PRCMU_IRDACLK, 48000000);
-static DEF_PRCMU_CLK(irrcclk, PRCMU_IRRCCLK, 48000000);
+static DEF_PRCMU_CLK_PARENT(irdaclk, PRCMU_IRDACLK, 48000000, &soc1_pll);
+static DEF_PRCMU_CLK_PARENT(irrcclk, PRCMU_IRRCCLK, 48000000, &soc1_pll);
static DEF_PRCMU_CLK(rngclk, PRCMU_RNGCLK, 26000000);
static DEF_PRCMU_CLK(pwmclk, PRCMU_PWMCLK, 26000000);
static DEF_PRCMU_CLK(sdmmcclk, PRCMU_SDMMCCLK, 50000000);
@@ -640,8 +640,6 @@ static struct clk *db5500_clks_tobe_disabled[] __initdata = {
&p5_sdi3_clk,
&p5_sdi4_clk,
&p5_i2c3_clk,
- &p5_irrc_clk,
- &p5_irda_clk,
};
static int __init init_clock_states(void)