summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMattias Nilsson <mattias.i.nilsson@stericsson.com>2011-04-12 12:49:30 +0200
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 15:15:06 +0200
commit2594f0fe818672a629a93af25a7b703404ba6d0e (patch)
tree856a92490aa03495337e8458fcbfc8431a78ed9f /arch/arm
parent006b02032f159e955c7d8cf31ebde3e64feaa3e6 (diff)
arm: ux500: add ab8500-codec clocks
This patch exports the MSP1 and MSP3 bus and kernel clocks separately, which may be needed by the ab8500-codec driver. It also removes the "msp1" clock from the "boot clocks". ST Ericsson Linux next: - ST Ericsson ID: 328915 ST Ericsson FOSS-OUT ID: trivial change-id: If24378f861ed9fa598ff8e281090f17d5d7ec948 signed-off-by: Mattias Nilsson <mattias.i.nilsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20651
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ux500/clock-db8500.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/clock-db8500.c b/arch/arm/mach-ux500/clock-db8500.c
index 57db0226b3c..442b6f5c57b 100644
--- a/arch/arm/mach-ux500/clock-db8500.c
+++ b/arch/arm/mach-ux500/clock-db8500.c
@@ -1037,6 +1037,8 @@ static struct clk_lookup u8500_v1_v2_prcc_clocks[] = {
/* PERIPH 1 */
CLK_LOOKUP(p1_msp1_clk, "msp1", NULL),
CLK_LOOKUP(p1_msp1_clk, "MSP_I2S.1", NULL),
+ CLK_LOOKUP(p1_msp1_kclk, "ab8500-codec.0", "msp1-kernel"),
+ CLK_LOOKUP(p1_pclk4, "ab8500-codec.0", "msp1-bus"),
CLK_LOOKUP(p1_pclk7, "spi3", NULL),
CLK_LOOKUP(p1_i2c4_clk, "nmk-i2c.4", NULL),
@@ -1076,6 +1078,8 @@ static struct clk_lookup u8500_v2_prcc_clocks[] = {
/* PERIPH 1 */
CLK_LOOKUP(p1_msp3_clk, "msp3", NULL),
CLK_LOOKUP(p1_msp3_clk, "MSP_I2S.3", NULL),
+ CLK_LOOKUP(p1_msp3_kclk, "ab8500-codec.0", "msp3-kernel"),
+ CLK_LOOKUP(p1_pclk11, "ab8500-codec.0", "msp3-bus"),
/* PERIPH 6 */
CLK_LOOKUP(p6_pclk4, "hash1", NULL),
@@ -1103,7 +1107,6 @@ static const char *u8500_boot_clk[] = {
"spi2",
"spi3",
"msp0",
- "msp1",
"msp2",
"nmk-i2c.0",
"nmk-i2c.1",