aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/pxa2xx-i2s.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index c796b1882776..21ca3fe22306 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -65,11 +65,6 @@ static struct pxa2xx_gpio gpio_bus[] = {
65 .frm = GPIO31_SYNC_I2S_MD, 65 .frm = GPIO31_SYNC_I2S_MD,
66 }, 66 },
67 { /* I2S SoC Master */ 67 { /* I2S SoC Master */
68#ifdef CONFIG_PXA27x
69 .sys = GPIO113_I2S_SYSCLK_MD,
70#else
71 .sys = GPIO32_SYSCLK_I2S_MD,
72#endif
73 .rx = GPIO29_SDATA_IN_I2S_MD, 68 .rx = GPIO29_SDATA_IN_I2S_MD,
74 .tx = GPIO30_SDATA_OUT_I2S_MD, 69 .tx = GPIO30_SDATA_OUT_I2S_MD,
75 .clk = GPIO28_BITCLK_OUT_I2S_MD, 70 .clk = GPIO28_BITCLK_OUT_I2S_MD,
@@ -343,6 +338,11 @@ static struct platform_driver pxa2xx_i2s_driver = {
343 338
344static int __init pxa2xx_i2s_init(void) 339static int __init pxa2xx_i2s_init(void)
345{ 340{
341 if (cpu_is_pxa27x())
342 gpio_bus[1].sys = GPIO113_I2S_SYSCLK_MD;
343 else
344 gpio_bus[1].sys = GPIO32_SYSCLK_I2S_MD;
345
346 clk_i2s = ERR_PTR(-ENOENT); 346 clk_i2s = ERR_PTR(-ENOENT);
347 return platform_driver_register(&pxa2xx_i2s_driver); 347 return platform_driver_register(&pxa2xx_i2s_driver);
348} 348}