diff --git a/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-i2s.c b/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-i2s.c index 773230bd3..8853a735c 100644 --- a/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-i2s.c +++ b/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-i2s.c @@ -1,282 +1,552 @@ /* - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your + * Copyright (C) 2010, Lars-Peter Clausen + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your * option) any later version. * - * Jiejing Zhang(kzjeef(at)gmail.com) 2009: Make jz soc sound card - * loaded by soc-core. + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + * */ -#include +#include #include -#include +#include +#include +#include +#include +#include #include + #include #include #include -#include #include +#include +#include -#include -#include - -#include "jz4740-pcm.h" #include "jz4740-i2s.h" +#include "jz4740-pcm.h" -static int jz4740_i2s_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) +#define JZ_REG_AIC_CONF 0x00 +#define JZ_REG_AIC_CTRL 0x04 +#define JZ_REG_AIC_I2S_FMT 0x10 +#define JZ_REG_AIC_FIFO_STATUS 0x14 +#define JZ_REG_AIC_I2S_STATUS 0x1c +#define JZ_REG_AIC_CLK_DIV 0x30 +#define JZ_REG_AIC_FIFO 0x34 + +#define JZ_AIC_CONF_FIFO_RX_THRESHOLD_MASK (0xf << 12) +#define JZ_AIC_CONF_FIFO_TX_THRESHOLD_MASK (0xf << 8) +#define JZ_AIC_CONF_OVERFLOW_PLAY_LAST BIT(6) +#define JZ_AIC_CONF_INTERNAL_CODEC BIT(5) +#define JZ_AIC_CONF_I2S BIT(4) +#define JZ_AIC_CONF_RESET BIT(3) +#define JZ_AIC_CONF_BIT_CLK_MASTER BIT(2) +#define JZ_AIC_CONF_SYNC_CLK_MASTER BIT(1) +#define JZ_AIC_CONF_ENABLE BIT(0) + +#define JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET 12 +#define JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET 8 + +#define JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_MASK (0x7 << 19) +#define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK (0x7 << 16) +#define JZ_AIC_CTRL_ENABLE_RX_DMA BIT(15) +#define JZ_AIC_CTRL_ENABLE_TX_DMA BIT(14) +#define JZ_AIC_CTRL_MONO_TO_STEREO BIT(11) +#define JZ_AIC_CTRL_SWITCH_ENDIANNESS BIT(10) +#define JZ_AIC_CTRL_SIGNED_TO_UNSIGNED BIT(9) +#define JZ_AIC_CTRL_FLUSH BIT(8) +#define JZ_AIC_CTRL_ENABLE_ROR_INT BIT(6) +#define JZ_AIC_CTRL_ENABLE_TUR_INT BIT(5) +#define JZ_AIC_CTRL_ENABLE_RFS_INT BIT(4) +#define JZ_AIC_CTRL_ENABLE_TFS_INT BIT(3) +#define JZ_AIC_CTRL_ENABLE_LOOPBACK BIT(2) +#define JZ_AIC_CTRL_ENABLE_PLAYBACK BIT(1) +#define JZ_AIC_CTRL_ENABLE_CAPTURE BIT(0) + +#define JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_OFFSET 19 +#define JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_OFFSET 16 + +#define JZ_AIC_I2S_FMT_DISABLE_BIT_CLK BIT(12) +#define JZ_AIC_I2S_FMT_ENABLE_SYS_CLK BIT(4) +#define JZ_AIC_I2S_FMT_MSB BIT(0) + +#define JZ_AIC_I2S_STATUS_BUSY BIT(2) + +#define JZ_AIC_CLK_DIV_MASK 0xf + +struct jz4740_i2s { + struct resource *mem; + void __iomem *base; + dma_addr_t phys_base; + + struct clk *clk; + + struct jz4740_pcm_config pcm_config; +}; + +static struct jz4740_dma_config jz4740_i2s_dma_playback_config = { + .src_width = JZ4740_DMA_WIDTH_16BIT, + .dst_width = JZ4740_DMA_WIDTH_32BIT, + .transfer_size = JZ4740_DMA_TRANSFER_SIZE_16BYTE, + .request_type = JZ4740_DMA_TYPE_AIC_TRANSMIT, + .flags = JZ4740_DMA_SRC_AUTOINC, + .mode = JZ4740_DMA_MODE_SINGLE, +}; + +static struct jz4740_dma_config jz4740_i2s_dma_capture_config = { + .src_width = JZ4740_DMA_WIDTH_32BIT, + .dst_width = JZ4740_DMA_WIDTH_16BIT, + .transfer_size = JZ4740_DMA_TRANSFER_SIZE_16BYTE, + .request_type = JZ4740_DMA_TYPE_AIC_RECEIVE, + .flags = JZ4740_DMA_DST_AUTOINC, + .mode = JZ4740_DMA_MODE_SINGLE, +}; + + +static inline uint32_t jz4740_i2s_read(const struct jz4740_i2s *i2s, unsigned int reg) { - /*struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_cpu_dai *cpu_dai = rtd->dai->cpu_dai;*/ + return readl(i2s->base + reg); +} + +static inline void jz4740_i2s_write(const struct jz4740_i2s *i2s, unsigned +int reg, uint32_t value) +{ + writel(value, i2s->base + reg); +} + +static inline struct jz4740_i2s *jz4740_dai_to_i2s(struct snd_soc_dai *dai) +{ + return dai->private_data; +} + +static int jz4740_i2s_startup(struct snd_pcm_substream *substream, struct + snd_soc_dai *dai) +{ + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); + uint32_t conf, ctrl; + + if (dai->active) + return 0; + + conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF); + ctrl = jz4740_i2s_read(i2s, JZ_REG_AIC_CTRL); + + conf |= JZ_AIC_CONF_ENABLE; + ctrl |= JZ_AIC_CTRL_FLUSH; + + + jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL, ctrl); + clk_enable(i2s->clk); + jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf); return 0; } -static int jz4740_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai, - unsigned int fmt) +static void jz4740_i2s_shutdown(struct snd_pcm_substream *substream, struct + snd_soc_dai *dai) { - /* interface format */ + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); + uint32_t conf; + + if (dai->active) + return; + + conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF); + conf &= ~JZ_AIC_CONF_ENABLE; + jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf); + + clk_disable(i2s->clk); +} + + +static int jz4740_i2s_trigger(struct snd_pcm_substream *substream, int cmd, + struct snd_soc_dai *dai) +{ + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); + bool playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); + + uint32_t ctrl; + uint32_t mask; + + if (playback) { + mask = JZ_AIC_CTRL_ENABLE_PLAYBACK | + JZ_AIC_CTRL_ENABLE_TX_DMA; + } else { + mask = JZ_AIC_CTRL_ENABLE_CAPTURE | + JZ_AIC_CTRL_ENABLE_RX_DMA; + } + + ctrl = jz4740_i2s_read(i2s, JZ_REG_AIC_CTRL); + + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + case SNDRV_PCM_TRIGGER_RESUME: + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: + ctrl |= mask; + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + ctrl &= ~mask; + break; + default: + return -EINVAL; + } + + jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL,ctrl); + + return 0; +} + + +static int jz4740_i2s_set_fmt(struct snd_soc_dai *dai, + unsigned int fmt) +{ + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); + + uint32_t format = 0; + uint32_t conf; + + conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF); + + conf &= ~(JZ_AIC_CONF_BIT_CLK_MASTER | JZ_AIC_CONF_SYNC_CLK_MASTER); + + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { + case SND_SOC_DAIFMT_CBS_CFS: + conf |= JZ_AIC_CONF_BIT_CLK_MASTER | + JZ_AIC_CONF_SYNC_CLK_MASTER; + format |= JZ_AIC_I2S_FMT_ENABLE_SYS_CLK; + break; + case SND_SOC_DAIFMT_CBM_CFS: + conf |= JZ_AIC_CONF_SYNC_CLK_MASTER; + break; + case SND_SOC_DAIFMT_CBS_CFM: + conf |= JZ_AIC_CONF_BIT_CLK_MASTER; + break; + case SND_SOC_DAIFMT_CBM_CFM: + break; + default: + return -EINVAL; + } + switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { + case SND_SOC_DAIFMT_MSB: + format |= JZ_AIC_I2S_FMT_MSB; + break; case SND_SOC_DAIFMT_I2S: - /* 1 : ac97 , 0 : i2s */ - break; - case SND_SOC_DAIFMT_LEFT_J: + break; + default: + return -EINVAL; + } + + switch (fmt & SND_SOC_DAIFMT_INV_MASK) { + case SND_SOC_DAIFMT_NB_NF: + break; + default: + return -EINVAL; + } + + jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf); + jz4740_i2s_write(i2s, JZ_REG_AIC_I2S_FMT, format); + + return 0; +} + +static int jz4740_i2s_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params, + struct snd_soc_dai *dai) +{ + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); + bool playback = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); + int sample_size; + enum jz4740_dma_width dma_width; + uint32_t ctrl; + + ctrl = jz4740_i2s_read(i2s, JZ_REG_AIC_CTRL); + + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S8: + sample_size = 0; + dma_width = JZ4740_DMA_WIDTH_8BIT; + break; + case SNDRV_PCM_FORMAT_S16: + sample_size = 1; + dma_width = JZ4740_DMA_WIDTH_16BIT; break; default: return -EINVAL; } - switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { - case SND_SOC_DAIFMT_CBS_CFS: - /* 0 : slave */ - break; - case SND_SOC_DAIFMT_CBM_CFS: - /* 1 : master */ - break; - default: - break; - } - - return 0; -} - -/* -* Set Jz4740 Clock source -*/ -static int jz4740_i2s_set_dai_sysclk(struct snd_soc_dai *cpu_dai, - int clk_id, unsigned int freq, int dir) -{ - return 0; -} - -static void jz4740_snd_tx_ctrl(int on) -{ - if (on) { - /* enable replay */ - __i2s_enable_transmit_dma(); - __i2s_enable_replay(); - __i2s_enable(); - + if (playback) { + ctrl &= ~JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_MASK; + ctrl |= sample_size << JZ_AIC_CTRL_OUTPUT_SAMPLE_SIZE_OFFSET; } else { - /* disable replay & capture */ - __i2s_disable_replay(); - __i2s_disable_record(); - __i2s_disable_receive_dma(); - __i2s_disable_transmit_dma(); - __i2s_disable(); + ctrl &= ~JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_MASK; + ctrl |= sample_size << JZ_AIC_CTRL_INPUT_SAMPLE_SIZE_OFFSET; } + + switch (params_channels(params)) { + case 2: + break; + case 1: + if (playback) { + ctrl |= JZ_AIC_CTRL_MONO_TO_STEREO; + break; + } + default: + return -EINVAL; + } + + jz4740_i2s_write(i2s, JZ_REG_AIC_CTRL, ctrl); + + /* This is quite ugly, but apperently it's offical method for passing dma + * config to the pcm module */ + if (playback) { + jz4740_i2s_dma_playback_config.src_width = dma_width; + i2s->pcm_config.dma_config = &jz4740_i2s_dma_playback_config; + } else { + jz4740_i2s_dma_capture_config.dst_width = dma_width; + i2s->pcm_config.dma_config = &jz4740_i2s_dma_capture_config; + } + i2s->pcm_config.fifo_addr = i2s->phys_base + JZ_REG_AIC_FIFO; + + dai->dma_data = &i2s->pcm_config; + + return 0; } -static void jz4740_snd_rx_ctrl(int on) +static int jz4740_i2s_set_clkdiv(struct snd_soc_dai *dai, + int div_id, int div) { - if (on) { - /* enable capture */ - __i2s_enable_receive_dma(); - __i2s_enable_record(); - __i2s_enable(); + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); - } else { - /* disable replay & capture */ - __i2s_disable_replay(); - __i2s_disable_record(); - __i2s_disable_receive_dma(); - __i2s_disable_transmit_dma(); - __i2s_disable(); - } -} - -static int jz4740_i2s_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; - /* int channels = params_channels(params); */ - - jz4740_snd_rx_ctrl(0); - jz4740_snd_rx_ctrl(0); - - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S8: - __i2s_set_transmit_trigger(4); - __i2s_set_receive_trigger(3); - __i2s_set_oss_sample_size(8); - __i2s_set_iss_sample_size(8); - break; - case SNDRV_PCM_FORMAT_S16_LE: - /* playback sample:16 bits, burst:16 bytes */ - __i2s_set_transmit_trigger(4); - /* capture sample:16 bits, burst:16 bytes */ - __i2s_set_receive_trigger(3); - __i2s_set_oss_sample_size(16); - __i2s_set_iss_sample_size(16); + switch (div_id) { + case JZ4740_I2S_BIT_CLK: + if (div & 1 || div > 16) + return -EINVAL; + jz4740_i2s_write(i2s, JZ_REG_AIC_CLK_DIV, div - 1); break; + default: + return -EINVAL; } return 0; } -static int jz4740_i2s_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *dai) +static int jz4740_i2s_set_sysclk(struct snd_soc_dai *dai, int clk_id, + unsigned int freq, int dir) { + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); int ret = 0; - switch (cmd) { - case SNDRV_PCM_TRIGGER_START: - case SNDRV_PCM_TRIGGER_RESUME: - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) - jz4740_snd_rx_ctrl(1); - else - jz4740_snd_tx_ctrl(1); + struct clk *parent; + + switch (clk_id) { + case JZ4740_I2S_CLKSRC_EXT: + parent = clk_get(NULL, "ext"); + clk_set_parent(i2s->clk, parent); break; - case SNDRV_PCM_TRIGGER_STOP: - case SNDRV_PCM_TRIGGER_SUSPEND: - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) - jz4740_snd_rx_ctrl(0); - else - jz4740_snd_tx_ctrl(0); + case JZ4740_I2S_CLKSRC_PLL: + parent = clk_get(NULL, "pll half"); + clk_set_parent(i2s->clk, parent); + ret = clk_set_rate(i2s->clk, freq); break; default: - ret = -EINVAL; + return -EINVAL; } + clk_put(parent); return ret; } -static void jz4740_i2s_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) -{ - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - } else { - } - - return; -} - -static int jz4740_i2s_probe(struct platform_device *pdev, struct snd_soc_dai *dai) -{ - __i2s_internal_codec(); - __i2s_as_slave(); - __i2s_select_i2s(); - __aic_select_i2s(); - mdelay(2); - - __i2s_disable(); - __i2s_reset(); - mdelay(2); - - __i2s_disable(); - __i2s_internal_codec(); - __i2s_as_slave(); - __i2s_select_i2s(); - __aic_select_i2s(); - __i2s_set_oss_sample_size(16); - __i2s_set_iss_sample_size(16); - __aic_play_lastsample(); - - __i2s_disable_record(); - __i2s_disable_replay(); - __i2s_disable_loopback(); - __i2s_set_transmit_trigger(7); - __i2s_set_receive_trigger(7); - - jz4740_snd_tx_ctrl(0); - jz4740_snd_rx_ctrl(0); - - return 0; -} - -#ifdef CONFIG_PM static int jz4740_i2s_suspend(struct snd_soc_dai *dai) { + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); + uint32_t conf; + if (!dai->active) return 0; + conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF); + conf &= ~JZ_AIC_CONF_ENABLE; + jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf); + + clk_disable(i2s->clk); return 0; } static int jz4740_i2s_resume(struct snd_soc_dai *dai) { + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); + uint32_t conf; + if (!dai->active) return 0; + clk_enable(i2s->clk); + + conf = jz4740_i2s_read(i2s, JZ_REG_AIC_CONF); + conf |= JZ_AIC_CONF_ENABLE; + jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf); + return 0; } -#else -#define jz4740_i2s_suspend NULL -#define jz4740_i2s_resume NULL -#endif -#define JZ4740_I2S_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ - SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\ - SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\ - SNDRV_PCM_RATE_48000) +static int jz4740_i2s_probe(struct platform_device *pdev, struct snd_soc_dai *dai) +{ + struct jz4740_i2s *i2s = jz4740_dai_to_i2s(dai); + uint32_t conf; -struct snd_soc_dai_ops snd_jz4740_i2s_dai_ops = { + conf = (7 << JZ_AIC_CONF_FIFO_RX_THRESHOLD_OFFSET) | + (8 << JZ_AIC_CONF_FIFO_TX_THRESHOLD_OFFSET) | + JZ_AIC_CONF_OVERFLOW_PLAY_LAST | + JZ_AIC_CONF_I2S | + JZ_AIC_CONF_INTERNAL_CODEC; + + jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, JZ_AIC_CONF_RESET); + jz4740_i2s_write(i2s, JZ_REG_AIC_CONF, conf); + + return 0; +} + + +static struct snd_soc_dai_ops jz4740_i2s_dai_ops = { .startup = jz4740_i2s_startup, .shutdown = jz4740_i2s_shutdown, .trigger = jz4740_i2s_trigger, .hw_params = jz4740_i2s_hw_params, - .set_fmt = jz4740_i2s_set_dai_fmt, - .set_sysclk = jz4740_i2s_set_dai_sysclk, + .set_fmt = jz4740_i2s_set_fmt, + .set_clkdiv = jz4740_i2s_set_clkdiv, + .set_sysclk = jz4740_i2s_set_sysclk, }; +#define JZ4740_I2S_FMTS (SNDRV_PCM_FMTBIT_S8 | \ + SNDRV_PCM_FMTBIT_S16_LE) + struct snd_soc_dai jz4740_i2s_dai = { .name = "jz4740-i2s", - .id = 0, .probe = jz4740_i2s_probe, - .suspend = jz4740_i2s_suspend, - .resume = jz4740_i2s_resume, .playback = { .channels_min = 1, .channels_max = 2, - .rates = JZ4740_I2S_RATES, - .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_8000_44100, + .formats = JZ4740_I2S_FMTS, }, .capture = { - .channels_min = 1, + .channels_min = 2, .channels_max = 2, - .rates = JZ4740_I2S_RATES, - .formats = SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE, + .rates = SNDRV_PCM_RATE_8000_44100, + .formats = JZ4740_I2S_FMTS, }, - .ops = &snd_jz4740_i2s_dai_ops, + .symmetric_rates = 1, + .ops = &jz4740_i2s_dai_ops, + .suspend = jz4740_i2s_suspend, + .resume = jz4740_i2s_resume, }; -EXPORT_SYMBOL_GPL(jz4740_i2s_dai); +static int __devinit jz4740_i2s_dev_probe(struct platform_device *pdev) +{ + struct jz4740_i2s *i2s; + int ret; + + i2s = kzalloc(sizeof(*i2s), GFP_KERNEL); + + if (!i2s) + return -ENOMEM; + + i2s->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + if (!i2s->mem) { + ret = -ENOENT; + goto err_free; + } + + i2s->mem = request_mem_region(i2s->mem->start, resource_size(i2s->mem), + pdev->name); + + if (!i2s->mem) { + ret = -EBUSY; + goto err_free; + } + + i2s->base = ioremap_nocache(i2s->mem->start, resource_size(i2s->mem)); + + if (!i2s->base) { + ret = -EBUSY; + goto err_release_mem_region; + } + + i2s->phys_base = i2s->mem->start; + + jz4740_i2s_dai.private_data = i2s; + + ret = snd_soc_register_dai(&jz4740_i2s_dai); + + i2s->clk = clk_get(&pdev->dev, "i2s"); + + if (IS_ERR(i2s->clk)) { + ret = PTR_ERR(i2s->clk); + goto err_iounmap; + } + + platform_set_drvdata(pdev, i2s); + + return 0; + +err_iounmap: + iounmap(i2s->base); +err_release_mem_region: + release_mem_region(i2s->mem->start, resource_size(i2s->mem)); +err_free: + kfree(i2s); + + return ret; +} + +static int __devexit jz4740_i2s_dev_remove(struct platform_device *pdev) +{ + struct jz4740_i2s *i2s = platform_get_drvdata(pdev); + + snd_soc_unregister_dai(&jz4740_i2s_dai); + + clk_put(i2s->clk); + + iounmap(i2s->base); + release_mem_region(i2s->mem->start, resource_size(i2s->mem)); + + platform_set_drvdata(pdev, NULL); + kfree(i2s); + + return 0; +} + +static struct platform_driver jz4740_i2s_driver = { + .probe = jz4740_i2s_dev_probe, + .remove = __devexit_p(jz4740_i2s_dev_remove), + .driver = { + .name = "jz4740-i2s", + .owner = THIS_MODULE, + }, +}; static int __init jz4740_i2s_init(void) { - return snd_soc_register_dai(&jz4740_i2s_dai); + return platform_driver_register(&jz4740_i2s_driver); } +module_init(jz4740_i2s_init); static void __exit jz4740_i2s_exit(void) { - snd_soc_unregister_dai(&jz4740_i2s_dai); + platform_driver_unregister(&jz4740_i2s_driver); } - -module_init(jz4740_i2s_init); module_exit(jz4740_i2s_exit); -/* Module information */ -MODULE_AUTHOR("Richard, cjfeng@ingenic.cn, www.ingenic.cn"); -MODULE_DESCRIPTION("jz4740 I2S SoC Interface"); +MODULE_AUTHOR("Lars-Peter Clausen, "); +MODULE_DESCRIPTION("Ingenic JZ4740 SoC I2S driver"); MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:jz4740-i2s"); diff --git a/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-i2s.h b/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-i2s.h index 7c38f8d9f..da22ed88a 100644 --- a/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-i2s.h +++ b/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-i2s.h @@ -7,11 +7,11 @@ #ifndef _JZ4740_I2S_H #define _JZ4740_I2S_H -/* jz4740 DAI ID's */ -#define JZ4740_DAI_I2S 0 +/* I2S clock source */ +#define JZ4740_I2S_CLKSRC_EXT 0 +#define JZ4740_I2S_CLKSRC_PLL 1 -/* I2S clock */ -#define JZ4740_I2S_SYSCLK 0 +#define JZ4740_I2S_BIT_CLK 0 extern struct snd_soc_dai jz4740_i2s_dai; diff --git a/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-pcm.c b/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-pcm.c index bd754891c..fcad7c91a 100644 --- a/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-pcm.c +++ b/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-pcm.c @@ -24,7 +24,6 @@ #include #include -#include #include "jz4740-pcm.h" struct jz4740_runtime_data { @@ -32,25 +31,10 @@ struct jz4740_runtime_data { dma_addr_t dma_start; dma_addr_t dma_pos; dma_addr_t dma_end; + struct jz4740_dma_chan *dma; -}; -static struct jz4740_dma_config jz4740_pcm_dma_playback_config = { - .src_width = JZ4740_DMA_WIDTH_16BIT, - .dst_width = JZ4740_DMA_WIDTH_32BIT, - .transfer_size = JZ4740_DMA_TRANSFER_SIZE_16BYTE, - .request_type = JZ4740_DMA_TYPE_AIC_TRANSMIT, - .flags = JZ4740_DMA_SRC_AUTOINC, - .mode = JZ4740_DMA_MODE_SINGLE, -}; - -static struct jz4740_dma_config jz4740_pcm_dma_capture_config = { - .src_width = JZ4740_DMA_WIDTH_32BIT, - .dst_width = JZ4740_DMA_WIDTH_16BIT, - .transfer_size = JZ4740_DMA_TRANSFER_SIZE_16BYTE, - .request_type = JZ4740_DMA_TYPE_AIC_RECEIVE, - .flags = JZ4740_DMA_DST_AUTOINC, - .mode = JZ4740_DMA_MODE_SINGLE, + dma_addr_t fifo_addr; }; /* identify hardware playback capabilities */ @@ -85,9 +69,9 @@ static void jz4740_pcm_start_transfer(struct jz4740_runtime_data *prtd, int stre if (stream == SNDRV_PCM_STREAM_PLAYBACK) { jz4740_dma_set_src_addr(prtd->dma, prtd->dma_pos); - jz4740_dma_set_dst_addr(prtd->dma, CPHYSADDR(AIC_DR)); + jz4740_dma_set_dst_addr(prtd->dma, prtd->fifo_addr); } else { - jz4740_dma_set_src_addr(prtd->dma, CPHYSADDR(AIC_DR)); + jz4740_dma_set_src_addr(prtd->dma, prtd->fifo_addr); jz4740_dma_set_dst_addr(prtd->dma, prtd->dma_pos); } @@ -117,53 +101,31 @@ static int jz4740_pcm_hw_params(struct snd_pcm_substream *substream, { struct snd_pcm_runtime *runtime = substream->runtime; struct jz4740_runtime_data *prtd = runtime->private_data; - unsigned int size = params_buffer_bytes(params); - struct jz4740_dma_config *dma_config; - enum jz4740_dma_width width; - - switch (params_format(params)) { - case SNDRV_PCM_FORMAT_S8: - width = JZ4740_DMA_WIDTH_8BIT; - break; - case SNDRV_PCM_FORMAT_S16_LE: - width = JZ4740_DMA_WIDTH_16BIT; - break; - default: - BUG(); - break; - } + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct jz4740_pcm_config *config; + config = rtd->dai->cpu_dai->dma_data; if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { - dma_config = &jz4740_pcm_dma_playback_config; - dma_config->src_width = width; - prtd->dma = jz4740_dma_request(substream, "PCM Playback"); } else { - dma_config = &jz4740_pcm_dma_capture_config; - dma_config->dst_width = width; - prtd->dma = jz4740_dma_request(substream, "PCM Capture"); } if (!prtd->dma) return -EBUSY; - jz4740_dma_configure(prtd->dma, dma_config); - - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - jz4740_dma_set_dst_addr(prtd->dma, CPHYSADDR(AIC_DR)); - else - jz4740_dma_set_src_addr(prtd->dma, CPHYSADDR(AIC_DR)); + jz4740_dma_configure(prtd->dma, config->dma_config); + prtd->fifo_addr = config->fifo_addr; jz4740_dma_set_complete_cb(prtd->dma, jz4740_pcm_dma_transfer_done); snd_pcm_set_runtime_buffer(substream, &substream->dma_buffer); - runtime->dma_bytes = size; + runtime->dma_bytes = params_buffer_bytes(params); prtd->dma_period = params_period_bytes(params); prtd->dma_start = runtime->dma_addr; prtd->dma_pos = prtd->dma_start; - prtd->dma_end = prtd->dma_start + size; + prtd->dma_end = prtd->dma_start + runtime->dma_bytes; return 0; } @@ -271,7 +233,7 @@ static int jz4740_pcm_mmap(struct snd_pcm_substream *substream, vma->vm_end - vma->vm_start, vma->vm_page_prot); } -struct snd_pcm_ops jz4740_pcm_ops = { +static const struct snd_pcm_ops jz4740_pcm_ops = { .open = jz4740_pcm_open, .close = jz4740_pcm_close, .ioctl = snd_pcm_lib_ioctl, @@ -303,7 +265,7 @@ static int jz4740_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) return 0; } -static void jz4740_pcm_free_dma_buffers(struct snd_pcm *pcm) +static void jz4740_pcm_free(struct snd_pcm *pcm) { struct snd_pcm_substream *substream; struct snd_dma_buffer *buf; @@ -359,7 +321,7 @@ struct snd_soc_platform jz4740_soc_platform = { .name = "jz4740-pcm", .pcm_ops = &jz4740_pcm_ops, .pcm_new = jz4740_pcm_new, - .pcm_free = jz4740_pcm_free_dma_buffers, + .pcm_free = jz4740_pcm_free, }; EXPORT_SYMBOL_GPL(jz4740_soc_platform); diff --git a/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-pcm.h b/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-pcm.h index 7f5f6f094..2a1180081 100644 --- a/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-pcm.h +++ b/target/linux/xburst/files-2.6.31/sound/soc/jz4740/jz4740-pcm.h @@ -8,7 +8,15 @@ #ifndef _JZ4740_PCM_H #define _JZ4740_PCM_H +#include +#include + /* platform data */ extern struct snd_soc_platform jz4740_soc_platform; +struct jz4740_pcm_config { + struct jz4740_dma_config *dma_config; + phys_addr_t fifo_addr; +}; + #endif