ASoC: Blackfin and I2C updats
cover ASoC: Blackfin and I2C updats
The following changes since commit 44e2c3045f77c69d18ba4afda888a4cdec4a33fd:
Cliff Cai (1):
ALSA: ASoC codec: fix compiling error in ad1980 driver after ASoC API changed
are available in the git repository at:
git://opensource.wolfsonmicro.com/linux-2.6-asoc for-tiwai
Cliff Cai (10):
ASoC codec: SSM2602 audio codec driver
ASoC: Blackfin: SPORT peripheral interface driver
ASoC: Blackfin: DMA Driver for AC97 sound chip
ASoC: Blackfin: AC97 Blackfin CPU DAI driver
ASoC: Blackfin: DMA Driver for I2S sound chip
ASoC: Blackfin: I2S CPU DAI driver
ASoC: Blackfin: board driver for AD1980/1 audio codec
ASoC: Blackfin: board driver for SSM2602 sound chip
ASoC: Blackfin: add Blackfin arch ASoC Kconfig and Makefile
ASoC: Blackfin: Include Blackfin architecture support in build
Jean Delvare (4):
ASoC: Fix an error path in neo1973_wm8753
ASoC: Convert wm8753 to a new-style i2c driver
ASoC: Convert neo1973/lm4857 to a new-style i2c driver
ASoC: Convert wm8510 to a new-style i2c driver
sound/soc/Kconfig | 1 + sound/soc/Makefile | 2 +- sound/soc/at32/playpaq_wm8510.c | 1 + sound/soc/blackfin/Kconfig | 85 +++ sound/soc/blackfin/Makefile | 20 + sound/soc/blackfin/bf5xx-ac97-pcm.c | 429 +++++++++++++++ sound/soc/blackfin/bf5xx-ac97-pcm.h | 29 + sound/soc/blackfin/bf5xx-ac97.c | 407 ++++++++++++++ sound/soc/blackfin/bf5xx-ac97.h | 36 ++ sound/soc/blackfin/bf5xx-ad1980.c | 113 ++++ sound/soc/blackfin/bf5xx-i2s-pcm.c | 288 ++++++++++ sound/soc/blackfin/bf5xx-i2s-pcm.h | 29 + sound/soc/blackfin/bf5xx-i2s.c | 292 ++++++++++ sound/soc/blackfin/bf5xx-i2s.h | 14 + sound/soc/blackfin/bf5xx-sport.c | 1032 +++++++++++++++++++++++++++++++++++ sound/soc/blackfin/bf5xx-sport.h | 192 +++++++ sound/soc/blackfin/bf5xx-ssm2602.c | 186 +++++++ sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ssm2602.c | 776 ++++++++++++++++++++++++++ sound/soc/codecs/ssm2602.h | 130 +++++ sound/soc/codecs/wm8510.c | 110 ++-- sound/soc/codecs/wm8510.h | 1 + sound/soc/codecs/wm8753.c | 106 ++-- sound/soc/codecs/wm8753.h | 1 + sound/soc/s3c24xx/neo1973_wm8753.c | 113 +++-- 26 files changed, 4237 insertions(+), 162 deletions(-) create mode 100644 sound/soc/blackfin/Kconfig create mode 100644 sound/soc/blackfin/Makefile create mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.c create mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.h create mode 100644 sound/soc/blackfin/bf5xx-ac97.c create mode 100644 sound/soc/blackfin/bf5xx-ac97.h create mode 100644 sound/soc/blackfin/bf5xx-ad1980.c create mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.c create mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.h create mode 100644 sound/soc/blackfin/bf5xx-i2s.c create mode 100644 sound/soc/blackfin/bf5xx-i2s.h create mode 100644 sound/soc/blackfin/bf5xx-sport.c create mode 100644 sound/soc/blackfin/bf5xx-sport.h create mode 100644 sound/soc/blackfin/bf5xx-ssm2602.c create mode 100644 sound/soc/codecs/ssm2602.c create mode 100644 sound/soc/codecs/ssm2602.h
PATCH 1/14 ASoC: Fix an error path in neo1973_wm8753
From: Jean Delvare <[email protected]>
The error handling in neo1973_init is incorrect:
* If platform_device_add fails, we go on with the rest of the initialization instead of bailing out. Things will break when the module is removed (platform_device_unregister called on a device that wasn't registered.)
* If i2c_add_driver fails, we return an error so the module will not load, but we don't unregister neo1973_snd_device, so we are leaking resources.
Add the missing error handling.
--- sound/soc/s3c24xx/neo1973_wm8753.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
sound/soc/s3c24xx/neo1973_wm8753.c +6 -2
@@ -717,12 +717,16 @@ static int __init neo1973_init(void) neo1973_snd_devdata.dev = &neo1973_snd_device->dev; ret =platform_device_add (neo1973_snd_device); -if (ret) +if (ret) {platform_device_put (neo1973_snd_device); +return ret; + } ret =i2c_add_driver (&lm4857_i2c_driver); -if (ret !=0 ) +if (ret !=0 ) {printk (KERN_ERR "can't add i2c driver" ); +platform_device_unregister (neo1973_snd_device); + }return ret; }
Signature · 1 line
1.5.6.5
PATCH 2/14 ASoC: Convert wm8753 to a new-style i2c driver
From: Jean Delvare <[email protected]>
Convert the wm8753 codec driver to the new (standard) i2c device driver binding model.
--- sound/soc/codecs/wm8753.c | 106 ++++++++++++++++++------------------ sound/soc/codecs/wm8753.h | 1 + sound/soc/s3c24xx/neo1973_wm8753.c | 1 + 3 files changed, 55 insertions(+), 53 deletions(-)
sound/soc/codecs/wm8753.c +53 -53
@@ -1637,84 +1637,86 @@ static struct snd_soc_device *wm8753_socdev;* low = 0x1a * high = 0x1b */ -static unsigned short normal_i2c[] = {0 ,I2C_CLIENT_END }; -/* Magic definition of all other variables and things */ -I2C_CLIENT_INSMOD ; - -static struct i2c_driver wm8753_i2c_driver; -static struct i2c_client client_template; - -static int wm8753_codec_probe (struct i2c_adapter *adap,int addr,int kind) +static int wm8753_i2c_probe (struct i2c_client *i2c, +const struct i2c_device_id *id) {struct snd_soc_device *socdev = wm8753_socdev; -struct wm8753_setup_data *setup = socdev->codec_data;struct snd_soc_codec *codec = socdev->codec; -struct i2c_client *i2c;int ret; -if (addr != setup->i2c_address) -return -ENODEV ; - - client_template.adapter = adap; - client_template.addr = addr; - - i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (!i2c) -return -ENOMEM ; -i2c_set_clientdata (i2c, codec); codec->control_data = i2c; - ret =i2c_attach_client (i2c); -if (ret <0 ) { -pr_err ("failed to attach codec at addr %x\n" , addr); - goto err; - } - ret =wm8753_init (socdev); -if (ret <0 ) { +if (ret <0 )pr_err ("failed to initialise WM8753\n" ); - goto err; - } - -return ret; -err: -kfree (i2c);return ret; } -static int wm8753_i2c_detach (struct i2c_client *client) +static int wm8753_i2c_remove (struct i2c_client *client) {struct snd_soc_codec *codec =i2c_get_clientdata (client); -i2c_detach_client (client);kfree (codec->reg_cache); -kfree (client);return 0 ; } -static int wm8753_i2c_attach (struct i2c_adapter *adap) -{ -return i2c_probe (adap, &addr_data, wm8753_codec_probe); -} +static const struct i2c_device_id wm8753_i2c_id[] = { + {"wm8753" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, wm8753_i2c_id); -/* corgi i2c codec control layer */ static struct i2c_driver wm8753_i2c_driver = { .driver = { .name ="WM8753 I2C Codec" , .owner =THIS_MODULE , }, - .id =I2C_DRIVERID_WM8753 , - .attach_adapter = wm8753_i2c_attach, - .detach_client = wm8753_i2c_detach, - .command =NULL , + .probe = wm8753_i2c_probe, + .remove = wm8753_i2c_remove, + .id_table = wm8753_i2c_id, }; -static struct i2c_client client_template = { - .name ="WM8753" , - .driver = &wm8753_i2c_driver, -}; +static int wm8753_add_i2c_device (struct platform_device *pdev, +const struct wm8753_setup_data *setup) +{ +struct i2c_board_info info; +struct i2c_adapter *adapter; +struct i2c_client *client; +int ret; + + ret =i2c_add_driver (&wm8753_i2c_driver); +if (ret !=0 ) { +dev_err (&pdev->dev,"can't add i2c driver\n" ); +return ret; + } + +memset (&info,0 ,sizeof (struct i2c_board_info )); + info.addr = setup->i2c_address; +strlcpy (info.type,"wm8753" ,I2C_NAME_SIZE ); + + adapter =i2c_get_adapter (setup->i2c_bus); +if (!adapter) { +dev_err (&pdev->dev,"can't get i2c adapter %d\n" , + setup->i2c_bus); + goto err_driver; + } + + client =i2c_new_device (adapter, &info); +i2c_put_adapter (adapter); +if (!client) { +dev_err (&pdev->dev,"can't add i2c device at 0x%x\n" , + (unsigned int )info.addr); + goto err_driver; + } + +return 0 ; + +err_driver: +i2c_del_driver (&wm8753_i2c_driver); +return -ENODEV ; +}#endif static int wm8753_probe (struct platform_device *pdev)
@@ -1748,11 +1750,8 @@ static int wm8753_probe(struct platform_device *pdev)#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )if (setup->i2c_address) { - normal_i2c[0 ] = setup->i2c_address; codec->hw_write = (hw_write_t )i2c_master_send; - ret =i2c_add_driver (&wm8753_i2c_driver); -if (ret !=0 ) -printk (KERN_ERR "can't add i2c driver" ); + ret =wm8753_add_i2c_device (pdev, setup); }#else /* Add other interfaces here */
@@ -1796,6 +1795,7 @@ static int wm8753_remove(struct platform_device *pdev)snd_soc_free_pcms (socdev);snd_soc_dapm_free (socdev);#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE ) +i2c_unregister_device (codec->control_data);i2c_del_driver (&wm8753_i2c_driver);#endif kfree (codec->private_data);
sound/soc/codecs/wm8753.h +1 -0
@@ -79,6 +79,7 @@#define WM8753_ADCTL2 0x3fstruct wm8753_setup_data { +int i2c_bus;unsigned short i2c_address; };
sound/soc/s3c24xx/neo1973_wm8753.c +1 -0
@@ -586,6 +586,7 @@ static struct snd_soc_machine neo1973 = { };static struct wm8753_setup_data neo1973_wm8753_setup = { + .i2c_bus =0 , .i2c_address =0x1a , };
Signature · 1 line
1.5.6.5
PATCH 3/14 ASoC: Convert neo1973/lm4857 to a new-style i2c driver
From: Jean Delvare <[email protected]>
Convert the lm4857 driver in neo1973_wm8753 to the new (standard) i2c device driver binding model. I assumed that the LM4857 was always on the same I2C bus as the WM8753 codec.
--- sound/soc/s3c24xx/neo1973_wm8753.c | 110 +++++++++++++++++++----------------- 1 files changed, 58 insertions(+), 52 deletions(-)
sound/soc/s3c24xx/neo1973_wm8753.c +58 -52
@@ -597,54 +597,20 @@ static struct snd_soc_device neo1973_snd_devdata = { .codec_data = &neo1973_wm8753_setup, }; -static struct i2c_client client_template; - -static const unsigned short normal_i2c[] = {0x7C ,I2C_CLIENT_END }; - -/* Magic definition of all other variables and things */ -I2C_CLIENT_INSMOD ; - -static int lm4857_amp_probe (struct i2c_adapter *adap,int addr,int kind) +static int lm4857_i2c_probe (struct i2c_client *client, +const struct i2c_device_id *id) { -int ret; -DBG ("Entered %s\n" , __func__); - client_template.adapter = adap; - client_template.addr = addr; - - i2c =kmemdup (&client_template,sizeof (client_template),GFP_KERNEL ); -if (i2c ==NULL ) -return -ENOMEM ; - - ret =i2c_attach_client (i2c); -if (ret <0 ) { -printk (KERN_ERR "LM4857 failed to attach at addr %x\n" , addr); - goto exit_err; - } -lm4857_write_regs (); -return ret; - -exit_err: -kfree (i2c); -return ret; -} - -static int lm4857_i2c_detach (struct i2c_client *client) -{ -DBG ("Entered %s\n" , __func__); - -i2c_detach_client (client); -kfree (client);return 0 ; } -static int lm4857_i2c_attach (struct i2c_adapter *adap) +static int lm4857_i2c_remove (struct i2c_client *client) {DBG ("Entered %s\n" , __func__); -return i2c_probe (adap, &addr_data, lm4857_amp_probe); +return 0 ; }static u8 lm4857_state;
@@ -682,27 +648,67 @@ static void lm4857_shutdown(struct i2c_client *dev)lm4857_write_regs (); } -/* corgi i2c codec control layer */ +static const struct i2c_device_id lm4857_i2c_id[] = { + { "neo1973_lm4857", 0 } + { } +}; +static struct i2c_driver lm4857_i2c_driver = { .driver = { .name ="LM4857 I2C Amp" , .owner =THIS_MODULE , }, - .id =I2C_DRIVERID_LM4857 , .suspend = lm4857_suspend, .resume = lm4857_resume, .shutdown = lm4857_shutdown, - .attach_adapter = lm4857_i2c_attach, - .detach_client = lm4857_i2c_detach, - .command =NULL , -}; - -static struct i2c_client client_template = { - .name ="LM4857" , - .driver = &lm4857_i2c_driver, + .probe = lm4857_i2c_probe, + .remove = lm4857_i2c_remove, + .id_table = lm4857_i2c_id, };static struct platform_device *neo1973_snd_device; +static struct i2c_client *lm4857_client; + +static int __init neo1973_add_lm4857_device (struct platform_device *pdev, +int i2c_bus, +unsigned short i2c_address) +{ +struct i2c_board_info info; +struct i2c_adapter *adapter; +struct i2c_client *client; +int ret; + + ret =i2c_add_driver (&lm4857_i2c_driver); +if (ret !=0 ) { +dev_err (&pdev->dev,"can't add lm4857 driver\n" ); +return ret; + } + +memset (&info,0 ,sizeof (struct i2c_board_info )); + info.addr = i2c_address; +strlcpy (info.type,"neo1973_lm4857" ,I2C_NAME_SIZE ); + + adapter =i2c_get_adapter (i2c_bus); +if (!adapter) { +dev_err (&pdev->dev,"can't get i2c adapter %d\n" , i2c_bus); + goto err_driver; + } + + client =i2c_new_device (adapter, &info); +i2c_put_adapter (adapter); +if (!client) { +dev_err (&pdev->dev,"can't add lm4857 device at 0x%x\n" , + (unsigned int )info.addr); + goto err_driver; + } + + lm4857_client = client; +return 0 ; + +err_driver: +i2c_del_driver (&lm4857_i2c_driver); +return -ENODEV ; +}static int __init neo1973_init (void ) {
@@ -723,11 +729,10 @@ static int __init neo1973_init(void)return ret; } - ret =i2c_add_driver (&lm4857_i2c_driver); -if (ret !=0 ) { -printk (KERN_ERR "can't add i2c driver" ); + ret =neo1973_add_lm4857_device (neo1973_snd_device, + neo1973_wm8753_setup,0x7C ); +if (ret !=0 )platform_device_unregister (neo1973_snd_device); - }return ret; }
@@ -736,6 +741,7 @@ static void __exit neo1973_exit(void) {DBG ("Entered %s\n" , __func__); +i2c_unregister_device (lm4857_client);i2c_del_driver (&lm4857_i2c_driver);platform_device_unregister (neo1973_snd_device); }
Signature · 1 line
1.5.6.5
PATCH 4/14 ASoC: Convert wm8510 to a new-style i2c driver
From: Jean Delvare <[email protected]>
Convert the wm8510 codec driver to the new (standard) device driver binding model.
--- sound/soc/at32/playpaq_wm8510.c | 1 + sound/soc/codecs/wm8510.c | 110 +++++++++++++++++++-------------------- sound/soc/codecs/wm8510.h | 1 + 3 files changed, 55 insertions(+), 57 deletions(-)
sound/soc/at32/playpaq_wm8510.c +1 -0
@@ -377,6 +377,7 @@ static struct snd_soc_machine snd_soc_machine_playpaq = {static struct wm8510_setup_data playpaq_wm8510_setup = { + .i2c_bus =0 , .i2c_address =0x1a , };
sound/soc/codecs/wm8510.c +53 -57
158 lines not on this page · raw message
sound/soc/codecs/wm8510.h +1 -0
@@ -94,6 +94,7 @@#define WM8510_MCLKDIV_12 (7 << 5)struct wm8510_setup_data { +int i2c_bus;unsigned short i2c_address; };
Signature · 1 line
1.5.6.5
PATCH 5/14 ASoC codec: SSM2602 audio codec driver
From: Cliff Cai <[email protected]>
[Some checkpatch fixups done by Mark Brown.]
--- sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ssm2602.c | 776 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/ssm2602.h | 130 ++++++++ 4 files changed, 912 insertions(+), 0 deletions(-) create mode 100644 sound/soc/codecs/ssm2602.c create mode 100644 sound/soc/codecs/ssm2602.h
sound/soc/codecs/Kconfig +4 -0
@@ -4,6 +4,7 @@ config SND_SOC_ALL_CODECS select SPI select SPI_MASTER select SND_SOC_AK4535 + select SND_SOC_SSM2602 select SND_SOC_UDA1380 select SND_SOC_WM8510 select SND_SOC_WM8580
@@ -93,3 +94,6 @@ config SND_SOC_TLV320AIC26 config SND_SOC_TLV320AIC3X tristate depends on I2C + +config SND_SOC_SSM2602 + tristate
sound/soc/codecs/Makefile +2 -0
@@ -15,6 +15,7 @@ snd-soc-wm9713-objs := wm9713.o snd-soc-cs4270-objs := cs4270.o snd-soc-tlv320aic26-objs := tlv320aic26.o snd-soc-tlv320aic3x-objs := tlv320aic3x.o +snd-soc-ssm2602-objs := ssm2602.o obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o obj-$(CONFIG_SND_SOC_AD1980) += snd-soc-ad1980.o
@@ -33,3 +34,4 @@ obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o obj-$(CONFIG_SND_SOC_CS4270) += snd-soc-cs4270.o obj-$(CONFIG_SND_SOC_TLV320AIC26) += snd-soc-tlv320aic26.o obj-$(CONFIG_SND_SOC_TLV320AIC3X) += snd-soc-tlv320aic3x.o +obj-$(CONFIG_SND_SOC_SSM2602) += snd-soc-ssm2602.o
sound/soc/codecs/ssm2602.c new file +776 -0
776 lines not on this page · raw message
sound/soc/codecs/ssm2602.h new file +130 -0
130 lines not on this page · raw message
Signature · 1 line
1.5.6.5
PATCH 6/14 ASoC: Blackfin: SPORT peripheral interface driver
From: Cliff Cai <[email protected]>
SPORT is a serial port which can support serveral serial communication protocols. It can be used as I2C/PCM/AC97. For further information, please look up the HRM.
[Additional coding standards fixes by Mark Brown.]
--- sound/soc/blackfin/bf5xx-sport.c | 1032 ++++++++++++++++++++++++++++++++++++++ sound/soc/blackfin/bf5xx-sport.h | 192 +++++++ 2 files changed, 1224 insertions(+), 0 deletions(-) create mode 100644 sound/soc/blackfin/bf5xx-sport.c create mode 100644 sound/soc/blackfin/bf5xx-sport.h
sound/soc/blackfin/bf5xx-sport.c new file +1032 -0
@@ -0,0 +1,1032 @@ +/* +* File: bf5xx_sport.c +* Based on: +* Author: Roy Huang <[email protected]> +* +* Created: Tue Sep 21 10:52:42 CEST 2004 +* Description: +* Blackfin SPORT Driver +* +* Copyright 2004-2007 Analog Devices Inc. +* +* Bugs: Enter bugs at http://blackfin.uclinux.org/ +* +* 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. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see the file COPYING, or write +* to the Free Software Foundation, Inc., +* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/delay.h> +#include <linux/dma-mapping.h> +#include <linux/gpio.h> +#include <linux/bug.h> +#include <asm/portmux.h> +#include <asm/dma.h> +#include <asm/blackfin.h> +#include <asm/cacheflush.h> + +#include "bf5xx-sport.h" +/* delay between frame sync pulse and first data bit in multichannel mode */ +#define FRAME_DELAY (1<<12) + +struct sport_device *sport_handle; +EXPORT_SYMBOL (sport_handle); +/* note: multichannel is in units of 8 channels, +* tdm_count is # channels NOT / 8 ! */ +int sport_set_multichannel (struct sport_device *sport, +int tdm_count,u32 mask,int packed) +{ +pr_debug ("%s tdm_count=%d mask:0x%08x packed=%d\n" , __func__, + tdm_count, mask, packed); + +if ((sport->regs->tcr1 &TSPEN ) || (sport->regs->rcr1 &RSPEN )) +return -EBUSY ; + +if (tdm_count &0x7 ) +return -EINVAL ; + +if (tdm_count >32 ) +return -EINVAL ;/* Only support less than 32 channels now */ + +if (tdm_count) { + sport->regs->mcmc1 = ((tdm_count>>3 )-1 ) <<12 ; + sport->regs->mcmc2 =FRAME_DELAY |MCMEN | \ + (packed ? (MCDTXPE |MCDRXPE ) :0 ); + + sport->regs->mtcs0 = mask; + sport->regs->mrcs0 = mask; + sport->regs->mtcs1 =0 ; + sport->regs->mrcs1 =0 ; + sport->regs->mtcs2 =0 ; + sport->regs->mrcs2 =0 ; + sport->regs->mtcs3 =0 ; + sport->regs->mrcs3 =0 ; + }else { + sport->regs->mcmc1 =0 ; + sport->regs->mcmc2 =0 ; + + sport->regs->mtcs0 =0 ; + sport->regs->mrcs0 =0 ; + } + + sport->regs->mtcs1 =0 ; sport->regs->mtcs2 =0 ; sport->regs->mtcs3 =0 ; + sport->regs->mrcs1 =0 ; sport->regs->mrcs2 =0 ; sport->regs->mrcs3 =0 ; + +SSYNC (); + +return 0 ; +} +EXPORT_SYMBOL (sport_set_multichannel); + +int sport_config_rx (struct sport_device *sport,unsigned int rcr1, +unsigned int rcr2,unsigned int clkdiv,unsigned int fsdiv) +{ +if ((sport->regs->tcr1 &TSPEN ) || (sport->regs->rcr1 &RSPEN )) +return -EBUSY ; + + sport->regs->rcr1 = rcr1; + sport->regs->rcr2 = rcr2; + sport->regs->rclkdiv = clkdiv; + sport->regs->rfsdiv = fsdiv; + +SSYNC (); + +return 0 ; +} +EXPORT_SYMBOL (sport_config_rx); + +int sport_config_tx (struct sport_device *sport,unsigned int tcr1, +unsigned int tcr2,unsigned int clkdiv,unsigned int fsdiv) +{ +if ((sport->regs->tcr1 &TSPEN ) || (sport->regs->rcr1 &RSPEN )) +return -EBUSY ; + + sport->regs->tcr1 = tcr1; + sport->regs->tcr2 = tcr2; + sport->regs->tclkdiv = clkdiv; + sport->regs->tfsdiv = fsdiv; + +SSYNC (); + +return 0 ; +} +EXPORT_SYMBOL (sport_config_tx); + +static void setup_desc (struct dmasg *desc,void *buf,int fragcount, +size_t fragsize,unsigned int cfg, +unsigned int x_count,unsigned int ycount,size_t wdsize) +{ + +int i; + +for (i =0 ; i < fragcount; ++i) { + desc[i].next_desc_addr = (unsigned long )&(desc[i +1 ]); + desc[i].start_addr = (unsigned long )buf + i*fragsize; + desc[i].cfg = cfg; + desc[i].x_count = x_count; + desc[i].x_modify = wdsize; + desc[i].y_count = ycount; + desc[i].y_modify = wdsize; + } + +/* make circular */ + desc[fragcount-1 ].next_desc_addr = (unsigned long )desc; + +pr_debug ("setup desc: desc0=%p, next0=%lx, desc1=%p," +"next1=%lx\nx_count=%x,y_count=%x,addr=0x%lx,cfs=0x%x\n" , + &(desc[0 ]), desc[0 ].next_desc_addr, + &(desc[1 ]), desc[1 ].next_desc_addr, + desc[0 ].x_count, desc[0 ].y_count, + desc[0 ].start_addr, desc[0 ].cfg); +} + +static int sport_start (struct sport_device *sport) +{ +enable_dma (sport->dma_rx_chan); +enable_dma (sport->dma_tx_chan); + sport->regs->rcr1 |=RSPEN ; + sport->regs->tcr1 |=TSPEN ; +SSYNC (); + +return 0 ; +} + +static int sport_stop (struct sport_device *sport) +{ + sport->regs->tcr1 &= ~TSPEN ; + sport->regs->rcr1 &= ~RSPEN ; +SSYNC (); + +disable_dma (sport->dma_rx_chan); +disable_dma (sport->dma_tx_chan); +return 0 ; +} + +static inline int sport_hook_rx_dummy (struct sport_device *sport) +{ +struct dmasg *desc, temp_desc; +unsigned long flags; + +BUG_ON (sport->dummy_rx_desc ==NULL ); +BUG_ON (sport->curr_rx_desc == sport->dummy_rx_desc); + +/* Maybe the dummy buffer descriptor ring is damaged */ + sport->dummy_rx_desc->next_desc_addr = \ + (unsigned long )(sport->dummy_rx_desc+1 ); + +local_irq_save (flags); + desc = (struct dmasg *)get_dma_next_desc_ptr (sport->dma_rx_chan); +/* Copy the descriptor which will be damaged to backup */ + temp_desc = *desc; + desc->x_count =0xa ; + desc->y_count =0 ; + desc->next_desc_addr = (unsigned long )(sport->dummy_rx_desc); +local_irq_restore (flags); +/* Waiting for dummy buffer descriptor is already hooked*/ +while ((get_dma_curr_desc_ptr (sport->dma_rx_chan) - +sizeof (struct dmasg )) != + (unsigned long )sport->dummy_rx_desc) + ; + sport->curr_rx_desc = sport->dummy_rx_desc; +/* Restore the damaged descriptor */ + *desc = temp_desc; + +return 0 ; +} + +static inline int sport_rx_dma_start (struct sport_device *sport,int dummy) +{ +if (dummy) { + sport->dummy_rx_desc->next_desc_addr = \ + (unsigned long ) sport->dummy_rx_desc; + sport->curr_rx_desc = sport->dummy_rx_desc; + }else + sport->curr_rx_desc = sport->dma_rx_desc; + +set_dma_next_desc_addr (sport->dma_rx_chan, \ + (unsigned long )(sport->curr_rx_desc)); +set_dma_x_count (sport->dma_rx_chan,0 ); +set_dma_x_modify (sport->dma_rx_chan,0 ); +set_dma_config (sport->dma_rx_chan, (DMAFLOW_LARGE |NDSIZE_9 | \ +WDSIZE_32 |WNR )); +set_dma_curr_addr (sport->dma_rx_chan, sport->curr_rx_desc->start_addr); +SSYNC (); + +return 0 ; +} + +static inline int sport_tx_dma_start (struct sport_device *sport,int dummy) +{ +if (dummy) { + sport->dummy_tx_desc->next_desc_addr = \ + (unsigned long ) sport->dummy_tx_desc; + sport->curr_tx_desc = sport->dummy_tx_desc; + }else + sport->curr_tx_desc = sport->dma_tx_desc; + +set_dma_next_desc_addr (sport->dma_tx_chan, \ + (unsigned long )(sport->curr_tx_desc)); +set_dma_x_count (sport->dma_tx_chan,0 ); +set_dma_x_modify (sport->dma_tx_chan,0 ); +set_dma_config (sport->dma_tx_chan, + (DMAFLOW_LARGE |NDSIZE_9 |WDSIZE_32 )); +set_dma_curr_addr (sport->dma_tx_chan, sport->curr_tx_desc->start_addr); +SSYNC (); + +return 0 ; +} + +int sport_rx_start (struct sport_device *sport) +{ +unsigned long flags; +pr_debug ("%s enter\n" , __func__); +if (sport->rx_run) +return -EBUSY ; +if (sport->tx_run) { +/* tx is running, rx is not running */ +BUG_ON (sport->dma_rx_desc ==NULL ); +BUG_ON (sport->curr_rx_desc != sport->dummy_rx_desc); +local_irq_save (flags); +while ((get_dma_curr_desc_ptr (sport->dma_rx_chan) - +sizeof (struct dmasg )) != + (unsigned long )sport->dummy_rx_desc) + ; + sport->dummy_rx_desc->next_desc_addr = + (unsigned long )(sport->dma_rx_desc); +local_irq_restore (flags); + sport->curr_rx_desc = sport->dma_rx_desc; + }else { +sport_tx_dma_start (sport,1 ); +sport_rx_dma_start (sport,0 ); +sport_start (sport); + } + + sport->rx_run =1 ; + +return 0 ; +} +EXPORT_SYMBOL (sport_rx_start); + +int sport_rx_stop (struct sport_device *sport) +{ +pr_debug ("%s enter\n" , __func__); + +if (!sport->rx_run) +return 0 ; +if (sport->tx_run) { +/* TX dma is still running, hook the dummy buffer */ +sport_hook_rx_dummy (sport); + }else { +/* Both rx and tx dma will be stopped */ +sport_stop (sport); + sport->curr_rx_desc =NULL ; + sport->curr_tx_desc =NULL ; + } + + sport->rx_run =0 ; + +return 0 ; +} +EXPORT_SYMBOL (sport_rx_stop); + +static inline int sport_hook_tx_dummy (struct sport_device *sport) +{ +struct dmasg *desc, temp_desc; +unsigned long flags; + +BUG_ON (sport->dummy_tx_desc ==NULL ); +BUG_ON (sport->curr_tx_desc == sport->dummy_tx_desc); + + sport->dummy_tx_desc->next_desc_addr = \ + (unsigned long )(sport->dummy_tx_desc+1 ); + +/* Shorten the time on last normal descriptor */ +local_irq_save (flags); + desc = (struct dmasg *)get_dma_next_desc_ptr (sport->dma_tx_chan); +/* Store the descriptor which will be damaged */ + temp_desc = *desc; + desc->x_count =0xa ; + desc->y_count =0 ; + desc->next_desc_addr = (unsigned long )(sport->dummy_tx_desc); +local_irq_restore (flags); +/* Waiting for dummy buffer descriptor is already hooked*/ +while ((get_dma_curr_desc_ptr (sport->dma_tx_chan) - \ +sizeof (struct dmasg )) != \ + (unsigned long )sport->dummy_tx_desc) + ; + sport->curr_tx_desc = sport->dummy_tx_desc; +/* Restore the damaged descriptor */ + *desc = temp_desc; + +return 0 ; +} + +int sport_tx_start (struct sport_device *sport) +{ +unsigned flags; +pr_debug ("%s: tx_run:%d, rx_run:%d\n" , __func__, + sport->tx_run, sport->rx_run); +if (sport->tx_run) +return -EBUSY ; +if (sport->rx_run) { +BUG_ON (sport->dma_tx_desc ==NULL ); +BUG_ON (sport->curr_tx_desc != sport->dummy_tx_desc); +/* Hook the normal buffer descriptor */ +local_irq_save (flags); +while ((get_dma_curr_desc_ptr (sport->dma_tx_chan) - +sizeof (struct dmasg )) != + (unsigned long )sport->dummy_tx_desc) + ; + sport->dummy_tx_desc->next_desc_addr = + (unsigned long )(sport->dma_tx_desc); +local_irq_restore (flags); + sport->curr_tx_desc = sport->dma_tx_desc; + }else { + +sport_tx_dma_start (sport,0 ); +/* Let rx dma run the dummy buffer */ +sport_rx_dma_start (sport,1 ); +sport_start (sport); + } + sport->tx_run =1 ; +return 0 ; +} +EXPORT_SYMBOL (sport_tx_start); + +int sport_tx_stop (struct sport_device *sport) +{ +if (!sport->tx_run) +return 0 ; +if (sport->rx_run) { +/* RX is still running, hook the dummy buffer */ +sport_hook_tx_dummy (sport); + }else { +/* Both rx and tx dma stopped */ +sport_stop (sport); + sport->curr_rx_desc =NULL ; + sport->curr_tx_desc =NULL ; + } + + sport->tx_run =0 ; + +return 0 ; +} +EXPORT_SYMBOL (sport_tx_stop); + +static inline int compute_wdsize (size_t wdsize) +{ +switch (wdsize) { +case 1 : +return WDSIZE_8 ; +case 2 : +return WDSIZE_16 ; +case 4 : +default : +return WDSIZE_32 ; + } +} + +int sport_config_rx_dma (struct sport_device *sport,void *buf, +int fragcount,size_t fragsize) +{ +unsigned int x_count; +unsigned int y_count; +unsigned int cfg; +dma_addr_t addr; + +pr_debug ("%s buf:%p, frag:%d, fragsize:0x%lx\n" , __func__, \ + buf, fragcount, fragsize); + + x_count = fragsize / sport->wdsize; + y_count =0 ; + +/* for fragments larger than 64k words we use 2d dma, +* denote fragecount as two numbers' mutliply and both of them +* are less than 64k.*/ +if (x_count >=0x10000 ) { +int i, count = x_count; + +for (i =16 ; i >0 ; i--) { + x_count =1 << i; +if ((count & (x_count -1 )) ==0 ) { + y_count = count >> i; +if (y_count <0x10000 ) +break ; + } + } +if (i ==0 ) +return -EINVAL ; + } +pr_debug ("%s(x_count:0x%x, y_count:0x%x)\n" , __func__, + x_count, y_count); + +if (sport->dma_rx_desc) +dma_free_coherent (NULL , sport->rx_desc_bytes, + sport->dma_rx_desc,0 ); + +/* Allocate a new descritor ring as current one. */ + sport->dma_rx_desc =dma_alloc_coherent (NULL , \ + fragcount *sizeof (struct dmasg ), &addr,0 ); + sport->rx_desc_bytes = fragcount *sizeof (struct dmasg ); + +if (!sport->dma_rx_desc) { +pr_err ("Failed to allocate memory for rx desc\n" ); +return -ENOMEM ; + } + + sport->rx_buf = buf; + sport->rx_fragsize = fragsize; + sport->rx_frags = fragcount; + + cfg =0x7000 |DI_EN |compute_wdsize (sport->wdsize) |WNR | \ + (DESC_ELEMENT_COUNT <<8 );/* large descriptor mode */ + +if (y_count !=0 ) + cfg |=DMA2D ; + +setup_desc (sport->dma_rx_desc, buf, fragcount, fragsize, + cfg|DMAEN , x_count, y_count, sport->wdsize); + +return 0 ; +} +EXPORT_SYMBOL (sport_config_rx_dma); + +int sport_config_tx_dma (struct sport_device *sport,void *buf, \ +int fragcount,size_t fragsize) +{ +unsigned int x_count; +unsigned int y_count; +unsigned int cfg; +dma_addr_t addr; + +pr_debug ("%s buf:%p, fragcount:%d, fragsize:0x%lx\n" , + __func__, buf, fragcount, fragsize); + + x_count = fragsize/sport->wdsize; + y_count =0 ; + +/* for fragments larger than 64k words we use 2d dma, +* denote fragecount as two numbers' mutliply and both of them +* are less than 64k.*/ +if (x_count >=0x10000 ) { +int i, count = x_count; + +for (i =16 ; i >0 ; i--) { + x_count =1 << i; +if ((count & (x_count -1 )) ==0 ) { + y_count = count >> i; +if (y_count <0x10000 ) +break ; + } + } +if (i ==0 ) +return -EINVAL ; + } +pr_debug ("%s x_count:0x%x, y_count:0x%x\n" , __func__, + x_count, y_count); + + +if (sport->dma_tx_desc) { +dma_free_coherent (NULL , sport->tx_desc_bytes, \ + sport->dma_tx_desc,0 ); + } + + sport->dma_tx_desc =dma_alloc_coherent (NULL , \ + fragcount *sizeof (struct dmasg ), &addr,0 ); + sport->tx_desc_bytes = fragcount *sizeof (struct dmasg ); +if (!sport->dma_tx_desc) { +pr_err ("Failed to allocate memory for tx desc\n" ); +return -ENOMEM ; + } + + sport->tx_buf = buf; + sport->tx_fragsize = fragsize; + sport->tx_frags = fragcount; + cfg =0x7000 |DI_EN |compute_wdsize (sport->wdsize) | \ + (DESC_ELEMENT_COUNT <<8 );/* large descriptor mode */ + +if (y_count !=0 ) + cfg |=DMA2D ; + +setup_desc (sport->dma_tx_desc, buf, fragcount, fragsize, + cfg|DMAEN , x_count, y_count, sport->wdsize); + +return 0 ; +} +EXPORT_SYMBOL (sport_config_tx_dma); + +/* setup dummy dma descriptor ring, which don't generate interrupts, +* the x_modify is set to 0 */ +static int sport_config_rx_dummy (struct sport_device *sport) +{ +struct dmasg *desc; +unsigned config; + +pr_debug ("%s entered\n" , __func__); +#if L1_DATA_A_LENGTH !=0 + desc = (struct dmasg *)l1_data_sram_alloc (2 *sizeof (*desc)); +#else + { +dma_addr_t addr; + desc =dma_alloc_coherent (NULL ,2 *sizeof (*desc), &addr,0 ); + } +#endif +if (desc ==NULL ) { +pr_err ("Failed to allocate memory for dummy rx desc\n" ); +return -ENOMEM ; + } +memset (desc,0 ,2 *sizeof (*desc)); + sport->dummy_rx_desc = desc; + desc->start_addr = (unsigned long )sport->dummy_buf; + config =DMAFLOW_LARGE |NDSIZE_9 |compute_wdsize (sport->wdsize) + |WNR |DMAEN ; + desc->cfg = config; + desc->x_count = sport->dummy_count/sport->wdsize; + desc->x_modify = sport->wdsize; + desc->y_count =0 ; + desc->y_modify =0 ; +memcpy (desc+1 , desc,sizeof (*desc)); + desc->next_desc_addr = (unsigned long )(desc+1 ); + desc[1 ].next_desc_addr = (unsigned long )desc; +return 0 ; +} + +static int sport_config_tx_dummy (struct sport_device *sport) +{ +struct dmasg *desc; +unsigned int config; + +pr_debug ("%s entered\n" , __func__); + +#if L1_DATA_A_LENGTH !=0 + desc = (struct dmasg *)l1_data_sram_alloc (2 *sizeof (*desc)); +#else + { +dma_addr_t addr; + desc =dma_alloc_coherent (NULL ,2 *sizeof (*desc), &addr,0 ); + } +#endif +if (!desc) { +pr_err ("Failed to allocate memory for dummy tx desc\n" ); +return -ENOMEM ; + } +memset (desc,0 ,2 *sizeof (*desc)); + sport->dummy_tx_desc = desc; + desc->start_addr = (unsigned long )sport->dummy_buf + \ + sport->dummy_count; + config =DMAFLOW_LARGE |NDSIZE_9 | +compute_wdsize (sport->wdsize) |DMAEN ; + desc->cfg = config; + desc->x_count = sport->dummy_count/sport->wdsize; + desc->x_modify = sport->wdsize; + desc->y_count =0 ; + desc->y_modify =0 ; +memcpy (desc+1 , desc,sizeof (*desc)); + desc->next_desc_addr = (unsigned long )(desc+1 ); + desc[1 ].next_desc_addr = (unsigned long )desc; +return 0 ; +} + +unsigned long sport_curr_offset_rx (struct sport_device *sport) +{ +unsigned long curr =get_dma_curr_addr (sport->dma_rx_chan); + +return (unsigned char *)curr - sport->rx_buf; +} +EXPORT_SYMBOL (sport_curr_offset_rx); + +unsigned long sport_curr_offset_tx (struct sport_device *sport) +{ +unsigned long curr =get_dma_curr_addr (sport->dma_tx_chan); + +return (unsigned char *)curr - sport->tx_buf; +} +EXPORT_SYMBOL (sport_curr_offset_tx); + +void sport_incfrag (struct sport_device *sport,int *frag,int tx) +{ + ++(*frag); +if (tx ==1 && *frag == sport->tx_frags) + *frag =0 ; + +if (tx ==0 && *frag == sport->rx_frags) + *frag =0 ; +} +EXPORT_SYMBOL (sport_incfrag); + +void sport_decfrag (struct sport_device *sport,int *frag,int tx) +{ + --(*frag); +if (tx ==1 && *frag ==0 ) + *frag = sport->tx_frags; + +if (tx ==0 && *frag ==0 ) + *frag = sport->rx_frags; +} +EXPORT_SYMBOL (sport_decfrag); + +static int sport_check_status (struct sport_device *sport, +unsigned int *sport_stat, +unsigned int *rx_stat, +unsigned int *tx_stat) +{ +int status =0 ; + +if (sport_stat) { +SSYNC (); + status = sport->regs->stat; +if (status & (TOVF |TUVF |ROVF |RUVF )) + sport->regs->stat = (status & (TOVF |TUVF |ROVF |RUVF )); +SSYNC (); + *sport_stat = status; + } + +if (rx_stat) { +SSYNC (); + status =get_dma_curr_irqstat (sport->dma_rx_chan); +if (status & (DMA_DONE |DMA_ERR )) +clear_dma_irqstat (sport->dma_rx_chan); +SSYNC (); + *rx_stat = status; + } + +if (tx_stat) { +SSYNC (); + status =get_dma_curr_irqstat (sport->dma_tx_chan); +if (status & (DMA_DONE |DMA_ERR )) +clear_dma_irqstat (sport->dma_tx_chan); +SSYNC (); + *tx_stat = status; + } + +return 0 ; +} + +int sport_dump_stat (struct sport_device *sport,char *buf,size_t len) +{ +int ret; + + ret =snprintf (buf, len, +"sts: 0x%04x\n" +"rx dma %d sts: 0x%04x tx dma %d sts: 0x%04x\n" , + sport->regs->stat, + sport->dma_rx_chan, +get_dma_curr_irqstat (sport->dma_rx_chan), + sport->dma_tx_chan, +get_dma_curr_irqstat (sport->dma_tx_chan)); + buf += ret; + len -= ret; + + ret +=snprintf (buf, len, +"curr_rx_desc:0x%p, curr_tx_desc:0x%p\n" +"dma_rx_desc:0x%p, dma_tx_desc:0x%p\n" +"dummy_rx_desc:0x%p, dummy_tx_desc:0x%p\n" , + sport->curr_rx_desc, sport->curr_tx_desc, + sport->dma_rx_desc, sport->dma_tx_desc, + sport->dummy_rx_desc, sport->dummy_tx_desc); + +return ret; +} + +static irqreturn_t rx_handler (int irq,void *dev_id) +{ +unsigned int rx_stat; +struct sport_device *sport = dev_id; + +pr_debug ("%s enter\n" , __func__); +sport_check_status (sport,NULL , &rx_stat,NULL ); +if (!(rx_stat &DMA_DONE )) +pr_err ("rx dma is already stopped\n" ); + +if (sport->rx_callback) { + sport->rx_callback (sport->rx_data); +return IRQ_HANDLED ; + } + +return IRQ_NONE ; +} + +static irqreturn_t tx_handler (int irq,void *dev_id) +{ +unsigned int tx_stat; +struct sport_device *sport = dev_id; +pr_debug ("%s enter\n" , __func__); +sport_check_status (sport,NULL ,NULL , &tx_stat); +if (!(tx_stat &DMA_DONE )) { +pr_err ("tx dma is already stopped\n" ); +return IRQ_HANDLED ; + } +if (sport->tx_callback) { + sport->tx_callback (sport->tx_data); +return IRQ_HANDLED ; + } + +return IRQ_NONE ; +} + +static irqreturn_t err_handler (int irq,void *dev_id) +{ +unsigned int status =0 ; +struct sport_device *sport = dev_id; + +pr_debug ("%s\n" , __func__); +if (sport_check_status (sport, &status,NULL ,NULL )) { +pr_err ("error checking status ??" ); +return IRQ_NONE ; + } + +if (status & (TOVF |TUVF |ROVF |RUVF )) { +pr_info ("sport status error:%s%s%s%s\n" , + status &TOVF ?" TOVF" :"" , + status &TUVF ?" TUVF" :"" , + status &ROVF ?" ROVF" :"" , + status &RUVF ?" RUVF" :"" ); +if (status &TOVF || status &TUVF ) { +disable_dma (sport->dma_tx_chan); +if (sport->tx_run) +sport_tx_dma_start (sport,0 ); +else +sport_tx_dma_start (sport,1 ); +enable_dma (sport->dma_tx_chan); + }else { +disable_dma (sport->dma_rx_chan); +if (sport->rx_run) +sport_rx_dma_start (sport,0 ); +else +sport_rx_dma_start (sport,1 ); +enable_dma (sport->dma_rx_chan); + } + } + status = sport->regs->stat; +if (status & (TOVF |TUVF |ROVF |RUVF )) + sport->regs->stat = (status & (TOVF |TUVF |ROVF |RUVF )); +SSYNC (); + +if (sport->err_callback) + sport->err_callback (sport->err_data); + +return IRQ_HANDLED ; +} + +int sport_set_rx_callback (struct sport_device *sport, +void (*rx_callback)(void *),void *rx_data) +{ +BUG_ON (rx_callback ==NULL ); + sport->rx_callback = rx_callback; + sport->rx_data = rx_data; + +return 0 ; +} +EXPORT_SYMBOL (sport_set_rx_callback); + +int sport_set_tx_callback (struct sport_device *sport, +void (*tx_callback)(void *),void *tx_data) +{ +BUG_ON (tx_callback ==NULL ); + sport->tx_callback = tx_callback; + sport->tx_data = tx_data; + +return 0 ; +} +EXPORT_SYMBOL (sport_set_tx_callback); + +int sport_set_err_callback (struct sport_device *sport, +void (*err_callback)(void *),void *err_data) +{ +BUG_ON (err_callback ==NULL ); + sport->err_callback = err_callback; + sport->err_data = err_data; + +return 0 ; +} +EXPORT_SYMBOL (sport_set_err_callback); + +struct sport_device *sport_init (struct sport_param *param,unsigned wdsize, +unsigned dummy_count,void *private_data) +{ +int ret; +struct sport_device *sport; +pr_debug ("%s enter\n" , __func__); +BUG_ON (param ==NULL ); +BUG_ON (wdsize ==0 || dummy_count ==0 ); + sport =kmalloc (sizeof (struct sport_device ),GFP_KERNEL ); +if (!sport) { +pr_err ("Failed to allocate for sport device\n" ); +return NULL ; + } + +memset (sport,0 ,sizeof (struct sport_device )); + sport->dma_rx_chan = param->dma_rx_chan; + sport->dma_tx_chan = param->dma_tx_chan; + sport->err_irq = param->err_irq; + sport->regs = param->regs; + sport->private_data = private_data; + +if (request_dma (sport->dma_rx_chan,"SPORT RX Data" ) == -EBUSY ) { +pr_err ("Failed to request RX dma %d\n" , \ + sport->dma_rx_chan); + goto __init_err1; + } +if (set_dma_callback (sport->dma_rx_chan, rx_handler, sport) !=0 ) { +pr_err ("Failed to request RX irq %d\n" , \ + sport->dma_rx_chan); + goto __init_err2; + } + +if (request_dma (sport->dma_tx_chan,"SPORT TX Data" ) == -EBUSY ) { +pr_err ("Failed to request TX dma %d\n" , \ + sport->dma_tx_chan); + goto __init_err2; + } + +if (set_dma_callback (sport->dma_tx_chan, tx_handler, sport) !=0 ) { +pr_err ("Failed to request TX irq %d\n" , \ + sport->dma_tx_chan); + goto __init_err3; + } + +if (request_irq (sport->err_irq, err_handler,IRQF_SHARED ,"SPORT err" , + sport) <0 ) { +pr_err ("Failed to request err irq:%d\n" , \ + sport->err_irq); + goto __init_err3; + } + +pr_err ("dma rx:%d tx:%d, err irq:%d, regs:%p\n" , + sport->dma_rx_chan, sport->dma_tx_chan, + sport->err_irq, sport->regs); + + sport->wdsize = wdsize; + sport->dummy_count = dummy_count; + +#if L1_DATA_A_LENGTH !=0 + sport->dummy_buf =l1_data_sram_alloc (dummy_count *2 ); +#else + sport->dummy_buf =kmalloc (dummy_count *2 ,GFP_KERNEL ); +#endif +if (sport->dummy_buf ==NULL ) { +pr_err ("Failed to allocate dummy buffer\n" ); + goto __error; + } + +memset (sport->dummy_buf,0 , dummy_count *2 ); + ret =sport_config_rx_dummy (sport); +if (ret) { +pr_err ("Failed to config rx dummy ring\n" ); + goto __error; + } + ret =sport_config_tx_dummy (sport); +if (ret) { +pr_err ("Failed to config tx dummy ring\n" ); + goto __error; + } + +return sport; +__error: +free_irq (sport->err_irq, sport); +__init_err3: +free_dma (sport->dma_tx_chan); +__init_err2: +free_dma (sport->dma_rx_chan); +__init_err1: +kfree (sport); +return NULL ; +} +EXPORT_SYMBOL (sport_init); + +void sport_done (struct sport_device *sport) +{ +if (sport ==NULL ) +return ; + +sport_stop (sport); +if (sport->dma_rx_desc) +dma_free_coherent (NULL , sport->rx_desc_bytes, + sport->dma_rx_desc,0 ); +if (sport->dma_tx_desc) +dma_free_coherent (NULL , sport->tx_desc_bytes, + sport->dma_tx_desc,0 ); + +#if L1_DATA_A_LENGTH !=0 +l1_data_sram_free (sport->dummy_rx_desc); +l1_data_sram_free (sport->dummy_tx_desc); +l1_data_sram_free (sport->dummy_buf); +#else +dma_free_coherent (NULL ,2 *sizeof (struct dmasg ), + sport->dummy_rx_desc,0 ); +dma_free_coherent (NULL ,2 *sizeof (struct dmasg ), + sport->dummy_tx_desc,0 ); +kfree (sport->dummy_buf); +#endif +free_dma (sport->dma_rx_chan); +free_dma (sport->dma_tx_chan); +free_irq (sport->err_irq, sport); + +kfree (sport); + sport =NULL ; +} +EXPORT_SYMBOL (sport_done); +/* +* It is only used to send several bytes when dma is not enabled +* sport controller is configured but not enabled. +* Multichannel cannot works with pio mode */ +/* Used by ac97 to write and read codec register */ +int sport_send_and_recv (struct sport_device *sport,u8 *out_data, \ +u8 *in_data,int len) +{ +unsigned short dma_config; +unsigned short status; +unsigned long flags; +unsigned long wait =0 ; + +pr_debug ("%s enter, out_data:%p, in_data:%p len:%d\n" , \ + __func__, out_data, in_data, len); +pr_debug ("tcr1:0x%04x, tcr2:0x%04x, tclkdiv:0x%04x, tfsdiv:0x%04x\n" +"mcmc1:0x%04x, mcmc2:0x%04x\n" , + sport->regs->tcr1, sport->regs->tcr2, + sport->regs->tclkdiv, sport->regs->tfsdiv, + sport->regs->mcmc1, sport->regs->mcmc2); +flush_dcache_range ((unsigned )out_data, (unsigned )(out_data + len)); + +/* Enable tx dma */ + dma_config = (RESTART |WDSIZE_16 |DI_EN ); +set_dma_start_addr (sport->dma_tx_chan, (unsigned long )out_data); +set_dma_x_count (sport->dma_tx_chan, len/2 ); +set_dma_x_modify (sport->dma_tx_chan,2 ); +set_dma_config (sport->dma_tx_chan, dma_config); +enable_dma (sport->dma_tx_chan); + +if (in_data !=NULL ) { +invalidate_dcache_range ((unsigned )in_data, \ + (unsigned )(in_data + len)); +/* Enable rx dma */ + dma_config = (RESTART |WDSIZE_16 |WNR |DI_EN ); +set_dma_start_addr (sport->dma_rx_chan, (unsigned long )in_data); +set_dma_x_count (sport->dma_rx_chan, len/2 ); +set_dma_x_modify (sport->dma_rx_chan,2 ); +set_dma_config (sport->dma_rx_chan, dma_config); +enable_dma (sport->dma_rx_chan); + } + +local_irq_save (flags); + sport->regs->tcr1 |=TSPEN ; + sport->regs->rcr1 |=RSPEN ; +SSYNC (); + + status =get_dma_curr_irqstat (sport->dma_tx_chan); +while (status &DMA_RUN ) { +udelay (1 ); + status =get_dma_curr_irqstat (sport->dma_tx_chan); +pr_debug ("DMA status:0x%04x\n" , status); +if (wait++ >100 ) + goto __over; + } + status = sport->regs->stat; + wait =0 ; + +while (!(status &TXHRE )) { +pr_debug ("sport status:0x%04x\n" , status); +udelay (1 ); + status = *(unsigned short *)&sport->regs->stat; +if (wait++ >1000 ) + goto __over; + } +/* Wait for the last byte sent out */ +udelay (20 ); +pr_debug ("sport status:0x%04x\n" , status); + +__over: + sport->regs->tcr1 &= ~TSPEN ; + sport->regs->rcr1 &= ~RSPEN ; +SSYNC (); +disable_dma (sport->dma_tx_chan); +/* Clear the status */ +clear_dma_irqstat (sport->dma_tx_chan); +if (in_data !=NULL ) { +disable_dma (sport->dma_rx_chan); +clear_dma_irqstat (sport->dma_rx_chan); + } +SSYNC (); +local_irq_restore (flags); + +return 0 ; +} +EXPORT_SYMBOL (sport_send_and_recv); + +MODULE_AUTHOR ("Roy Huang" ); +MODULE_DESCRIPTION ("SPORT driver for ADI Blackfin" ); +MODULE_LICENSE ("GPL" ); +
sound/soc/blackfin/bf5xx-sport.h new file +192 -0
192 lines not on this page · raw message
Signature · 1 line
1.5.6.5
PATCH 7/14 ASoC: Blackfin: DMA Driver for AC97 sound chip
From: Cliff Cai <[email protected]>
[Additional coding standards fixes by Mark Brown.]
--- sound/soc/blackfin/bf5xx-ac97-pcm.c | 429 +++++++++++++++++++++++++++++++++++ sound/soc/blackfin/bf5xx-ac97-pcm.h | 29 +++ 2 files changed, 458 insertions(+), 0 deletions(-) create mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.c create mode 100644 sound/soc/blackfin/bf5xx-ac97-pcm.h
sound/soc/blackfin/bf5xx-ac97-pcm.c new file +429 -0
@@ -0,0 +1,429 @@ +/* +* File: sound/soc/blackfin/bf5xx-ac97-pcm.c +* Author: Cliff Cai <[email protected]> +* +* Created: Tue June 06 2008 +* Description: DMA Driver for AC97 sound chip +* +* Modified: +* Copyright 2008 Analog Devices Inc. +* +* Bugs: Enter bugs at http://blackfin.uclinux.org/ +* +* 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. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see the file COPYING, or write +* to the Free Software Foundation, Inc., +* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/dma-mapping.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> + +#include <asm/dma.h> + +#include "bf5xx-ac97-pcm.h" +#include "bf5xx-ac97.h" +#include "bf5xx-sport.h" + +#if defined(CONFIG_SND_MMAP_SUPPORT ) +static void bf5xx_mmap_copy (struct snd_pcm_substream *substream, +snd_pcm_uframes_t count) +{ +struct snd_pcm_runtime *runtime = substream->runtime; +struct sport_device *sport = runtime->private_data; +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { +bf5xx_pcm_to_ac97 ( + (struct ac97_frame *)sport->tx_dma_buf + sport->tx_pos, + (__u32 *)runtime->dma_area + sport->tx_pos, count); + sport->tx_pos += runtime->period_size; +if (sport->tx_pos >= runtime->buffer_size) + sport->tx_pos %= runtime->buffer_size; + }else { +bf5xx_ac97_to_pcm ( + (struct ac97_frame *)sport->rx_dma_buf + sport->rx_pos, + (__u32 *)runtime->dma_area + sport->rx_pos, count); + sport->rx_pos += runtime->period_size; +if (sport->rx_pos >= runtime->buffer_size) + sport->rx_pos %= runtime->buffer_size; + } +} +#endif + +static void bf5xx_dma_irq (void *data) +{ +struct snd_pcm_substream *pcm = data; +#if defined(CONFIG_SND_MMAP_SUPPORT ) +struct snd_pcm_runtime *runtime = pcm->runtime; +bf5xx_mmap_copy (pcm, runtime->period_size); +#endif +snd_pcm_period_elapsed (pcm); +} + +/* The memory size for pure pcm data is 128*1024 = 0x20000 bytes. +* The total rx/tx buffer is for ac97 frame to hold all pcm data +* is 0x20000 * sizeof(struct ac97_frame) / 4. +*/ +#ifdef CONFIG_SND_MMAP_SUPPORT +static const struct snd_pcm_hardware bf5xx_pcm_hardware = { + .info = SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_MMAP | + SNDRV_PCM_INFO_MMAP_VALID | + SNDRV_PCM_INFO_BLOCK_TRANSFER, +#else +static const struct snd_pcm_hardware bf5xx_pcm_hardware = { + .info = SNDRV_PCM_INFO_INTERLEAVED | + SNDRV_PCM_INFO_BLOCK_TRANSFER, +#endif + .formats = SNDRV_PCM_FMTBIT_S16_LE, + .period_bytes_min = 32, + .period_bytes_max = 0x10000, + .periods_min = 1, + .periods_max = PAGE_SIZE/32, + .buffer_bytes_max = 0x20000, /* 128 kbytes */ + .fifo_size = 16, +}; + +static int bf5xx_pcm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + size_t size = bf5xx_pcm_hardware.buffer_bytes_max + * sizeof(struct ac97_frame) / 4; + + snd_pcm_lib_malloc_pages(substream, size); + + return 0; +} + +static int bf5xx_pcm_hw_free(struct snd_pcm_substream *substream) +{ + snd_pcm_lib_free_pages(substream); + return 0; +} + +static int bf5xx_pcm_prepare(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct sport_device *sport = runtime->private_data; + + /* An intermediate buffer is introduced for implementing mmap for + * SPORT working in TMD mode(include AC97). + */ +#if defined(CONFIG_SND_MMAP_SUPPORT) + size_t size = bf5xx_pcm_hardware.buffer_bytes_max + * sizeof(struct ac97_frame) / 4; + /*clean up intermediate buffer*/ + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + memset(sport->tx_dma_buf, 0, size); + sport_set_tx_callback(sport, bf5xx_dma_irq, substream); + sport_config_tx_dma(sport, sport->tx_dma_buf, runtime->periods, + runtime->period_size * sizeof(struct ac97_frame)); + } else { + memset(sport->rx_dma_buf, 0, size); + sport_set_rx_callback(sport, bf5xx_dma_irq, substream); + sport_config_rx_dma(sport, sport->rx_dma_buf, runtime->periods, + runtime->period_size * sizeof(struct ac97_frame)); + } +#else + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + sport_set_tx_callback(sport, bf5xx_dma_irq, substream); + sport_config_tx_dma(sport, runtime->dma_area, runtime->periods, + runtime->period_size * sizeof(struct ac97_frame)); + } else { + sport_set_rx_callback(sport, bf5xx_dma_irq, substream); + sport_config_rx_dma(sport, runtime->dma_area, runtime->periods, + runtime->period_size * sizeof(struct ac97_frame)); + } +#endif + return 0; +} + +static int bf5xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct sport_device *sport = runtime->private_data; + int ret = 0; + + pr_debug("%s enter\n", __func__); + switch (cmd) { + case SNDRV_PCM_TRIGGER_START: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + sport_tx_start(sport); + else + sport_rx_start(sport); + break; + case SNDRV_PCM_TRIGGER_STOP: + case SNDRV_PCM_TRIGGER_SUSPEND: + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { +#if defined(CONFIG_SND_MMAP_SUPPORT) + sport->tx_pos = 0; +#endif + sport_tx_stop(sport); + } else { +#if defined(CONFIG_SND_MMAP_SUPPORT) + sport->rx_pos = 0; +#endif + sport_rx_stop(sport); + } + break; + default: + ret = -EINVAL; + } + return ret; +} + +static snd_pcm_uframes_t bf5xx_pcm_pointer(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + struct sport_device *sport = runtime->private_data; + unsigned int curr; + +#if defined(CONFIG_SND_MMAP_SUPPORT) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + curr = sport->tx_pos; + else + curr = sport->rx_pos; +#else + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + curr = sport_curr_offset_tx(sport) / sizeof(struct ac97_frame); + else + curr = sport_curr_offset_rx(sport) / sizeof(struct ac97_frame); + +#endif + return curr; +} + +static int bf5xx_pcm_open(struct snd_pcm_substream *substream) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + int ret; + + pr_debug("%s enter\n", __func__); + snd_soc_set_runtime_hwparams(substream, &bf5xx_pcm_hardware); + + ret = snd_pcm_hw_constraint_integer(runtime, + SNDRV_PCM_HW_PARAM_PERIODS); + if (ret < 0) + goto out; + + if (sport_handle != NULL) + runtime->private_data = sport_handle; + else { + pr_err("sport_handle is NULL\n"); + return -1; + } + return 0; + + out: + return ret; +} + +#ifdef CONFIG_SND_MMAP_SUPPORT +static int bf5xx_pcm_mmap(struct snd_pcm_substream *substream, + struct vm_area_struct *vma) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + size_t size = vma->vm_end - vma->vm_start; + vma->vm_start = (unsigned long)runtime->dma_area; + vma->vm_end = vma->vm_start + size; + vma->vm_flags |= VM_SHARED; + return 0 ; +} +#else +static int bf5xx_pcm_copy(struct snd_pcm_substream *substream, int channel, + snd_pcm_uframes_t pos, + void __user *buf, snd_pcm_uframes_t count) +{ + struct snd_pcm_runtime *runtime = substream->runtime; + + pr_debug("%s copy pos:0x%lx count:0x%lx\n", + substream->stream ? "Capture" : "Playback", pos, count); + + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) + bf5xx_pcm_to_ac97( + (struct ac97_frame *)runtime->dma_area + pos, + buf, count); + else + bf5xx_ac97_to_pcm( + (struct ac97_frame *)runtime->dma_area + pos, + buf, count); + return 0; +} +#endif + +struct snd_pcm_ops bf5xx_pcm_ac97_ops = { + .open = bf5xx_pcm_open, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = bf5xx_pcm_hw_params, + .hw_free = bf5xx_pcm_hw_free, + .prepare = bf5xx_pcm_prepare, + .trigger = bf5xx_pcm_trigger, + .pointer = bf5xx_pcm_pointer, +#ifdef CONFIG_SND_MMAP_SUPPORT + .mmap = bf5xx_pcm_mmap, +#else + .copy = bf5xx_pcm_copy, +#endif +}; + +static int bf5xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) +{ + struct snd_pcm_substream *substream = pcm->streams[stream].substream; + struct snd_dma_buffer *buf = &substream->dma_buffer; + size_t size = bf5xx_pcm_hardware.buffer_bytes_max + * sizeof(struct ac97_frame) / 4; + + buf->dev.type = SNDRV_DMA_TYPE_DEV; + buf->dev.dev = pcm->card->dev; + buf->private_data = NULL; + buf->area = dma_alloc_coherent(pcm->card->dev, size, + &buf->addr, GFP_KERNEL); + if (!buf->area) { + pr_err("Failed to allocate dma memory\n"); + pr_err("Please increase uncached DMA memory region\n"); + return -ENOMEM; + } + buf->bytes = size; + + pr_debug("%s, area:%p, size:0x%08lx\n", __func__, + buf->area, buf->bytes); + + if (stream == SNDRV_PCM_STREAM_PLAYBACK) + sport_handle->tx_buf = buf->area; + else + sport_handle->rx_buf = buf->area; + +/* + * Need to allocate local buffer when enable + * MMAP for SPORT working in TMD mode (include AC97). + */ +#if defined(CONFIG_SND_MMAP_SUPPORT) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + if (!sport_handle->tx_dma_buf) { + sport_handle->tx_dma_buf = dma_alloc_coherent(NULL, \ + size, &sport_handle->tx_dma_phy, GFP_KERNEL); + if (!sport_handle->tx_dma_buf) { + pr_err("Failed to allocate memory for tx dma \ + buf - Please increase uncached DMA \ + memory region\n"); + return -ENOMEM; + } else + memset(sport_handle->tx_dma_buf, 0, size); + } else + memset(sport_handle->tx_dma_buf, 0, size); + } else { + if (!sport_handle->rx_dma_buf) { + sport_handle->rx_dma_buf = dma_alloc_coherent(NULL, \ + size, &sport_handle->rx_dma_phy, GFP_KERNEL); + if (!sport_handle->rx_dma_buf) { + pr_err("Failed to allocate memory for rx dma \ + buf - Please increase uncached DMA \ + memory region\n"); + return -ENOMEM; + } else + memset(sport_handle->rx_dma_buf, 0, size); + } else + memset(sport_handle->rx_dma_buf, 0, size); + } +#endif + return 0; +} + +static void bf5xx_pcm_free_dma_buffers(struct snd_pcm *pcm) +{ + struct snd_pcm_substream *substream; + struct snd_dma_buffer *buf; + int stream; +#if defined(CONFIG_SND_MMAP_SUPPORT) + size_t size = bf5xx_pcm_hardware.buffer_bytes_max * + sizeof(struct ac97_frame) / 4; +#endif + for (stream = 0; stream < 2; stream++) { + substream = pcm->streams[stream].substream; + if (!substream) + continue; + + buf = &substream->dma_buffer; + if (!buf->area) + continue; + dma_free_coherent(NULL, buf->bytes, buf->area, 0); + buf->area = NULL; +#if defined(CONFIG_SND_MMAP_SUPPORT) + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { + if (sport_handle->tx_dma_buf) + dma_free_coherent(NULL, size, \ + sport_handle->tx_dma_buf, 0); + sport_handle->tx_dma_buf = NULL; + } else { + + if (sport_handle->rx_dma_buf) + dma_free_coherent(NULL, size, \ + sport_handle->rx_dma_buf, 0); + sport_handle->rx_dma_buf = NULL; + } +#endif + } + if (sport_handle) + sport_done(sport_handle); +} + +static u64 bf5xx_pcm_dmamask = DMA_32BIT_MASK; + +int bf5xx_pcm_ac97_new(struct snd_card *card, struct snd_soc_dai *dai, + struct snd_pcm *pcm) +{ + int ret = 0; + + pr_debug("%s enter\n", __func__); + if (!card->dev->dma_mask) + card->dev->dma_mask = &bf5xx_pcm_dmamask; + if (!card->dev->coherent_dma_mask) + card->dev->coherent_dma_mask = DMA_32BIT_MASK; + + if (dai->playback.channels_min) { + ret = bf5xx_pcm_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_PLAYBACK); + if (ret) + goto out; + } + + if (dai->capture.channels_min) { + ret = bf5xx_pcm_preallocate_dma_buffer(pcm, + SNDRV_PCM_STREAM_CAPTURE); + if (ret) + goto out; + } + out: + return ret; +} + +struct snd_soc_platform bf5xx_ac97_soc_platform = { + .name = "bf5xx-audio", + .pcm_ops = &bf5xx_pcm_ac97_ops, + .pcm_new = bf5xx_pcm_ac97_new, + .pcm_free = bf5xx_pcm_free_dma_buffers, +}; +EXPORT_SYMBOL_GPL(bf5xx_ac97_soc_platform); + +MODULE_AUTHOR("Cliff Cai"); +MODULE_DESCRIPTION("ADI Blackfin AC97 PCM DMA module"); +MODULE_LICENSE("GPL");
sound/soc/blackfin/bf5xx-ac97-pcm.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* linux/sound/arm/bf5xx-ac97-pcm.h -- ALSA PCM interface for the Blackfin +* +* Copyright 2007 Analog Device Inc. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef _BF5XX_AC97_PCM_H +#define _BF5XX_AC97_PCM_H + +struct bf5xx_pcm_dma_params { +char *name;/* stream identifier */ +}; + +struct bf5xx_gpio { +u32 sys; +u32 rx; +u32 tx; +u32 clk; +u32 frm; +}; + +/* platform data */ +extern struct snd_soc_platform bf5xx_ac97_soc_platform; + +#endif
Signature · 1 line
1.5.6.5
PATCH 8/14 ASoC: Blackfin: AC97 Blackfin CPU DAI driver
From: Cliff Cai <[email protected]>
--- sound/soc/blackfin/bf5xx-ac97.c | 407 +++++++++++++++++++++++++++++++++++++++ sound/soc/blackfin/bf5xx-ac97.h | 36 ++++ 2 files changed, 443 insertions(+), 0 deletions(-) create mode 100644 sound/soc/blackfin/bf5xx-ac97.c create mode 100644 sound/soc/blackfin/bf5xx-ac97.h
sound/soc/blackfin/bf5xx-ac97.c new file +407 -0
@@ -0,0 +1,407 @@ +/* +* bf5xx-ac97.c -- AC97 support for the ADI blackfin chip. +* +* Author: Roy Huang +* Created: 11th. June 2007 +* Copyright: Analog Device Inc. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/interrupt.h> +#include <linux/wait.h> +#include <linux/delay.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/ac97_codec.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include <asm/irq.h> +#include <asm/portmux.h> +#include <linux/mutex.h> +#include <linux/gpio.h> + +#include "bf5xx-sport.h" +#include "bf5xx-ac97.h" + +#if defined(CONFIG_BF54x) +#define PIN_REQ_SPORT_0 {P_SPORT0_TFS, P_SPORT0_DTPRI, P_SPORT0_TSCLK, \ + P_SPORT0_RFS, P_SPORT0_DRPRI, P_SPORT0_RSCLK, 0} + +#define PIN_REQ_SPORT_1 {P_SPORT1_TFS, P_SPORT1_DTPRI, P_SPORT1_TSCLK, \ + P_SPORT1_RFS, P_SPORT1_DRPRI, P_SPORT1_RSCLK, 0} + +#define PIN_REQ_SPORT_2 {P_SPORT2_TFS, P_SPORT2_DTPRI, P_SPORT2_TSCLK, \ + P_SPORT2_RFS, P_SPORT2_DRPRI, P_SPORT2_RSCLK, 0} + +#define PIN_REQ_SPORT_3 {P_SPORT3_TFS, P_SPORT3_DTPRI, P_SPORT3_TSCLK, \ + P_SPORT3_RFS, P_SPORT3_DRPRI, P_SPORT3_RSCLK, 0} +#else +#define PIN_REQ_SPORT_0 {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS, \ + P_SPORT0_DRPRI, P_SPORT0_RSCLK, 0} + +#define PIN_REQ_SPORT_1 {P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_RFS, \ + P_SPORT1_DRPRI, P_SPORT1_RSCLK, 0} +#endif + +static int *cmd_count; +static int sport_num =CONFIG_SND_BF5XX_SPORT_NUM ; + +#if defined(CONFIG_BF54x) +static struct sport_param sport_params[4 ] = { + { + .dma_rx_chan =CH_SPORT0_RX , + .dma_tx_chan =CH_SPORT0_TX , + .err_irq =IRQ_SPORT0_ERR , + .regs = (struct sport_register *)SPORT0_TCR1 , + }, + { + .dma_rx_chan =CH_SPORT1_RX , + .dma_tx_chan =CH_SPORT1_TX , + .err_irq =IRQ_SPORT1_ERR , + .regs = (struct sport_register *)SPORT1_TCR1 , + }, + { + .dma_rx_chan =CH_SPORT2_RX , + .dma_tx_chan =CH_SPORT2_TX , + .err_irq =IRQ_SPORT2_ERR , + .regs = (struct sport_register *)SPORT2_TCR1 , + }, + { + .dma_rx_chan =CH_SPORT3_RX , + .dma_tx_chan =CH_SPORT3_TX , + .err_irq =IRQ_SPORT3_ERR , + .regs = (struct sport_register *)SPORT3_TCR1 , + } +}; +#else +static struct sport_param sport_params[2 ] = { + { + .dma_rx_chan =CH_SPORT0_RX , + .dma_tx_chan =CH_SPORT0_TX , + .err_irq =IRQ_SPORT0_ERROR , + .regs = (struct sport_register *)SPORT0_TCR1 , + }, + { + .dma_rx_chan =CH_SPORT1_RX , + .dma_tx_chan =CH_SPORT1_TX , + .err_irq =IRQ_SPORT1_ERROR , + .regs = (struct sport_register *)SPORT1_TCR1 , + } +}; +#endif + +void bf5xx_pcm_to_ac97 (struct ac97_frame *dst,const __u32 *src, \ +size_t count) +{ +while (count--) { + dst->ac97_tag =TAG_VALID |TAG_PCM ; + (dst++)->ac97_pcm = *src++; + } +} +EXPORT_SYMBOL (bf5xx_pcm_to_ac97); + +void bf5xx_ac97_to_pcm (const struct ac97_frame *src,__u32 *dst, \ +size_t count) +{ +while (count--) + *(dst++) = (src++)->ac97_pcm; +} +EXPORT_SYMBOL (bf5xx_ac97_to_pcm); + +static unsigned int sport_tx_curr_frag (struct sport_device *sport) +{ +return sport->tx_curr_frag =sport_curr_offset_tx (sport) / \ + sport->tx_fragsize; +} + +static void enqueue_cmd (struct snd_ac97 *ac97,__u16 addr,__u16 data) +{ +struct sport_device *sport = sport_handle; +int nextfrag =sport_tx_curr_frag (sport); +struct ac97_frame *nextwrite; + +sport_incfrag (sport, &nextfrag,1 ); +sport_incfrag (sport, &nextfrag,1 ); + + nextwrite = (struct ac97_frame *)(sport->tx_buf + \ + nextfrag * sport->tx_fragsize); +pr_debug ("sport->tx_buf:%p, nextfrag:0x%x nextwrite:%p, cmd_count:%d\n" , + sport->tx_buf, nextfrag, nextwrite, cmd_count[nextfrag]); + nextwrite[cmd_count[nextfrag]].ac97_tag |=TAG_CMD ; + nextwrite[cmd_count[nextfrag]].ac97_addr = addr; + nextwrite[cmd_count[nextfrag]].ac97_data = data; + ++cmd_count[nextfrag]; +pr_debug ("ac97_sport: Inserting %02x/%04x into fragment %d\n" , + addr >>8 , data, nextfrag); +} + +static unsigned short bf5xx_ac97_read (struct snd_ac97 *ac97, +unsigned short reg) +{ +struct ac97_frame out_frame[2 ], in_frame[2 ]; + +pr_debug ("%s enter 0x%x\n" , __func__, reg); + +/* When dma descriptor is enabled, the register should not be read */ +if (sport_handle->tx_run || sport_handle->rx_run) { +pr_err ("Could you send a mail to [email protected] " +"to report this?\n" ); +return -EFAULT ; + } + +memset (&out_frame,0 ,2 *sizeof (struct ac97_frame )); +memset (&in_frame,0 ,2 *sizeof (struct ac97_frame )); + out_frame[0 ].ac97_tag =TAG_VALID |TAG_CMD ; + out_frame[0 ].ac97_addr = ((reg <<8 ) |0x8000 ); +sport_send_and_recv (sport_handle, (unsigned char *)&out_frame, + (unsigned char *)&in_frame, +2 *sizeof (struct ac97_frame )); +return in_frame[1 ].ac97_data; +} + +void bf5xx_ac97_write (struct snd_ac97 *ac97,unsigned short reg, +unsigned short val) +{ +pr_debug ("%s enter 0x%x:0x%04x\n" , __func__, reg, val); + +if (sport_handle->tx_run) { +enqueue_cmd (ac97, (reg <<8 ), val);/* write */ +enqueue_cmd (ac97, (reg <<8 ) |0x8000 ,0 );/* read back */ + }else { +struct ac97_frame frame; +memset (&frame,0 ,sizeof (struct ac97_frame )); + frame.ac97_tag =TAG_VALID |TAG_CMD ; + frame.ac97_addr = (reg <<8 ); + frame.ac97_data = val; +sport_send_and_recv (sport_handle, (unsigned char *)&frame, \ +NULL ,sizeof (struct ac97_frame )); + } +} + +static void bf5xx_ac97_warm_reset (struct snd_ac97 *ac97) +{ +#if defined(CONFIG_BF54x) || defined(CONFIG_BF561 ) || \ + (defined(BF537_FAMILY ) && (CONFIG_SND_BF5XX_SPORT_NUM ==1 )) + +#define CONCAT (a, b, c) a ## b ## c +#define BFIN_SPORT_RFS (x) CONCAT(P_SPORT, x, _RFS) + +u16 per =BFIN_SPORT_RFS (CONFIG_SND_BF5XX_SPORT_NUM ); +u16 gpio =P_IDENT (BFIN_SPORT_RFS (CONFIG_SND_BF5XX_SPORT_NUM )); + +pr_debug ("%s enter\n" , __func__); + +peripheral_free (per); +gpio_request (gpio,"bf5xx-ac97" ); +gpio_direction_output (gpio,1 ); +udelay (2 ); +gpio_set_value (gpio,0 ); +udelay (1 ); +gpio_free (gpio); +peripheral_request (per,"soc-audio" ); +#else +pr_info ("%s: Not implemented\n" , __func__); +#endif +} + +static void bf5xx_ac97_cold_reset (struct snd_ac97 *ac97) +{ +#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET +pr_debug ("%s enter\n" , __func__); + +/* It is specified for bf548-ezkit */ +gpio_set_value (CONFIG_SND_BF5XX_RESET_GPIO_NUM ,0 ); +/* Keep reset pin low for 1 ms */ +mdelay (1 ); +gpio_set_value (CONFIG_SND_BF5XX_RESET_GPIO_NUM ,1 ); +/* Wait for bit clock recover */ +mdelay (1 ); +#else +pr_info ("%s: Not implemented\n" , __func__); +#endif +} + +struct snd_ac97_bus_ops soc_ac97_ops = { + .read = bf5xx_ac97_read, + .write = bf5xx_ac97_write, + .warm_reset = bf5xx_ac97_warm_reset, + .reset = bf5xx_ac97_cold_reset, +}; +EXPORT_SYMBOL_GPL (soc_ac97_ops); + +#ifdef CONFIG_PM +static int bf5xx_ac97_suspend (struct platform_device *pdev, +struct snd_soc_dai *dai) +{ +struct sport_device *sport = + (struct sport_device *)dai->private_data; + +pr_debug ("%s : sport %d\n" , __func__, dai->id); +if (!dai->active) +return 0 ; +if (dai->capture.active) +sport_rx_stop (sport); +if (dai->playback.active) +sport_tx_stop (sport); +return 0 ; +} + +static int bf5xx_ac97_resume (struct platform_device *pdev, +struct snd_soc_dai *dai) +{ +int ret; +struct sport_device *sport = + (struct sport_device *)dai->private_data; + +pr_debug ("%s : sport %d\n" , __func__, dai->id); +if (!dai->active) +return 0 ; + + ret =sport_set_multichannel (sport_handle,16 ,0x1F ,1 ); +if (ret) { +pr_err ("SPORT is busy!\n" ); +return -EBUSY ; + } + + ret =sport_config_rx (sport_handle,IRFS ,0xF ,0 , (16 *16 -1 )); +if (ret) { +pr_err ("SPORT is busy!\n" ); +return -EBUSY ; + } + + ret =sport_config_tx (sport_handle,ITFS ,0xF ,0 , (16 *16 -1 )); +if (ret) { +pr_err ("SPORT is busy!\n" ); +return -EBUSY ; + } + +if (dai->capture.active) +sport_rx_start (sport); +if (dai->playback.active) +sport_tx_start (sport); +return 0 ; +} + +#else +#define bf5xx_ac97_suspend NULL +#define bf5xx_ac97_resume NULL +#endif + +static int bf5xx_ac97_probe (struct platform_device *pdev, +struct snd_soc_dai *dai) +{ +int ret; +#if defined(CONFIG_BF54x) +u16 sport_req[][7 ] = {PIN_REQ_SPORT_0 ,PIN_REQ_SPORT_1 , +PIN_REQ_SPORT_2 ,PIN_REQ_SPORT_3 }; +#else +u16 sport_req[][7 ] = {PIN_REQ_SPORT_0 ,PIN_REQ_SPORT_1 }; +#endif + cmd_count = (int *)get_zeroed_page (GFP_KERNEL ); +if (cmd_count ==NULL ) +return -ENOMEM ; + +if (peripheral_request_list (&sport_req[sport_num][0 ],"soc-audio" )) { +pr_err ("Requesting Peripherals failed\n" ); +return -EFAULT ; + } + +#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET +/* Request PB3 as reset pin */ +if (gpio_request (CONFIG_SND_BF5XX_RESET_GPIO_NUM ,"SND_AD198x RESET" )) { +pr_err ("Failed to request GPIO_%d for reset\n" , +CONFIG_SND_BF5XX_RESET_GPIO_NUM ); +peripheral_free_list (&sport_req[sport_num][0 ]); +return -1 ; + } +gpio_direction_output (CONFIG_SND_BF5XX_RESET_GPIO_NUM ,1 ); +#endif + sport_handle =sport_init (&sport_params[sport_num],2 , \ +sizeof (struct ac97_frame ),NULL ); +if (!sport_handle) { +peripheral_free_list (&sport_req[sport_num][0 ]); +#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET +gpio_free (CONFIG_SND_BF5XX_RESET_GPIO_NUM ); +#endif +return -ENODEV ; + } +/*SPORT works in TDM mode to simulate AC97 transfers*/ + ret =sport_set_multichannel (sport_handle,16 ,0x1F ,1 ); +if (ret) { +pr_err ("SPORT is busy!\n" ); +kfree (sport_handle); +peripheral_free_list (&sport_req[sport_num][0 ]); +#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET +gpio_free (CONFIG_SND_BF5XX_RESET_GPIO_NUM ); +#endif +return -EBUSY ; + } + + ret =sport_config_rx (sport_handle,IRFS ,0xF ,0 , (16 *16 -1 )); +if (ret) { +pr_err ("SPORT is busy!\n" ); +kfree (sport_handle); +peripheral_free_list (&sport_req[sport_num][0 ]); +#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET +gpio_free (CONFIG_SND_BF5XX_RESET_GPIO_NUM ); +#endif +return -EBUSY ; + } + + ret =sport_config_tx (sport_handle,ITFS ,0xF ,0 , (16 *16 -1 )); +if (ret) { +pr_err ("SPORT is busy!\n" ); +kfree (sport_handle); +peripheral_free_list (&sport_req[sport_num][0 ]); +#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET +gpio_free (CONFIG_SND_BF5XX_RESET_GPIO_NUM ); +#endif +return -EBUSY ; + } +return 0 ; +} + +static void bf5xx_ac97_remove (struct platform_device *pdev, +struct snd_soc_dai *dai) +{ +free_page ((unsigned long )cmd_count); + cmd_count =NULL ; +#ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET +gpio_free (CONFIG_SND_BF5XX_RESET_GPIO_NUM ); +#endif +} + +struct snd_soc_dai bfin_ac97_dai = { + .name ="bf5xx-ac97" , + .id =0 , + .type =SND_SOC_DAI_AC97 , + .probe = bf5xx_ac97_probe, + .remove = bf5xx_ac97_remove, + .suspend = bf5xx_ac97_suspend, + .resume = bf5xx_ac97_resume, + .playback = { + .stream_name ="AC97 Playback" , + .channels_min =2 , + .channels_max =2 , + .rates =SNDRV_PCM_RATE_48000 , + .formats =SNDRV_PCM_FMTBIT_S16_LE , }, + .capture = { + .stream_name ="AC97 Capture" , + .channels_min =2 , + .channels_max =2 , + .rates =SNDRV_PCM_RATE_48000 , + .formats =SNDRV_PCM_FMTBIT_S16_LE , }, +}; +EXPORT_SYMBOL_GPL (bfin_ac97_dai); + +MODULE_AUTHOR ("Roy Huang" ); +MODULE_DESCRIPTION ("AC97 driver for ADI Blackfin" ); +MODULE_LICENSE ("GPL" );
sound/soc/blackfin/bf5xx-ac97.h new file +36 -0
@@ -0,0 +1,36 @@ +/* +* linux/sound/arm/bf5xx-ac97.h +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef _BF5XX_AC97_H +#define _BF5XX_AC97_H + +extern struct snd_ac97_bus_ops bf5xx_ac97_ops; +extern struct snd_ac97 *ac97; +/* Frame format in memory, only support stereo currently */ +struct ac97_frame { +u16 ac97_tag;/* slot 0 */ +u16 ac97_addr;/* slot 1 */ +u16 ac97_data;/* slot 2 */ +u32 ac97_pcm;/* slot 3 and 4: left and right pcm data */ +} __attribute__ ((packed)); + +#define TAG_VALID 0x8000 +#define TAG_CMD 0x6000 +#define TAG_PCM_LEFT 0x1000 +#define TAG_PCM_RIGHT 0x0800 +#define TAG_PCM (TAG_PCM_LEFT | TAG_PCM_RIGHT) + +extern struct snd_soc_dai bfin_ac97_dai; + +void bf5xx_pcm_to_ac97 (struct ac97_frame *dst,const __u32 *src, \ +size_t count); + +void bf5xx_ac97_to_pcm (const struct ac97_frame *src,__u32 *dst, \ +size_t count); + +#endif
Signature · 1 line
1.5.6.5
PATCH 9/14 ASoC: Blackfin: DMA Driver for I2S sound chip
From: Cliff Cai <[email protected]>
--- sound/soc/blackfin/bf5xx-i2s-pcm.c | 288 ++++++++++++++++++++++++++++++++++++ sound/soc/blackfin/bf5xx-i2s-pcm.h | 29 ++++ 2 files changed, 317 insertions(+), 0 deletions(-) create mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.c create mode 100644 sound/soc/blackfin/bf5xx-i2s-pcm.h
sound/soc/blackfin/bf5xx-i2s-pcm.c new file +288 -0
@@ -0,0 +1,288 @@ +/* +* File: sound/soc/blackfin/bf5xx-i2s-pcm.c +* Author: Cliff Cai <[email protected]> +* +* Created: Tue June 06 2008 +* Description: DMA driver for i2s codec +* +* Modified: +* Copyright 2008 Analog Devices Inc. +* +* Bugs: Enter bugs at http://blackfin.uclinux.org/ +* +* 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. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see the file COPYING, or write +* to the Free Software Foundation, Inc., +* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/dma-mapping.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> + +#include <asm/dma.h> + +#include "bf5xx-i2s-pcm.h" +#include "bf5xx-i2s.h" +#include "bf5xx-sport.h" + +static void bf5xx_dma_irq (void *data) +{ +struct snd_pcm_substream *pcm = data; +snd_pcm_period_elapsed (pcm); +} + +static const struct snd_pcm_hardware bf5xx_pcm_hardware = { + .info =SNDRV_PCM_INFO_INTERLEAVED | +SNDRV_PCM_INFO_MMAP | +SNDRV_PCM_INFO_MMAP_VALID | +SNDRV_PCM_INFO_BLOCK_TRANSFER , + .formats =SNDRV_PCM_FMTBIT_S16_LE | +SNDRV_PCM_FMTBIT_S24_LE | +SNDRV_PCM_FMTBIT_S32_LE , + .period_bytes_min =32 , + .period_bytes_max =0x10000 , + .periods_min =1 , + .periods_max =PAGE_SIZE /32 , + .buffer_bytes_max =0x20000 ,/* 128 kbytes */ + .fifo_size =16 , +}; + +static int bf5xx_pcm_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params) +{ +size_t size = bf5xx_pcm_hardware.buffer_bytes_max; +snd_pcm_lib_malloc_pages (substream, size); + +return 0 ; +} + +static int bf5xx_pcm_hw_free (struct snd_pcm_substream *substream) +{ +snd_pcm_lib_free_pages (substream); + +return 0 ; +} + +static int bf5xx_pcm_prepare (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; +struct sport_device *sport = runtime->private_data; +int period_bytes =frames_to_bytes (runtime, runtime->period_size); + +pr_debug ("%s enter\n" , __func__); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { +sport_set_tx_callback (sport, bf5xx_dma_irq, substream); +sport_config_tx_dma (sport, runtime->dma_area, + runtime->periods, period_bytes); + }else { +sport_set_rx_callback (sport, bf5xx_dma_irq, substream); +sport_config_rx_dma (sport, runtime->dma_area, + runtime->periods, period_bytes); + } + +return 0 ; +} + +static int bf5xx_pcm_trigger (struct snd_pcm_substream *substream,int cmd) +{ +struct snd_pcm_runtime *runtime = substream->runtime; +struct sport_device *sport = runtime->private_data; +int ret =0 ; + +pr_debug ("%s enter\n" , __func__); +switch (cmd) { +case SNDRV_PCM_TRIGGER_START : +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) +sport_tx_start (sport); +else +sport_rx_start (sport); +break ; +case SNDRV_PCM_TRIGGER_STOP : +case SNDRV_PCM_TRIGGER_SUSPEND : +case SNDRV_PCM_TRIGGER_PAUSE_PUSH : +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) +sport_tx_stop (sport); +else +sport_rx_stop (sport); +break ; +default : + ret = -EINVAL ; + } + +return ret; +} + +static snd_pcm_uframes_t bf5xx_pcm_pointer (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; +struct sport_device *sport = runtime->private_data; +unsigned int diff; +snd_pcm_uframes_t frames; +pr_debug ("%s enter\n" , __func__); +if (substream->stream ==SNDRV_PCM_STREAM_PLAYBACK ) { + diff =sport_curr_offset_tx (sport); + frames =bytes_to_frames (substream->runtime, diff); + }else { + diff =sport_curr_offset_rx (sport); + frames =bytes_to_frames (substream->runtime, diff); + } +return frames; +} + +static int bf5xx_pcm_open (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime = substream->runtime; +int ret; + +pr_debug ("%s enter\n" , __func__); +snd_soc_set_runtime_hwparams (substream, &bf5xx_pcm_hardware); + + ret =snd_pcm_hw_constraint_integer (runtime, \ +SNDRV_PCM_HW_PARAM_PERIODS ); +if (ret <0 ) + goto out; + +if (sport_handle !=NULL ) + runtime->private_data = sport_handle; +else { +pr_err ("sport_handle is NULL\n" ); +return -1 ; + } +return 0 ; + + out: +return ret; +} + +static int bf5xx_pcm_mmap (struct snd_pcm_substream *substream, +struct vm_area_struct *vma) +{ +struct snd_pcm_runtime *runtime = substream->runtime; +size_t size = vma->vm_end - vma->vm_start; + vma->vm_start = (unsigned long )runtime->dma_area; + vma->vm_end = vma->vm_start + size; + vma->vm_flags |=VM_SHARED ; + +return 0 ; +} + +struct snd_pcm_ops bf5xx_pcm_i2s_ops = { + .open = bf5xx_pcm_open, + .ioctl = snd_pcm_lib_ioctl, + .hw_params = bf5xx_pcm_hw_params, + .hw_free = bf5xx_pcm_hw_free, + .prepare = bf5xx_pcm_prepare, + .trigger = bf5xx_pcm_trigger, + .pointer = bf5xx_pcm_pointer, + .mmap = bf5xx_pcm_mmap, +}; + +static int bf5xx_pcm_preallocate_dma_buffer (struct snd_pcm *pcm,int stream) +{ +struct snd_pcm_substream *substream = pcm->streams[stream].substream; +struct snd_dma_buffer *buf = &substream->dma_buffer; +size_t size = bf5xx_pcm_hardware.buffer_bytes_max; + + buf->dev.type =SNDRV_DMA_TYPE_DEV ; + buf->dev.dev = pcm->card->dev; + buf->private_data =NULL ; + buf->area =dma_alloc_coherent (pcm->card->dev, size, + &buf->addr,GFP_KERNEL ); +if (!buf->area) { +pr_err ("Failed to allocate dma memory \ +Please increase uncached DMA memory region\n" ); +return -ENOMEM ; + } + buf->bytes = size; + +pr_debug ("%s, area:%p, size:0x%08lx\n" , __func__, + buf->area, buf->bytes); + +if (stream ==SNDRV_PCM_STREAM_PLAYBACK ) + sport_handle->tx_buf = buf->area; +else + sport_handle->rx_buf = buf->area; + +return 0 ; +} + +static void bf5xx_pcm_free_dma_buffers (struct snd_pcm *pcm) +{ +struct snd_pcm_substream *substream; +struct snd_dma_buffer *buf; +int stream; + +for (stream =0 ; stream <2 ; stream++) { + substream = pcm->streams[stream].substream; +if (!substream) +continue ; + + buf = &substream->dma_buffer; +if (!buf->area) +continue ; +dma_free_coherent (NULL , buf->bytes, buf->area,0 ); + buf->area =NULL ; + } +if (sport_handle) +sport_done (sport_handle); +} + +static u64 bf5xx_pcm_dmamask =DMA_32BIT_MASK ; + +int bf5xx_pcm_i2s_new (struct snd_card *card,struct snd_soc_dai *dai, +struct snd_pcm *pcm) +{ +int ret =0 ; + +pr_debug ("%s enter\n" , __func__); +if (!card->dev->dma_mask) + card->dev->dma_mask = &bf5xx_pcm_dmamask; +if (!card->dev->coherent_dma_mask) + card->dev->coherent_dma_mask =DMA_32BIT_MASK ; + +if (dai->playback.channels_min) { + ret =bf5xx_pcm_preallocate_dma_buffer (pcm, +SNDRV_PCM_STREAM_PLAYBACK ); +if (ret) + goto out; + } + +if (dai->capture.channels_min) { + ret =bf5xx_pcm_preallocate_dma_buffer (pcm, +SNDRV_PCM_STREAM_CAPTURE ); +if (ret) + goto out; + } + out: +return ret; +} + +struct snd_soc_platform bf5xx_i2s_soc_platform = { + .name ="bf5xx-audio" , + .pcm_ops = &bf5xx_pcm_i2s_ops, + .pcm_new = bf5xx_pcm_i2s_new, + .pcm_free = bf5xx_pcm_free_dma_buffers, +}; +EXPORT_SYMBOL_GPL (bf5xx_i2s_soc_platform); + +MODULE_AUTHOR ("Cliff Cai" ); +MODULE_DESCRIPTION ("ADI Blackfin I2S PCM DMA module" ); +MODULE_LICENSE ("GPL" );
sound/soc/blackfin/bf5xx-i2s-pcm.h new file +29 -0
@@ -0,0 +1,29 @@ +/* +* linux/sound/arm/bf5xx-i2s-pcm.h -- ALSA PCM interface for the Blackfin +* +* Copyright 2007 Analog Device Inc. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef _BF5XX_I2S_PCM_H +#define _BF5XX_I2S_PCM_H + +struct bf5xx_pcm_dma_params { +char *name;/* stream identifier */ +}; + +struct bf5xx_gpio { +u32 sys; +u32 rx; +u32 tx; +u32 clk; +u32 frm; +}; + +/* platform data */ +extern struct snd_soc_platform bf5xx_i2s_soc_platform; + +#endif
Signature · 1 line
1.5.6.5
PATCH 10/14 ASoC: Blackfin: I2S CPU DAI driver
From: Cliff Cai <[email protected]>
[Additional coding standards fixes by Mark Brown.]
--- sound/soc/blackfin/bf5xx-i2s.c | 292 ++++++++++++++++++++++++++++++++++++++++ sound/soc/blackfin/bf5xx-i2s.h | 14 ++ 2 files changed, 306 insertions(+), 0 deletions(-) create mode 100644 sound/soc/blackfin/bf5xx-i2s.c create mode 100644 sound/soc/blackfin/bf5xx-i2s.h
sound/soc/blackfin/bf5xx-i2s.c new file +292 -0
@@ -0,0 +1,292 @@ +/* +* File: sound/soc/blackfin/bf5xx-i2s.c +* Author: Cliff Cai <[email protected]> +* +* Created: Tue June 06 2008 +* Description: Blackfin I2S CPU DAI driver +* +* Modified: +* Copyright 2008 Analog Devices Inc. +* +* Bugs: Enter bugs at http://blackfin.uclinux.org/ +* +* 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. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see the file COPYING, or write +* to the Free Software Foundation, Inc., +* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <linux/init.h> +#include <linux/module.h> +#include <linux/device.h> +#include <linux/delay.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/initval.h> +#include <sound/soc.h> + +#include <asm/irq.h> +#include <asm/portmux.h> +#include <linux/mutex.h> +#include <linux/gpio.h> + +#include "bf5xx-sport.h" +#include "bf5xx-i2s.h" + +struct bf5xx_i2s_port { +u16 tcr1; +u16 rcr1; +u16 tcr2; +u16 rcr2; +int counter; +}; + +static struct bf5xx_i2s_port bf5xx_i2s; +static int sport_num =CONFIG_SND_BF5XX_SPORT_NUM ; + +static struct sport_param sport_params[2 ] = { + { + .dma_rx_chan =CH_SPORT0_RX , + .dma_tx_chan =CH_SPORT0_TX , + .err_irq =IRQ_SPORT0_ERROR , + .regs = (struct sport_register *)SPORT0_TCR1 , + }, + { + .dma_rx_chan =CH_SPORT1_RX , + .dma_tx_chan =CH_SPORT1_TX , + .err_irq =IRQ_SPORT1_ERROR , + .regs = (struct sport_register *)SPORT1_TCR1 , + } +}; + +static int bf5xx_i2s_set_dai_fmt (struct snd_soc_dai *cpu_dai, +unsigned int fmt) +{ +int ret =0 ; + +/* interface format:support I2S,slave mode */ +switch (fmt &SND_SOC_DAIFMT_FORMAT_MASK ) { +case SND_SOC_DAIFMT_I2S : +break ; +case SND_SOC_DAIFMT_LEFT_J : + ret = -EINVAL ; +break ; +default : + ret = -EINVAL ; +break ; + } + +switch (fmt &SND_SOC_DAIFMT_MASTER_MASK ) { +case SND_SOC_DAIFMT_CBS_CFS : + ret = -EINVAL ; +break ; +case SND_SOC_DAIFMT_CBM_CFS : + ret = -EINVAL ; +break ; +case SND_SOC_DAIFMT_CBM_CFM : +break ; +case SND_SOC_DAIFMT_CBS_CFM : + ret = -EINVAL ; +break ; +default : + ret = -EINVAL ; +break ; + } + +return ret; +} + +static int bf5xx_i2s_startup (struct snd_pcm_substream *substream) +{ +pr_debug ("%s enter\n" , __func__); + +/*this counter is used for counting how many pcm streams are opened*/ + bf5xx_i2s.counter++; +return 0 ; +} + +static int bf5xx_i2s_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params) +{ +int ret =0 ; + + bf5xx_i2s.tcr2 &= ~0x1f ; + bf5xx_i2s.rcr2 &= ~0x1f ; +switch (params_format (params)) { +case SNDRV_PCM_FORMAT_S16_LE : + bf5xx_i2s.tcr2 |=15 ; + bf5xx_i2s.rcr2 |=15 ; +break ; +case SNDRV_PCM_FORMAT_S24_LE : + bf5xx_i2s.tcr2 |=23 ; + bf5xx_i2s.rcr2 |=23 ; +break ; +case SNDRV_PCM_FORMAT_S32_LE : + bf5xx_i2s.tcr2 |=31 ; + bf5xx_i2s.rcr2 |=31 ; +break ; + } + +if (bf5xx_i2s.counter ==1 ) { +/* +* TX and RX are not independent,they are enabled at the +* same time, even if only one side is running. So, we +* need to configure both of them at the time when the first +* stream is opened. +* +* CPU DAI format:I2S, slave mode. +*/ + ret =sport_config_rx (sport_handle,RFSR |RCKFE , +RSFSE |bf5xx_i2s.rcr2,0 ,0 ); +if (ret) { +pr_err ("SPORT is busy!\n" ); +return -EBUSY ; + } + + ret =sport_config_tx (sport_handle,TFSR |TCKFE , +TSFSE |bf5xx_i2s.tcr2,0 ,0 ); +if (ret) { +pr_err ("SPORT is busy!\n" ); +return -EBUSY ; + } + } + +return 0 ; +} + +static void bf5xx_i2s_shutdown (struct snd_pcm_substream *substream) +{ +pr_debug ("%s enter\n" , __func__); + bf5xx_i2s.counter--; +} + +static int bf5xx_i2s_probe (struct platform_device *pdev, +struct snd_soc_dai *dai) +{ +u16 sport_req[][7 ] = { + {P_SPORT0_DTPRI ,P_SPORT0_TSCLK ,P_SPORT0_RFS , +P_SPORT0_DRPRI ,P_SPORT0_RSCLK ,0 }, + {P_SPORT1_DTPRI ,P_SPORT1_TSCLK ,P_SPORT1_RFS , +P_SPORT1_DRPRI ,P_SPORT1_RSCLK ,0 }, + }; + +pr_debug ("%s enter\n" , __func__); +if (peripheral_request_list (&sport_req[sport_num][0 ],"soc-audio" )) { +pr_err ("Requesting Peripherals failed\n" ); +return -EFAULT ; + } + +/* request DMA for SPORT */ + sport_handle =sport_init (&sport_params[sport_num],4 , \ +2 *sizeof (u32),NULL ); +if (!sport_handle) { +peripheral_free_list (&sport_req[sport_num][0 ]); +return -ENODEV ; + } + +return 0 ; +} + +#ifdef CONFIG_PM +static int bf5xx_i2s_suspend (struct platform_device *dev, +struct snd_soc_dai *dai) +{ +struct sport_device *sport = + (struct sport_device *)dai->private_data; + +pr_debug ("%s : sport %d\n" , __func__, dai->id); +if (!dai->active) +return 0 ; +if (dai->capture.active) +sport_rx_stop (sport); +if (dai->playback.active) +sport_tx_stop (sport); +return 0 ; +} + +static int bf5xx_i2s_resume (struct platform_device *pdev, +struct snd_soc_dai *dai) +{ +int ret; +struct sport_device *sport = + (struct sport_device *)dai->private_data; + +pr_debug ("%s : sport %d\n" , __func__, dai->id); +if (!dai->active) +return 0 ; + + ret =sport_config_rx (sport_handle,RFSR |RCKFE ,RSFSE |0x1f ,0 ,0 ); +if (ret) { +pr_err ("SPORT is busy!\n" ); +return -EBUSY ; + } + + ret =sport_config_tx (sport_handle,TFSR |TCKFE ,TSFSE |0x1f ,0 ,0 ); +if (ret) { +pr_err ("SPORT is busy!\n" ); +return -EBUSY ; + } + +if (dai->capture.active) +sport_rx_start (sport); +if (dai->playback.active) +sport_tx_start (sport); +return 0 ; +} + +#else +#define bf5xx_i2s_suspend NULL +#define bf5xx_i2s_resume NULL +#endif + +#define BF5XX_I2S_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\ + SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | \ + SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | \ + SNDRV_PCM_RATE_96000) + +#define BF5XX_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE |\ + SNDRV_PCM_FMTBIT_S32_LE) + +struct snd_soc_dai bf5xx_i2s_dai = { + .name ="bf5xx-i2s" , + .id =0 , + .type =SND_SOC_DAI_I2S , + .probe = bf5xx_i2s_probe, + .suspend = bf5xx_i2s_suspend, + .resume = bf5xx_i2s_resume, + .playback = { + .channels_min =2 , + .channels_max =2 , + .rates =BF5XX_I2S_RATES , + .formats =BF5XX_I2S_FORMATS ,}, + .capture = { + .channels_min =2 , + .channels_max =2 , + .rates =BF5XX_I2S_RATES , + .formats =BF5XX_I2S_FORMATS ,}, + .ops = { + .startup = bf5xx_i2s_startup, + .shutdown = bf5xx_i2s_shutdown, + .hw_params = bf5xx_i2s_hw_params,}, + .dai_ops = { + .set_fmt = bf5xx_i2s_set_dai_fmt, + }, +}; +EXPORT_SYMBOL_GPL (bf5xx_i2s_dai); + +/* Module information */ +MODULE_AUTHOR ("Cliff Cai" ); +MODULE_DESCRIPTION ("I2S driver for ADI Blackfin" ); +MODULE_LICENSE ("GPL" ); +
sound/soc/blackfin/bf5xx-i2s.h new file +14 -0
@@ -0,0 +1,14 @@ +/* +* linux/sound/arm/bf5xx-i2s.h +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +#ifndef _BF5XX_I2S_H +#define _BF5XX_I2S_H + +extern struct snd_soc_dai bf5xx_i2s_dai; + +#endif
Signature · 1 line
1.5.6.5
PATCH 11/14 ASoC: Blackfin: board driver for AD1980/1 audio codec
From: Cliff Cai <[email protected]>
--- sound/soc/blackfin/bf5xx-ad1980.c | 113 +++++++++++++++++++++++++++++++++++++ 1 files changed, 113 insertions(+), 0 deletions(-) create mode 100644 sound/soc/blackfin/bf5xx-ad1980.c
sound/soc/blackfin/bf5xx-ad1980.c new file +113 -0
@@ -0,0 +1,113 @@ +/* +* File: sound/soc/blackfin/bf5xx-ad1980.c +* Author: Cliff Cai <[email protected]> +* +* Created: Tue June 06 2008 +* Description: Board driver for AD1980/1 audio codec +* +* Modified: +* Copyright 2008 Analog Devices Inc. +* +* Bugs: Enter bugs at http://blackfin.uclinux.org/ +* +* 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. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see the file COPYING, or write +* to the Free Software Foundation, Inc., +* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/device.h> +#include <asm/dma.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> + +#include <linux/gpio.h> +#include <asm/portmux.h> + +#include "../codecs/ad1980.h" +#include "bf5xx-sport.h" +#include "bf5xx-ac97-pcm.h" +#include "bf5xx-ac97.h" + +static struct snd_soc_machine bf5xx_board; + +static int bf5xx_board_startup (struct snd_pcm_substream *substream) +{ +struct snd_soc_pcm_runtime *rtd = substream->private_data; +struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; + +pr_debug ("%s enter\n" , __func__); + cpu_dai->private_data = sport_handle; +return 0 ; +} + +static struct snd_soc_ops bf5xx_board_ops = { + .startup = bf5xx_board_startup, +}; + +static struct snd_soc_dai_link bf5xx_board_dai = { + .name ="AC97" , + .stream_name ="AC97 HiFi" , + .cpu_dai = &bfin_ac97_dai, + .codec_dai = &ad1980_dai, + .ops = &bf5xx_board_ops, +}; + +static struct snd_soc_machine bf5xx_board = { + .name ="bf5xx-board" , + .dai_link = &bf5xx_board_dai, + .num_links =1 , +}; + +static struct snd_soc_device bf5xx_board_snd_devdata = { + .machine = &bf5xx_board, + .platform = &bf5xx_ac97_soc_platform, + .codec_dev = &soc_codec_dev_ad1980, +}; + +static struct platform_device *bf5xx_board_snd_device; + +static int __init bf5xx_board_init (void ) +{ +int ret; + + bf5xx_board_snd_device =platform_device_alloc ("soc-audio" ,-1 ); +if (!bf5xx_board_snd_device) +return -ENOMEM ; + +platform_set_drvdata (bf5xx_board_snd_device, &bf5xx_board_snd_devdata); + bf5xx_board_snd_devdata.dev = &bf5xx_board_snd_device->dev; + ret =platform_device_add (bf5xx_board_snd_device); + +if (ret) +platform_device_put (bf5xx_board_snd_device); + +return ret; +} + +static void __exit bf5xx_board_exit(void) +{ +platform_device_unregister (bf5xx_board_snd_device); +} + +module_init (bf5xx_board_init); +module_exit (bf5xx_board_exit); + +/* Module information */ +MODULE_AUTHOR ("Cliff Cai" ); +MODULE_DESCRIPTION ("ALSA SoC AD1980/1 BF5xx board" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.6.5
PATCH 12/14 ASoC: Blackfin: board driver for SSM2602 sound chip
From: Cliff Cai <[email protected]>
--- sound/soc/blackfin/bf5xx-ssm2602.c | 186 ++++++++++++++++++++++++++++++++++++ 1 files changed, 186 insertions(+), 0 deletions(-) create mode 100644 sound/soc/blackfin/bf5xx-ssm2602.c
sound/soc/blackfin/bf5xx-ssm2602.c new file +186 -0
@@ -0,0 +1,186 @@ +/* +* File: sound/soc/blackfin/bf5xx-ssm2602.c +* Author: Cliff Cai <[email protected]> +* +* Created: Tue June 06 2008 +* Description: board driver for SSM2602 sound chip +* +* Modified: +* Copyright 2008 Analog Devices Inc. +* +* Bugs: Enter bugs at http://blackfin.uclinux.org/ +* +* 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. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, see the file COPYING, or write +* to the Free Software Foundation, Inc., +* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/device.h> + +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/soc.h> +#include <sound/soc-dapm.h> +#include <sound/pcm_params.h> + +#include <asm/dma.h> +#include <asm/portmux.h> +#include <linux/gpio.h> +#include "../codecs/ssm2602.h" +#include "bf5xx-sport.h" +#include "bf5xx-i2s-pcm.h" +#include "bf5xx-i2s.h" + +static struct snd_soc_machine bf5xx_ssm2602; + +static int bf5xx_ssm2602_startup (struct snd_pcm_substream *substream) +{ +struct snd_soc_pcm_runtime *rtd = substream->private_data; +struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; + +pr_debug ("%s enter\n" , __func__); + cpu_dai->private_data = sport_handle; +return 0 ; +} + +static int bf5xx_ssm2602_hw_params (struct snd_pcm_substream *substream, +struct snd_pcm_hw_params *params) +{ +struct snd_soc_pcm_runtime *rtd = substream->private_data; +struct snd_soc_dai *codec_dai = rtd->dai->codec_dai; +struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai; +unsigned int clk =0 ; +int ret =0 ; + +pr_debug ("%s rate %d format %x\n" , __func__,params_rate (params), +params_format (params)); +/* +* If you are using a crystal source which frequency is not 12MHz +* then modify the below case statement with frequency of the crystal. +* +* If you are using the SPORT to generate clocking then this is +* where to do it. +*/ + +switch (params_rate (params)) { +case 8000 : +case 16000 : +case 48000 : +case 96000 : +case 11025 : +case 22050 : +case 44100 : + clk =12000000 ; +break ; + } + +/* +* CODEC is master for BCLK and LRC in this configuration. +*/ + +/* set codec DAI configuration */ + ret = codec_dai->dai_ops.set_fmt (codec_dai,SND_SOC_DAIFMT_I2S | +SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_CBM_CFM ); +if (ret <0 ) +return ret; +/* set cpu DAI configuration */ + ret = cpu_dai->dai_ops.set_fmt (cpu_dai,SND_SOC_DAIFMT_I2S | +SND_SOC_DAIFMT_NB_NF |SND_SOC_DAIFMT_CBM_CFM ); +if (ret <0 ) +return ret; + + ret = codec_dai->dai_ops.set_sysclk (codec_dai,SSM2602_SYSCLK , clk, +SND_SOC_CLOCK_IN ); +if (ret <0 ) +return ret; + +return 0 ; +} + +static struct snd_soc_ops bf5xx_ssm2602_ops = { + .startup = bf5xx_ssm2602_startup, + .hw_params = bf5xx_ssm2602_hw_params, +}; + +static struct snd_soc_dai_link bf5xx_ssm2602_dai = { + .name ="ssm2602" , + .stream_name ="SSM2602" , + .cpu_dai = &bf5xx_i2s_dai, + .codec_dai = &ssm2602_dai, + .ops = &bf5xx_ssm2602_ops, +}; + +/* +* SSM2602 2 wire address is determined by CSB +* state during powerup. +* low = 0x1a +* high = 0x1b +*/ + +static struct ssm2602_setup_data bf5xx_ssm2602_setup = { + .i2c_bus =0 , + .i2c_address =0x1b , +}; + +static struct snd_soc_machine bf5xx_ssm2602 = { + .name ="bf5xx_ssm2602" , + .dai_link = &bf5xx_ssm2602_dai, + .num_links =1 , +}; + +static struct snd_soc_device bf5xx_ssm2602_snd_devdata = { + .machine = &bf5xx_ssm2602, + .platform = &bf5xx_i2s_soc_platform, + .codec_dev = &soc_codec_dev_ssm2602, + .codec_data = &bf5xx_ssm2602_setup, +}; + +static struct platform_device *bf52x_ssm2602_snd_device; + +static int __init bf5xx_ssm2602_init (void ) +{ +int ret; + +pr_debug ("%s enter\n" , __func__); + bf52x_ssm2602_snd_device =platform_device_alloc ("soc-audio" ,-1 ); +if (!bf52x_ssm2602_snd_device) +return -ENOMEM ; + +platform_set_drvdata (bf52x_ssm2602_snd_device, + &bf5xx_ssm2602_snd_devdata); + bf5xx_ssm2602_snd_devdata.dev = &bf52x_ssm2602_snd_device->dev; + ret =platform_device_add (bf52x_ssm2602_snd_device); + +if (ret) +platform_device_put (bf52x_ssm2602_snd_device); + +return ret; +} + +static void __exit bf5xx_ssm2602_exit(void) +{ +pr_debug ("%s enter\n" , __func__); +platform_device_unregister (bf52x_ssm2602_snd_device); +} + +module_init (bf5xx_ssm2602_init); +module_exit (bf5xx_ssm2602_exit); + +/* Module information */ +MODULE_AUTHOR ("Cliff Cai" ); +MODULE_DESCRIPTION ("ALSA SoC SSM2602 BF527-EZKIT" ); +MODULE_LICENSE ("GPL" ); +
Signature · 1 line
1.5.6.5
PATCH 13/14 ASoC: Blackfin: add Blackfin arch ASoC Kconfig and Makefile
From: Cliff Cai <[email protected]>
--- sound/soc/blackfin/Kconfig | 85 +++++++++++++++++++++++++++++++++++++++++++ sound/soc/blackfin/Makefile | 20 ++++++++++ 2 files changed, 105 insertions(+), 0 deletions(-) create mode 100644 sound/soc/blackfin/Kconfig create mode 100644 sound/soc/blackfin/Makefile
sound/soc/blackfin/Kconfig new file +85 -0
@@ -0,0 +1,85 @@ +config SND_BF5XX_I2S + tristate "SoC I2S Audio for the ADI BF5xx chip" + depends on BLACKFIN && SND_SOC + help + Say Y or M if you want to add support for codecs attached to + the Blackfin SPORT (synchronous serial ports) interface in I2S + mode (supports single stereo In/Out). + You will also need to select the audio interfaces to support below. + +config SND_BF5XX_SOC_SSM2602 + tristate "SoC SSM2602 Audio support for BF52x ezkit" + depends on SND_BF5XX_I2S + select SND_BF5XX_SOC_I2S + select SND_SOC_SSM2602 + select I2C + select I2C_BLACKFIN_TWI + help + Say Y if you want to add support for SoC audio on BF527-EZKIT. + +config SND_BF5XX_AC97 + tristate "SoC AC97 Audio for the ADI BF5xx chip" + depends on BLACKFIN && SND_SOC + help + Say Y or M if you want to add support for codecs attached to + the Blackfin SPORT (synchronous serial ports) interface in slot 16 + mode (pseudo AC97 interface). + You will also need to select the audio interfaces to support below. + + Note: + AC97 codecs which do not implment the slot-16 mode will not function + properly with this driver. This driver is known to work with the + Analog Devices line of AC97 codecs. + +config SND_MMAP_SUPPORT + bool "Enable MMAP Support" + depends on SND_BF5XX_AC97 + default y + help + Say y if you want AC97 driver to support mmap mode. + We introduce an intermediate buffer to simulate mmap. + +config SND_BF5XX_SOC_SPORT + tristate + +config SND_BF5XX_SOC_I2S + tristate + select SND_BF5XX_SOC_SPORT + +config SND_BF5XX_SOC_AC97 + tristate + select AC97_BUS + select SND_SOC_AC97_BUS + select SND_BF5XX_SOC_SPORT + +config SND_BF5XX_SOC_AD1980 + tristate "SoC AD1980/1 Audio support for BF5xx" + depends on SND_BF5XX_AC97 + select SND_BF5XX_SOC_AC97 + select SND_SOC_AD1980 + help + Say Y if you want to add support for SoC audio on BF5xx STAMP/EZKIT. + +config SND_BF5XX_SPORT_NUM + int "Set a SPORT for Sound chip" + depends on (SND_BF5XX_I2S || SND_BF5XX_AC97) + range 0 3 if BF54x + range 0 1 if (BF53x || BF561) + default 0 + help + Set the correct SPORT for sound chip. + +config SND_BF5XX_HAVE_COLD_RESET + bool "BOARD has COLD Reset GPIO" + depends on SND_BF5XX_AC97 + default y if BFIN548_EZKIT + default n if !BFIN548_EZKIT + +config SND_BF5XX_RESET_GPIO_NUM + int "Set a GPIO for cold reset" + depends on SND_BF5XX_HAVE_COLD_RESET + range 0 159 + default 19 if BFIN548_EZKIT + default 5 if BFIN537_STAMP + help + Set the correct GPIO for RESET the sound chip.
sound/soc/blackfin/Makefile new file +20 -0
@@ -0,0 +1,20 @@ +# Blackfin Platform Support +snd-bf5xx-ac97-objs := bf5xx-ac97-pcm.o +snd-bf5xx-i2s-objs := bf5xx-i2s-pcm.o +snd-soc-bf5xx-sport-objs := bf5xx-sport.o +snd-soc-bf5xx-ac97-objs := bf5xx-ac97.o +snd-soc-bf5xx-i2s-objs := bf5xx-i2s.o + +obj-$(CONFIG_SND_BF5XX_AC97) += snd-bf5xx-ac97.o +obj-$(CONFIG_SND_BF5XX_I2S) += snd-bf5xx-i2s.o +obj-$(CONFIG_SND_BF5XX_SOC_SPORT) += snd-soc-bf5xx-sport.o +obj-$(CONFIG_SND_BF5XX_SOC_AC97) += snd-soc-bf5xx-ac97.o +obj-$(CONFIG_SND_BF5XX_SOC_I2S) += snd-soc-bf5xx-i2s.o + +# Blackfin Machine Support +snd-ad1980-objs := bf5xx-ad1980.o +snd-ssm2602-objs := bf5xx-ssm2602.o + + +obj-$(CONFIG_SND_BF5XX_SOC_AD1980) += snd-ad1980.o +obj-$(CONFIG_SND_BF5XX_SOC_SSM2602) += snd-ssm2602.o
Signature · 1 line
1.5.6.5
PATCH 14/14 ASoC: Blackfin: Include Blackfin architecture support in build
From: Cliff Cai <[email protected]>
--- sound/soc/Kconfig | 1 + sound/soc/Makefile | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
sound/soc/Kconfig +1 -0
@@ -31,6 +31,7 @@ source "sound/soc/sh/Kconfig" source "sound/soc/fsl/Kconfig" source "sound/soc/davinci/Kconfig" source "sound/soc/omap/Kconfig" +source "sound/soc/blackfin/Kconfig" # Supported codecs source "sound/soc/codecs/Kconfig"
sound/soc/Makefile +1 -1
@@ -2,4 +2,4 @@ snd-soc-core-objs := soc-core.o soc-dapm.o obj-$(CONFIG_SND_SOC) += snd-soc-core.o obj-$(CONFIG_SND_SOC) += codecs/ at32/ at91/ pxa/ s3c24xx/ sh/ fsl/ davinci/ -obj-$(CONFIG_SND_SOC) += omap/ au1x/ +obj-$(CONFIG_SND_SOC) += omap/ au1x/ blackfin/
Signature · 1 line
1.5.6.5
At Fri, 5 Sep 2008 15:35:05 +0100,
Quoted 8 lines · Mark Brown
The following changes since commit
44e2c3045f77c69d18ba4afda888a4cdec4a33fd:
Cliff Cai (1):
ALSA: ASoC codec: fix compiling error in ad1980 driver after ASoC API changedare available in the git repository at:
git://opensource.wolfsonmicro.com/linux-2.6-asocfor-tiwai
Thanks, pulled in, and pushed out now.
Takashi