ASoC: Add AK4535 driver
Subsystems (3)
PATCH 1/2 ASoC: Add AK4535 driver
From: Richard Purdie <[email protected]>
The AK4535 codec is included in some HP iPAQ systems.
This driver was originally written by Richard Purdie and with some bug fixes from Milan Plzik. While out of tree it has also had some mechanical updates for new APIs and current best practices from Liam Girdwood, Graeme Gregory and Mark Brown.
Signed-off-by Richard Purdie <[email protected]>
Signed-off-by Milan Plzik <[email protected]>
Signed-off-by Liam Girdwood <[email protected]>
Signed-off-by Graeme Gregory <[email protected]>
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/Kconfig | 3 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/ak4535.c | 696 +++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/ak4535.h | 46 +++ 4 files changed, 747 insertions(+), 0 deletions(-) create mode 100644 sound/soc/codecs/ak4535.c create mode 100644 sound/soc/codecs/ak4535.h
sound/soc/codecs/Kconfig +3 -0
@@ -2,6 +2,9 @@ config SND_SOC_AC97_CODEC tristate select SND_AC97_CODEC +config SND_SOC_AK4535 + tristate + config SND_SOC_UDA1380 tristate
sound/soc/codecs/Makefile +2 -0
@@ -1,4 +1,5 @@ snd-soc-ac97-objs := ac97.o +snd-soc-ak4535-objs := ak4535.o snd-soc-uda1380-objs := uda1380.o snd-soc-wm8510-objs := wm8510.o snd-soc-wm8731-objs := wm8731.o
@@ -11,6 +12,7 @@ snd-soc-cs4270-objs := cs4270.o snd-soc-tlv320aic3x-objs := tlv320aic3x.o obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o +obj-$(CONFIG_SND_SOC_AK4535) += snd-soc-ak4535.o obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o obj-$(CONFIG_SND_SOC_WM8510) += snd-soc-wm8510.o obj-$(CONFIG_SND_SOC_WM8731) += snd-soc-wm8731.o
sound/soc/codecs/ak4535.c new file +696 -0
696 lines not on this page · raw message
sound/soc/codecs/ak4535.h new file +46 -0
46 lines not on this page · raw message
Signature · 1 line
1.5.6
PATCH 2/2 ASoC: Replace custom debug macros with pr_ equivalents
Several ASoC codec drivers use custom macros equivalent to the standard pr_ macros, most of which are not actually used. Replace these custom macros with the standard ones.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8510.c | 25 +++---------------------- sound/soc/codecs/wm8731.c | 25 +++---------------------- sound/soc/codecs/wm8750.c | 25 +++---------------------- sound/soc/codecs/wm8753.c | 25 +++---------------------- sound/soc/codecs/wm8990.c | 25 +++---------------------- 5 files changed, 15 insertions(+), 110 deletions(-)
sound/soc/codecs/wm8510.c +3 -22
@@ -30,25 +30,6 @@#define AUDIO_NAME "wm8510"#define WM8510_VERSION "0.6" -/* -* Debug -*/ - -#define WM8510_DEBUG 0 - -#ifdef WM8510_DEBUG -#define dbg(format, arg...) \ - printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg) -#else -#define dbg(format, arg...) do {} while (0) -#endif -#define err(format, arg...) \ - printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg) -#define info(format, arg...) \ - printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg) -#define warn(format, arg...) \ - printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg) -struct snd_soc_codec_device soc_codec_dev_wm8510;/*
@@ -721,13 +702,13 @@ static int wm8510_codec_probe(struct i2c_adapter *adap, int addr, int kind) ret =i2c_attach_client (i2c);if (ret <0 ) { -err ("failed to attach codec at addr %x\n" , addr); +pr_err ("failed to attach codec at addr %x\n" , addr); goto err; } ret =wm8510_init (socdev);if (ret <0 ) { -err ("failed to initialise WM8510\n" ); +pr_err ("failed to initialise WM8510\n" ); goto err; }return ret;
@@ -777,7 +758,7 @@ static int wm8510_probe(struct platform_device *pdev)struct snd_soc_codec *codec;int ret =0 ; -info ("WM8510 Audio Codec %s" ,WM8510_VERSION ); +pr_info ("WM8510 Audio Codec %s" ,WM8510_VERSION ); setup = socdev->codec_data; codec =kzalloc (sizeof (struct snd_soc_codec ),GFP_KERNEL );
sound/soc/codecs/wm8731.c +3 -22
@@ -31,25 +31,6 @@#define AUDIO_NAME "wm8731"#define WM8731_VERSION "0.13" -/* -* Debug -*/ - -#define WM8731_DEBUG 0 - -#ifdef WM8731_DEBUG -#define dbg(format, arg...) \ - printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg) -#else -#define dbg(format, arg...) do {} while (0) -#endif -#define err(format, arg...) \ - printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg) -#define info(format, arg...) \ - printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg) -#define warn(format, arg...) \ - printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg) -struct snd_soc_codec_device soc_codec_dev_wm8731;/* codec private data */
@@ -624,13 +605,13 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind) ret =i2c_attach_client (i2c);if (ret <0 ) { -err ("failed to attach codec at addr %x\n" , addr); +pr_err ("failed to attach codec at addr %x\n" , addr); goto err; } ret =wm8731_init (socdev);if (ret <0 ) { -err ("failed to initialise WM8731\n" ); +pr_err ("failed to initialise WM8731\n" ); goto err; }return ret;
@@ -681,7 +662,7 @@ static int wm8731_probe(struct platform_device *pdev)struct wm8731_priv *wm8731;int ret =0 ; -info ("WM8731 Audio Codec %s" ,WM8731_VERSION ); +pr_info ("WM8731 Audio Codec %s" ,WM8731_VERSION ); setup = socdev->codec_data; codec =kzalloc (sizeof (struct snd_soc_codec ),GFP_KERNEL );
sound/soc/codecs/wm8750.c +3 -22
@@ -31,25 +31,6 @@#define AUDIO_NAME "WM8750"#define WM8750_VERSION "0.12" -/* -* Debug -*/ - -#define WM8750_DEBUG 0 - -#ifdef WM8750_DEBUG -#define dbg(format, arg...) \ - printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg) -#else -#define dbg(format, arg...) do {} while (0) -#endif -#define err(format, arg...) \ - printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg) -#define info(format, arg...) \ - printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg) -#define warn(format, arg...) \ - printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg) -/* codec private data */ struct wm8750_priv {unsigned int sysclk;
@@ -896,13 +877,13 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) ret =i2c_attach_client (i2c);if (ret <0 ) { -err ("failed to attach codec at addr %x\n" , addr); +pr_err ("failed to attach codec at addr %x\n" , addr); goto err; } ret =wm8750_init (socdev);if (ret <0 ) { -err ("failed to initialise WM8750\n" ); +pr_err ("failed to initialise WM8750\n" ); goto err; }return ret;
@@ -953,7 +934,7 @@ static int wm8750_probe(struct platform_device *pdev)struct wm8750_priv *wm8750;int ret =0 ; -info ("WM8750 Audio Codec %s" ,WM8750_VERSION ); +pr_info ("WM8750 Audio Codec %s" ,WM8750_VERSION ); codec =kzalloc (sizeof (struct snd_soc_codec ),GFP_KERNEL );if (codec ==NULL )return -ENOMEM ;
sound/soc/codecs/wm8753.c +3 -22
@@ -55,25 +55,6 @@#define AUDIO_NAME "wm8753"#define WM8753_VERSION "0.16" -/* -* Debug -*/ - -#define WM8753_DEBUG 0 - -#ifdef WM8753_DEBUG -#define dbg(format, arg...) \ - printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg) -#else -#define dbg(format, arg...) do {} while (0) -#endif -#define err(format, arg...) \ - printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg) -#define info(format, arg...) \ - printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg) -#define warn(format, arg...) \ - printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg) -static int caps_charge =2000 ;module_param (caps_charge, int,0 );MODULE_PARM_DESC (caps_charge,"WM8753 cap charge time (msecs)" );
@@ -1689,13 +1670,13 @@ static int wm8753_codec_probe(struct i2c_adapter *adap, int addr, int kind) ret =i2c_attach_client (i2c);if (ret <0 ) { -err ("failed to attach codec at addr %x\n" , addr); +pr_err ("failed to attach codec at addr %x\n" , addr); goto err; } ret =wm8753_init (socdev);if (ret <0 ) { -err ("failed to initialise WM8753\n" ); +pr_err ("failed to initialise WM8753\n" ); goto err; }
@@ -1747,7 +1728,7 @@ static int wm8753_probe(struct platform_device *pdev)struct wm8753_priv *wm8753;int ret =0 ; -info ("WM8753 Audio Codec %s" ,WM8753_VERSION ); +pr_info ("WM8753 Audio Codec %s" ,WM8753_VERSION ); setup = socdev->codec_data; codec =kzalloc (sizeof (struct snd_soc_codec ),GFP_KERNEL );
sound/soc/codecs/wm8990.c +3 -22
@@ -33,25 +33,6 @@#define AUDIO_NAME "wm8990"#define WM8990_VERSION "0.2" -/* -* Debug -*/ - -#define WM8990_DEBUG 0 - -#ifdef WM8990_DEBUG -#define dbg(format, arg...) \ - printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg) -#else -#define dbg(format, arg...) do {} while (0) -#endif -#define err(format, arg...) \ - printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg) -#define info(format, arg...) \ - printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg) -#define warn(format, arg...) \ - printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg) -/* codec private data */ struct wm8990_priv {unsigned int sysclk;
@@ -1524,13 +1505,13 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind) ret =i2c_attach_client (i2c);if (ret <0 ) { -err ("failed to attach codec at addr %x\n" , addr); +pr_err ("failed to attach codec at addr %x\n" , addr); goto err; } ret =wm8990_init (socdev);if (ret <0 ) { -err ("failed to initialise WM8990\n" ); +pr_err ("failed to initialise WM8990\n" ); goto err; }return ret;
@@ -1579,7 +1560,7 @@ static int wm8990_probe(struct platform_device *pdev)struct wm8990_priv *wm8990;int ret =0 ; -info ("WM8990 Audio Codec %s\n" ,WM8990_VERSION ); +pr_info ("WM8990 Audio Codec %s\n" ,WM8990_VERSION ); setup = socdev->codec_data; codec =kzalloc (sizeof (struct snd_soc_codec ),GFP_KERNEL );
Signature · 1 line
1.5.6