ASoC: ak4535: Remove -codec from driver name
PATCH 1/4 ASoC: ak4535: Remove -codec from driver name
Redundant, the device is only a CODEC.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/ak4535.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
sound/soc/codecs/ak4535.c +1 -1
@@ -443,7 +443,7 @@ MODULE_DEVICE_TABLE(i2c, ak4535_i2c_id);static struct i2c_driver ak4535_i2c_driver = { .driver = { - .name ="ak4535-codec" , + .name ="ak4535" , .owner =THIS_MODULE , }, .probe = ak4535_i2c_probe,
Signature · 1 line
1.7.9.rc1
PATCH 2/4 ASoC: ak4535: Make I2C usage unconditional
Convert to module_i2c_driver() too.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/ak4535.c | 24 +----------------------- 1 files changed, 1 insertions(+), 23 deletions(-)
sound/soc/codecs/ak4535.c +1 -23
@@ -409,7 +409,6 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4535 = { .num_dapm_routes = ARRAY_SIZE(ak4535_audio_map), }; -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )static __devinit int ak4535_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {
@@ -450,29 +449,8 @@ static struct i2c_driver ak4535_i2c_driver = { .remove = __devexit_p(ak4535_i2c_remove), .id_table = ak4535_i2c_id, }; -#endif -static int __init ak4535_modinit (void ) -{ -int ret =0 ; -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE ) - ret =i2c_add_driver (&ak4535_i2c_driver); -if (ret !=0 ) { -printk (KERN_ERR "Failed to register AK4535 I2C driver: %d\n" , - ret); - } -#endif -return ret; -} -module_init (ak4535_modinit); - -static void __exit ak4535_exit(void) -{ -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE ) -i2c_del_driver (&ak4535_i2c_driver); -#endif -} -module_exit (ak4535_exit); +module_i2c_driver (ak4535_i2c_driver);MODULE_DESCRIPTION ("Soc AK4535 driver" );MODULE_AUTHOR ("Richard Purdie" );
Signature · 1 line
1.7.9.rc1
PATCH 3/4 ASoC: ak4535: Remove bitrotted driver version
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/ak4535.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
sound/soc/codecs/ak4535.c +0 -4
@@ -27,8 +27,6 @@#include "ak4535.h" -#define AK4535_VERSION "0.3" -/* codec private data */ struct ak4535_priv {unsigned int sysclk;
@@ -372,8 +370,6 @@ static int ak4535_probe(struct snd_soc_codec *codec)struct ak4535_priv *ak4535 =snd_soc_codec_get_drvdata (codec);int ret; -printk (KERN_INFO "AK4535 Audio Codec %s" ,AK4535_VERSION ); - ret =snd_soc_codec_set_cache_io (codec,8 ,8 , ak4535->control_type);if (ret <0 ) {dev_err (codec->dev,"Failed to set cache I/O: %d\n" , ret);
Signature · 1 line
1.7.9.rc1
PATCH 4/4 ASoC: ak4535: Convert to direct regmap API usage
In reply to Mark BrownI suspect the timer register may also be volatile.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/ak4535.c | 66 +++++++++++++++++++++++++++++++++++++------- sound/soc/codecs/ak4535.h | 2 - 2 files changed, 55 insertions(+), 13 deletions(-)
sound/soc/codecs/ak4535.c +55 -11
@@ -18,6 +18,7 @@#include <linux/delay.h> #include <linux/pm.h> #include <linux/i2c.h> +#include <linux/regmap.h> #include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h>
@@ -29,20 +30,41 @@/* codec private data */ struct ak4535_priv { +struct regmap *regmap;unsigned int sysclk; -enum snd_soc_control_type control_type; };/* * ak4535 register cache */ -static const u8 ak4535_reg[AK4535_CACHEREGNUM ] = { -0x00 ,0x80 ,0x00 ,0x03 , -0x02 ,0x00 ,0x11 ,0x01 , -0x00 ,0x40 ,0x36 ,0x10 , -0x00 ,0x00 ,0x57 ,0x00 , +static const struct reg_default ak4535_reg_defaults[] = { + {0 ,0x00 }, + {1 ,0x80 }, + {2 ,0x00 }, + {3 ,0x03 }, + {4 ,0x02 }, + {5 ,0x00 }, + {6 ,0x11 }, + {7 ,0x01 }, + {8 ,0x00 }, + {9 ,0x40 }, + {10 ,0x36 }, + {11 ,0x10 }, + {12 ,0x00 }, + {13 ,0x00 }, + {14 ,0x57 }, }; +static bool ak4535_volatile (struct device *dev,unsigned int reg) +{ +switch (reg) { +case AK4535_STATUS : +return true; +default : +return false; + } +} +static const char *ak4535_mono_gain[] = {"+6dB" ,"-17dB" };static const char *ak4535_mono_out[] = {"(L + R)/2" ,"Hi-Z" };static const char *ak4535_hp_out[] = {"Stereo" ,"Mono" };
@@ -370,7 +392,8 @@ static int ak4535_probe(struct snd_soc_codec *codec)struct ak4535_priv *ak4535 =snd_soc_codec_get_drvdata (codec);int ret; - ret =snd_soc_codec_set_cache_io (codec,8 ,8 , ak4535->control_type); + codec->control_data = ak4535->regmap; + ret =snd_soc_codec_set_cache_io (codec,8 ,8 ,SND_SOC_REGMAP );if (ret <0 ) {dev_err (codec->dev,"Failed to set cache I/O: %d\n" , ret);return ret;
@@ -390,15 +413,24 @@ static int ak4535_remove(struct snd_soc_codec *codec)return 0 ; } +static const struct regmap_config ak4535_regmap = { + .reg_bits =8 , + .val_bits =8 , + + .max_register =AK4535_STATUS , + .volatile_reg = ak4535_volatile, + + .cache_type =REGCACHE_RBTREE , + .reg_defaults = ak4535_reg_defaults, + .num_reg_defaults =ARRAY_SIZE (ak4535_reg_defaults), +}; +static struct snd_soc_codec_driver soc_codec_dev_ak4535 = { .probe = ak4535_probe, .remove = ak4535_remove, .suspend = ak4535_suspend, .resume = ak4535_resume, .set_bias_level = ak4535_set_bias_level, - .reg_cache_size =ARRAY_SIZE (ak4535_reg), - .reg_word_size =sizeof (u8), - .reg_cache_default = ak4535_reg, .dapm_widgets = ak4535_dapm_widgets, .num_dapm_widgets =ARRAY_SIZE (ak4535_dapm_widgets), .dapm_routes = ak4535_audio_map,
@@ -416,17 +448,29 @@ static __devinit int ak4535_i2c_probe(struct i2c_client *i2c,if (ak4535 ==NULL )return -ENOMEM ; + ak4535->regmap =regmap_init_i2c (i2c, &ak4535_regmap); +if (IS_ERR (ak4535->regmap)) { + ret =PTR_ERR (ak4535->regmap); +dev_err (&i2c->dev,"Failed to init regmap: %d\n" , ret); +return ret; + } +i2c_set_clientdata (i2c, ak4535); - ak4535->control_type =SND_SOC_I2C ; ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_ak4535, &ak4535_dai,1 ); +if (ret !=0 ) +regmap_exit (ak4535->regmap); +return ret; } static __devexit int ak4535_i2c_remove(struct i2c_client *client) { +struct ak4535_priv *ak4535 =i2c_get_clientdata (client); +snd_soc_unregister_codec (&client->dev); +regmap_exit (ak4535->regmap);return 0 ; }
sound/soc/codecs/ak4535.h +0 -2
@@ -34,6 +34,4 @@#define AK4535_VOL 0xe#define AK4535_STATUS 0xf -#define AK4535_CACHEREGNUM 0x10 -#endif
Signature · 1 line
1.7.9.rc1