diff options
| author | Philippe Langlais <philippe.langlais@linaro.org> | 2012-01-16 09:29:42 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 10:59:25 +0200 |
| commit | d55f87c711aaffb4a9589c694d38d95f4e844cc9 (patch) | |
| tree | df7a26d855350f9cdacd987f22dfcadb1e2005bb | |
| parent | cd054b8c67e96e8a1427aef07e53525cc7c6cc3a (diff) | |
ASoC: clock: Move i2s into ASoC and remove old i2s-layer
The old multi-client i2s driver-layer located in drivers/misc/i2s
is removed and the MSP-operation for i2s is moved into the file
ux500_msp_i2s.c in the Ux500 ASoC-folder.
Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/clock-db5500.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/clock-db8500.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-ux500/clock-db5500.c b/arch/arm/mach-ux500/clock-db5500.c index 508af678387..9e84dc7c498 100644 --- a/arch/arm/mach-ux500/clock-db5500.c +++ b/arch/arm/mach-ux500/clock-db5500.c @@ -511,7 +511,7 @@ static struct clk_lookup db5500_prcmu_clocks[] = { CLK_LOOKUP(svaclk, "hva", NULL), CLK_LOOKUP(uartclk, "UART", NULL), CLK_LOOKUP(msp02clk, "MSP02", NULL), - CLK_LOOKUP(msp1clk, "MSP_I2S.1", NULL), + CLK_LOOKUP(msp1clk, "ux500-msp-i2s.1", NULL), CLK_LOOKUP(cdclk, "cable_detect.0", NULL), CLK_LOOKUP(i2cclk, "I2C", NULL), CLK_LOOKUP(sdmmcclk, "sdmmc", NULL), @@ -534,7 +534,7 @@ static struct clk_lookup db5500_prcmu_clocks[] = { }; static struct clk_lookup db5500_prcc_clocks[] = { - CLK_LOOKUP(p1_msp0_clk, "MSP_I2S.0", NULL), + CLK_LOOKUP(p1_msp0_clk, "ux500-msp-i2s.0", NULL), CLK_LOOKUP(p1_sdi0_clk, "sdi0", NULL), CLK_LOOKUP(p1_sdi2_clk, "sdi2", NULL), CLK_LOOKUP(p1_uart0_clk, "uart0", NULL), @@ -550,7 +550,7 @@ static struct clk_lookup db5500_prcc_clocks[] = { CLK_LOOKUP(p3_pwm_clk, "pwm", NULL), CLK_LOOKUP(p3_pclk2, "gpio.4", NULL), - CLK_LOOKUP(p5_msp2_clk, "MSP_I2S.2", NULL), + CLK_LOOKUP(p5_msp2_clk, "ux500-msp-i2s.2", NULL), CLK_LOOKUP(p5_uart1_clk, "uart1", NULL), CLK_LOOKUP(p5_uart2_clk, "uart2", NULL), CLK_LOOKUP(p5_uart3_clk, "uart3", NULL), diff --git a/arch/arm/mach-ux500/clock-db8500.c b/arch/arm/mach-ux500/clock-db8500.c index 8ed83504f32..3f42b454867 100644 --- a/arch/arm/mach-ux500/clock-db8500.c +++ b/arch/arm/mach-ux500/clock-db8500.c @@ -819,14 +819,14 @@ static struct clk_lookup u8500_clocks[] = { /* PERIPH 1 */ CLK_LOOKUP(p1_msp3_clk, "msp3", NULL), - CLK_LOOKUP(p1_msp3_clk, "MSP_I2S.3", NULL), + CLK_LOOKUP(p1_msp3_clk, "ux500-msp-i2s.3", NULL), CLK_LOOKUP(p1_msp3_kclk, "ab8500-codec.0", "msp3-kernel"), CLK_LOOKUP(p1_pclk11, "ab8500-codec.0", "msp3-bus"), CLK_LOOKUP(p1_uart0_clk, "uart0", NULL), CLK_LOOKUP(p1_uart1_clk, "uart1", NULL), CLK_LOOKUP(p1_i2c1_clk, "nmk-i2c.1", NULL), CLK_LOOKUP(p1_msp0_clk, "msp0", NULL), - CLK_LOOKUP(p1_msp0_clk, "MSP_I2S.0", NULL), + CLK_LOOKUP(p1_msp0_clk, "ux500-msp-i2s.0", NULL), CLK_LOOKUP(p1_sdi0_clk, "sdi0", NULL), CLK_LOOKUP(p1_i2c2_clk, "nmk-i2c.2", NULL), CLK_LOOKUP(p1_slimbus0_clk, "slimbus0", NULL), @@ -834,7 +834,7 @@ static struct clk_lookup u8500_clocks[] = { CLK_LOOKUP(p1_pclk9, "gpio.1", NULL), CLK_LOOKUP(p1_pclk9, "gpioblock0", NULL), CLK_LOOKUP(p1_msp1_clk, "msp1", NULL), - CLK_LOOKUP(p1_msp1_clk, "MSP_I2S.1", NULL), + CLK_LOOKUP(p1_msp1_clk, "ux500-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), @@ -847,7 +847,7 @@ static struct clk_lookup u8500_clocks[] = { CLK_LOOKUP(p2_pclk3, "pwl", NULL), CLK_LOOKUP(p2_sdi4_clk, "sdi4", NULL), CLK_LOOKUP(p2_msp2_clk, "msp2", NULL), - CLK_LOOKUP(p2_msp2_clk, "MSP_I2S.2", NULL), + CLK_LOOKUP(p2_msp2_clk, "ux500-msp-i2s.2", NULL), CLK_LOOKUP(p2_sdi1_clk, "sdi1", NULL), CLK_LOOKUP(p2_sdi3_clk, "sdi3", NULL), CLK_LOOKUP(p2_pclk8, "spi0", NULL), |