Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347763
b: refs/heads/master
c: 1fa49e4
h: refs/heads/master
i:
  347761: 7616f7e
  347759: dc506c0
v: v3
  • Loading branch information
Padmavathi Venna authored and Kukjin Kim committed Dec 19, 2012
1 parent c5586c8 commit 86302b5
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d690b313a6008215428d4bae303c9ecab593b508
refs/heads/master: 1fa49e46972d76b2e7d80410d95aff7ab59a3d23
16 changes: 0 additions & 16 deletions trunk/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 86302b5

Please sign in to comment.