diff options
| -rw-r--r-- | arch/arm/mach-ux500/clock-db5500.c | 6 | ||||
| -rw-r--r-- | drivers/mfd/db5500-prcmu.c | 2 |
2 files changed, 4 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) diff --git a/drivers/mfd/db5500-prcmu.c b/drivers/mfd/db5500-prcmu.c index aee5ac397f9..55560abe001 100644 --- a/drivers/mfd/db5500-prcmu.c +++ b/drivers/mfd/db5500-prcmu.c @@ -825,6 +825,8 @@ int db5500_prcmu_request_clock(u8 clock, bool enable) return request_clk(DB5500_MSP1CLK, enable); else if (clock == PRCMU_CDCLK) return request_clk(DB5500_CDCLK, enable); + else if (clock == PRCMU_IRDACLK) + return request_clk(DB5500_IRDACLK, enable); else if (clock < PRCMU_NUM_REG_CLOCKS) return request_reg_clock(clock, enable); else if (clock == PRCMU_TIMCLK) |