ASoC: wm8804: Split out bus drivers
Subsystems (3)
PATCH 1/2 ASoC: wm8804: Split out bus drivers
From: Charles Keepax <[email protected]>
Simplify dependencies by using new style split out bus interfaces.
--- sound/soc/codecs/Kconfig | 18 +++++- sound/soc/codecs/Makefile | 4 + sound/soc/codecs/wm8804-i2c.c | 64 +++++++++++++++++++ sound/soc/codecs/wm8804-spi.c | 56 ++++++++++++++++ sound/soc/codecs/wm8804.c | 139 +++++------------------------------------ sound/soc/codecs/wm8804.h | 7 ++ 6 files changed, 162 insertions(+), 126 deletions(-) create mode 100644 sound/soc/codecs/wm8804-i2c.c create mode 100644 sound/soc/codecs/wm8804-spi.c
sound/soc/codecs/Kconfig +15 -3
@@ -141,7 +141,8 @@ config SND_SOC_ALL_CODECS select SND_SOC_WM8770 if SPI_MASTER select SND_SOC_WM8776 if SND_SOC_I2C_AND_SPI select SND_SOC_WM8782 - select SND_SOC_WM8804 if SND_SOC_I2C_AND_SPI + select SND_SOC_WM8804_I2C if I2C + select SND_SOC_WM8804_SPI if SPI_MASTER select SND_SOC_WM8900 if I2C select SND_SOC_WM8903 if I2C select SND_SOC_WM8904 if I2C
@@ -744,8 +745,19 @@ config SND_SOC_WM8782 tristate config SND_SOC_WM8804 - tristate "Wolfson Microelectronics WM8804 S/PDIF transceiver" - depends on SND_SOC_I2C_AND_SPI + tristate + +config SND_SOC_WM8804_I2C + tristate "Wolfson Microelectronics WM8804 S/PDIF transceiver I2C" + depends on I2C + select SND_SOC_WM8804 + select REGMAP_I2C + +config SND_SOC_WM8804_SPI + tristate "Wolfson Microelectronics WM8804 S/PDIF transceiver SPI" + depends on SPI_MASTER + select SND_SOC_WM8804 + select REGMAP_SPI config SND_SOC_WM8900 tristate
sound/soc/codecs/Makefile +4 -0
@@ -145,6 +145,8 @@ snd-soc-wm8770-objs := wm8770.o snd-soc-wm8776-objs := wm8776.o snd-soc-wm8782-objs := wm8782.o snd-soc-wm8804-objs := wm8804.o +snd-soc-wm8804-i2c-objs := wm8804-i2c.o +snd-soc-wm8804-spi-objs := wm8804-spi.o snd-soc-wm8900-objs := wm8900.o snd-soc-wm8903-objs := wm8903.o snd-soc-wm8904-objs := wm8904.o
@@ -323,6 +325,8 @@ obj-$(CONFIG_SND_SOC_WM8770) += snd-soc-wm8770.o obj-$(CONFIG_SND_SOC_WM8776) += snd-soc-wm8776.o obj-$(CONFIG_SND_SOC_WM8782) += snd-soc-wm8782.o obj-$(CONFIG_SND_SOC_WM8804) += snd-soc-wm8804.o +obj-$(CONFIG_SND_SOC_WM8804_I2C) += snd-soc-wm8804-i2c.o +obj-$(CONFIG_SND_SOC_WM8804_SPI) += snd-soc-wm8804-spi.o obj-$(CONFIG_SND_SOC_WM8900) += snd-soc-wm8900.o obj-$(CONFIG_SND_SOC_WM8903) += snd-soc-wm8903.o obj-$(CONFIG_SND_SOC_WM8904) += snd-soc-wm8904.o
sound/soc/codecs/wm8804-i2c.c new file +64 -0
64 lines not on this page · raw message
sound/soc/codecs/wm8804-spi.c new file +56 -0
56 lines not on this page · raw message
sound/soc/codecs/wm8804.c +16 -123
189 lines not on this page · raw message
sound/soc/codecs/wm8804.h +7 -0
@@ -13,6 +13,8 @@#ifndef _WM8804_H#define _WM8804_H +#include <linux/regmap.h> +/* * Register values. */
@@ -62,4 +64,9 @@#define WM8804_MCLKDIV_256FS 0#define WM8804_MCLKDIV_128FS 1 +extern const struct regmap_config wm8804_regmap_config; + +int wm8804_probe (struct device *dev,struct regmap *regmap); +void wm8804_remove (struct device *dev); +#endif /* _WM8804_H */
Signature · 1 line
1.7.2.5
PATCH 2/2 ASoC: wm8804: Merge CODEC probe and bus probe
From: Charles Keepax <[email protected]>
All of the things in the CODEC probe, such as getting the regulators and verifying the chip ID, are better done in bus probe. It is better to fail during bus probe if this is the wrong chip and all resource allocation should be done in the bus probe anyway. This patch merges the CODEC probe into bus probe.
--- sound/soc/codecs/wm8804.c | 180 ++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 98 deletions(-)
sound/soc/codecs/wm8804.c +82 -98
@@ -182,9 +182,9 @@ static bool wm8804_volatile(struct device *dev, unsigned int reg) } } -static int wm8804_reset (struct snd_soc_codec *codec) +static int wm8804_reset (struct wm8804_priv *wm8804) { -return snd_soc_write (codec,WM8804_RST_DEVID1 ,0x0 ); +return regmap_write (wm8804->regmap,WM8804_RST_DEVID1 ,0x0 ); }static int wm8804_set_fmt (struct snd_soc_dai *dai,unsigned int fmt)
@@ -515,100 +515,6 @@ static int wm8804_set_bias_level(struct snd_soc_codec *codec,return 0 ; } -static int wm8804_codec_remove (struct snd_soc_codec *codec) -{ -struct wm8804_priv *wm8804; -int i; - - wm8804 =snd_soc_codec_get_drvdata (codec); - -for (i =0 ; i <ARRAY_SIZE (wm8804->supplies); ++i) -regulator_unregister_notifier (wm8804->supplies[i].consumer, - &wm8804->disable_nb[i]); -return 0 ; -} - -static int wm8804_codec_probe (struct snd_soc_codec *codec) -{ -struct wm8804_priv *wm8804; -int i, id1, id2, ret; - - wm8804 =snd_soc_codec_get_drvdata (codec); - -for (i =0 ; i <ARRAY_SIZE (wm8804->supplies); i++) - wm8804->supplies[i].supply = wm8804_supply_names[i]; - - ret =devm_regulator_bulk_get (codec->dev,ARRAY_SIZE (wm8804->supplies), - wm8804->supplies); -if (ret) { -dev_err (codec->dev,"Failed to request supplies: %d\n" , ret); -return ret; - } - - wm8804->disable_nb[0 ].notifier_call = wm8804_regulator_event_0; - wm8804->disable_nb[1 ].notifier_call = wm8804_regulator_event_1; - -/* This should really be moved into the regulator core */ -for (i =0 ; i <ARRAY_SIZE (wm8804->supplies); i++) { - ret =regulator_register_notifier (wm8804->supplies[i].consumer, - &wm8804->disable_nb[i]); -if (ret !=0 ) { -dev_err (codec->dev, -"Failed to register regulator notifier: %d\n" , - ret); - } - } - - ret =regulator_bulk_enable (ARRAY_SIZE (wm8804->supplies), - wm8804->supplies); -if (ret) { -dev_err (codec->dev,"Failed to enable supplies: %d\n" , ret); -return ret; - } - - id1 =snd_soc_read (codec,WM8804_RST_DEVID1 ); -if (id1 <0 ) { -dev_err (codec->dev,"Failed to read device ID: %d\n" , id1); - ret = id1; - goto err_reg_enable; - } - - id2 =snd_soc_read (codec,WM8804_DEVID2 ); -if (id2 <0 ) { -dev_err (codec->dev,"Failed to read device ID: %d\n" , id2); - ret = id2; - goto err_reg_enable; - } - - id2 = (id2 <<8 ) | id1; - -if (id2 !=0x8805 ) { -dev_err (codec->dev,"Invalid device ID: %#x\n" , id2); - ret = -EINVAL ; - goto err_reg_enable; - } - - ret =snd_soc_read (codec,WM8804_DEVREV ); -if (ret <0 ) { -dev_err (codec->dev,"Failed to read device revision: %d\n" , - ret); - goto err_reg_enable; - } -dev_info (codec->dev,"revision %c\n" , ret +'A' ); - - ret =wm8804_reset (codec); -if (ret <0 ) { -dev_err (codec->dev,"Failed to issue reset: %d\n" , ret); - goto err_reg_enable; - } - -return 0 ; - -err_reg_enable: -regulator_bulk_disable (ARRAY_SIZE (wm8804->supplies), wm8804->supplies); -return ret; -} -static const struct snd_soc_dai_ops wm8804_dai_ops = { .hw_params = wm8804_hw_params, .set_fmt = wm8804_set_fmt,
@@ -646,8 +552,6 @@ static struct snd_soc_dai_driver wm8804_dai = { };static const struct snd_soc_codec_driver soc_codec_dev_wm8804 = { - .probe = wm8804_codec_probe, - .remove = wm8804_codec_remove, .set_bias_level = wm8804_set_bias_level, .idle_bias_off = true,
@@ -671,6 +575,8 @@ EXPORT_SYMBOL_GPL(wm8804_regmap_config);int wm8804_probe (struct device *dev,struct regmap *regmap) {struct wm8804_priv *wm8804; +unsigned int id1, id2; +int i, ret; wm8804 =devm_kzalloc (dev,sizeof (*wm8804),GFP_KERNEL );if (!wm8804)
@@ -680,13 +586,91 @@ int wm8804_probe(struct device *dev, struct regmap *regmap) wm8804->regmap = regmap; +for (i =0 ; i <ARRAY_SIZE (wm8804->supplies); i++) + wm8804->supplies[i].supply = wm8804_supply_names[i]; + + ret =devm_regulator_bulk_get (dev,ARRAY_SIZE (wm8804->supplies), + wm8804->supplies); +if (ret) { +dev_err (dev,"Failed to request supplies: %d\n" , ret); +return ret; + } + + wm8804->disable_nb[0 ].notifier_call = wm8804_regulator_event_0; + wm8804->disable_nb[1 ].notifier_call = wm8804_regulator_event_1; + +/* This should really be moved into the regulator core */ +for (i =0 ; i <ARRAY_SIZE (wm8804->supplies); i++) { + ret =regulator_register_notifier (wm8804->supplies[i].consumer, + &wm8804->disable_nb[i]); +if (ret !=0 ) { +dev_err (dev, +"Failed to register regulator notifier: %d\n" , + ret); + } + } + + ret =regulator_bulk_enable (ARRAY_SIZE (wm8804->supplies), + wm8804->supplies); +if (ret) { +dev_err (dev,"Failed to enable supplies: %d\n" , ret); + goto err_reg_enable; + } + + ret =regmap_read (regmap,WM8804_RST_DEVID1 , &id1); +if (ret <0 ) { +dev_err (dev,"Failed to read device ID: %d\n" , ret); + goto err_reg_enable; + } + + ret =regmap_read (regmap,WM8804_DEVID2 , &id2); +if (ret <0 ) { +dev_err (dev,"Failed to read device ID: %d\n" , ret); + goto err_reg_enable; + } + + id2 = (id2 <<8 ) | id1; + +if (id2 !=0x8805 ) { +dev_err (dev,"Invalid device ID: %#x\n" , id2); + ret = -EINVAL ; + goto err_reg_enable; + } + + ret =regmap_read (regmap,WM8804_DEVREV , &id1); +if (ret <0 ) { +dev_err (dev,"Failed to read device revision: %d\n" , + ret); + goto err_reg_enable; + } +dev_info (dev,"revision %c\n" , id1 +'A' ); + + ret =wm8804_reset (wm8804); +if (ret <0 ) { +dev_err (dev,"Failed to issue reset: %d\n" , ret); + goto err_reg_enable; + } +return snd_soc_register_codec (dev, &soc_codec_dev_wm8804, &wm8804_dai,1 ); + +err_reg_enable: +regulator_bulk_disable (ARRAY_SIZE (wm8804->supplies), wm8804->supplies); +return ret; }EXPORT_SYMBOL_GPL (wm8804_probe);void wm8804_remove (struct device *dev) { +struct wm8804_priv *wm8804; +int i; + + wm8804 =dev_get_drvdata (dev); + +for (i =0 ; i <ARRAY_SIZE (wm8804->supplies); ++i) +regulator_unregister_notifier (wm8804->supplies[i].consumer, + &wm8804->disable_nb[i]); +snd_soc_unregister_codec (dev); }EXPORT_SYMBOL_GPL (wm8804_remove);
Signature · 1 line
1.7.2.5
Re: [PATCH 2/2] ASoC: wm8804: Merge CODEC probe and bus probe
Quoted 28 lines · Charles Keepax
From: Charles Keepax <[email protected]>
All of the things in the CODEC probe, such as getting the regulators and verifying the chip ID, are better done in bus probe. It is better to fail during bus probe if this is the wrong chip and all resource allocation should be done in the bus probe anyway. This patch merges the CODEC probe into bus probe.
Signed-off-by Charles Keepax <[email protected]>--- sound/soc/codecs/wm8804.c | 180 ++++++++++++++++++++------------------------ 1 files changed, 82 insertions(+), 98 deletions(-)sound/soc/codecs/wm8804.c +2
-2@@ -182,9 +182,9 @@ static bool wm8804_volatile(struct device *dev, unsigned int reg) } } -static int wm8804_reset (struct snd_soc_codec *codec) +static int wm8804_reset (struct wm8804_priv *wm8804) { -return snd_soc_write (codec,WM8804_RST_DEVID1 ,0x0 ); +return regmap_write (wm8804->regmap,WM8804_RST_DEVID1 ,0x0 ); }
<snip>
Quoted 12 lines
sound/soc/codecs/wm8804.c +12
-0+if (id2 !=0x8805 ) { +dev_err (dev,"Invalid device ID: %#x\n" , id2); + ret = -EINVAL ; + goto err_reg_enable; + } + + ret =regmap_read (regmap,WM8804_DEVREV , &id1); +if (ret <0 ) { +dev_err (dev,"Failed to read device revision: %d\n" , + ret); + goto err_reg_enable; + }
sound/soc/codecs/wm8804.c int wm8804_probe(struct device *dev, struct regmap *regmap) · line 655
Quoted 10 lines
sound/soc/codecs/wm8804.c +8
-0+dev_info (dev,"revision %c\n" , id1 +'A' ); + + ret =wm8804_reset (wm8804); +if (ret <0 ) { +dev_err (dev,"Failed to issue reset: %d\n" , ret); + goto err_reg_enable; + } +return snd_soc_register_codec (dev, &soc_codec_dev_wm8804, &wm8804_dai,1 );
Oops... we should goto err_reg_enable if this fails. I will send a new version on Monday.
sound/soc/codecs/wm8804.c int wm8804_probe(struct device *dev, struct regmap *regmap) · line 661
Quoted 7 lines
sound/soc/codecs/wm8804.c +4
-0+ +err_reg_enable: +regulator_bulk_disable (ARRAY_SIZE (wm8804->supplies), wm8804->supplies); +return ret; }EXPORT_SYMBOL_GPL (wm8804_probe);
Thanks,
Charles