Skip to content

Commit

Permalink
ARM: S5PV210: Avoid passing the clks through platform data
Browse files Browse the repository at this point in the history
I2S controller has an internal mux for RCLK source clks. The list
of source clk names were passed through platform data in non-dt case.
The variable holding the list of RCLK source clk names is not
required, as the list of clks need to be registered with clkdev
using generic connection id. This is required as part of adding DT
support for I2S controller driver.

Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Padmavathi Venna authored and Kukjin Kim committed Dec 19, 2012
1 parent d690b31 commit 1fa49e4
Showing 1 changed file with 0 additions and 16 deletions.
16 changes: 0 additions & 16 deletions arch/arm/mach-s5pv210/dev-audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
#include <mach/irqs.h>
#include <mach/regs-audss.h>

static const char *rclksrc[] = {
[0] = "busclk",
[1] = "i2sclk",
};

static int s5pv210_cfg_i2s(struct platform_device *pdev)
{
/* configure GPIO for i2s port */
Expand Down Expand Up @@ -52,7 +47,6 @@ static struct s3c_audio_pdata i2sv5_pdata = {
.i2s = {
.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
| QUIRK_NEED_RSTCLR,
.src_clk = rclksrc,
.idma_addr = S5PV210_AUDSS_INT_MEM,
},
},
Expand All @@ -75,18 +69,8 @@ struct platform_device s5pv210_device_iis0 = {
},
};

static const char *rclksrc_v3[] = {
[0] = "iis",
[1] = "audio-bus",
};

static struct s3c_audio_pdata i2sv3_pdata = {
.cfg_gpio = s5pv210_cfg_i2s,
.type = {
.i2s = {
.src_clk = rclksrc_v3,
},
},
};

static struct resource s5pv210_iis1_resource[] = {
Expand Down

0 comments on commit 1fa49e4

Please sign in to comment.