diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2011-06-07 17:02:12 +0530 |
|---|---|---|
| committer | said m bagheri <ebgheri@steludxu2848.(none)> | 2011-06-17 13:42:12 +0200 |
| commit | 56e6ab9ffeda13d510221e012001d61b74e14238 (patch) | |
| tree | 37531babd3c65f4274ffe8290c8d7f8c754a01fb | |
| parent | 729af29d23ea0106d22584d5ea4da30655eb271e (diff) | |
u5500: add SIA and HVA clocks and consumers
ST-Ericsson Linux next: -
ST-Ericsson ID: 332226
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I61365b80af69554f855da083fbe7a1bc5953c3a4
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24535
Reviewed-by: QATEST
Reviewed-by: Vijaya Kumar K-1 <vijay.kilari@stericsson.com>
Reviewed-by: Mattias NILSSON <mattias.i.nilsson@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-regulators.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/clock-db5500.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/prcmu.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/prcmu-db5500.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/prcmu-regs-db5500.h | 2 |
5 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-u5500-regulators.c b/arch/arm/mach-ux500/board-u5500-regulators.c index eff0f0d5d6e..dd28f2f0ffa 100644 --- a/arch/arm/mach-ux500/board-u5500-regulators.c +++ b/arch/arm/mach-ux500/board-u5500-regulators.c @@ -174,12 +174,12 @@ static struct regulator_consumer_supply u5500_sga_consumers[] = { static struct regulator_consumer_supply u5500_hva_consumers[] = { REGULATOR_SUPPLY("debug", "reg-virt-consumer.1"), - REGULATOR_SUPPLY("sva-pipe", "cm_control"), + REGULATOR_SUPPLY("v-hva", NULL), }; static struct regulator_consumer_supply u5500_sia_consumers[] = { REGULATOR_SUPPLY("debug", "reg-virt-consumer.2"), - REGULATOR_SUPPLY("sia-pipe", "cm_control"), + REGULATOR_SUPPLY("v-sia", "mmio_camera"), }; static struct regulator_consumer_supply u5500_disp_consumers[] = { diff --git a/arch/arm/mach-ux500/clock-db5500.c b/arch/arm/mach-ux500/clock-db5500.c index a6463ce707e..0d019a6f44c 100644 --- a/arch/arm/mach-ux500/clock-db5500.c +++ b/arch/arm/mach-ux500/clock-db5500.c @@ -425,6 +425,8 @@ static DEF_PRCMU_CLK(mcdeclk, PRCMU_MCDECLK, 160000000); static DEF_PRCMU_CLK(tvclk, PRCMU_TVCLK, 40000000); static DEF_PRCMU_CLK(dsialtclk, PRCMU_DSIALTCLK, 400000000); static DEF_PRCMU_CLK(timclk, PRCMU_TIMCLK, 3250000); +static DEF_PRCMU_CLK(svaclk, PRCMU_SVACLK, 156000000); +static DEF_PRCMU_CLK(siaclk, PRCMU_SIACLK, 133330000); /* PRCC PClocks */ @@ -564,6 +566,8 @@ static struct clk *db5500_dbg_clks[] __initdata = { /* PRCMU clocks */ &sgaclk, + &siaclk, + &svaclk, &uartclk, &msp02clk, &i2cclk, @@ -659,6 +663,8 @@ static struct clk_lookup u8500_v2_sysclks[] = { static struct clk_lookup db5500_prcmu_clocks[] = { CLK_LOOKUP(sgaclk, "mali", NULL), + CLK_LOOKUP(siaclk, "mmio_camera", "sia"), + CLK_LOOKUP(svaclk, "hva", NULL), CLK_LOOKUP(uartclk, "UART", NULL), CLK_LOOKUP(msp02clk, "MSP02", NULL), CLK_LOOKUP(i2cclk, "I2C", NULL), diff --git a/arch/arm/mach-ux500/include/mach/prcmu.h b/arch/arm/mach-ux500/include/mach/prcmu.h index 4e7c00a0b28..9d28ef9cbc0 100644 --- a/arch/arm/mach-ux500/include/mach/prcmu.h +++ b/arch/arm/mach-ux500/include/mach/prcmu.h @@ -144,6 +144,8 @@ enum prcmu_clock { PRCMU_PWMCLK, PRCMU_IRDACLK, PRCMU_IRRCCLK, + PRCMU_SIACLK, + PRCMU_SVACLK, PRCMU_NUM_REG_CLOCKS, PRCMU_SYSCLK = PRCMU_NUM_REG_CLOCKS, PRCMU_TIMCLK, diff --git a/arch/arm/mach-ux500/prcmu-db5500.c b/arch/arm/mach-ux500/prcmu-db5500.c index 9f49ebba08b..fc6814f9196 100644 --- a/arch/arm/mach-ux500/prcmu-db5500.c +++ b/arch/arm/mach-ux500/prcmu-db5500.c @@ -237,6 +237,8 @@ static struct clk_mgt clk_mgt[PRCMU_NUM_REG_CLOCKS] = { CLK_MGT_ENTRY(B2R2CLK), CLK_MGT_ENTRY(TVCLK), CLK_MGT_ENTRY(RNGCLK), + CLK_MGT_ENTRY(SIACLK), + CLK_MGT_ENTRY(SVACLK), }; static int request_timclk(bool enable) diff --git a/arch/arm/mach-ux500/prcmu-regs-db5500.h b/arch/arm/mach-ux500/prcmu-regs-db5500.h index 978259a4273..331609a918c 100644 --- a/arch/arm/mach-ux500/prcmu-regs-db5500.h +++ b/arch/arm/mach-ux500/prcmu-regs-db5500.h @@ -18,6 +18,8 @@ #define PRCM_SEM 0x400 #define PRCM_SEM_PRCM_SEM BIT(0) +#define DB5500_PRCM_SVACLK_MGT 0x008 +#define DB5500_PRCM_SIACLK_MGT 0x00C #define DB5500_PRCM_SGACLK_MGT 0x014 #define DB5500_PRCM_UARTCLK_MGT 0x018 #define DB5500_PRCM_MSP02CLK_MGT 0x01C |