From 3f994fe199c5e8d63c2218daa8d29514c223d0bb Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Thu, 20 Oct 2011 11:14:11 +0530 Subject: 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 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34593 Reviewed-by: QATOOLS Reviewed-by: Vijaya Kumar K-1 --- arch/arm/mach-ux500/clock-db5500.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'arch') 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) -- cgit v1.2.3