ASoC: codecs: adau1701: refactor firmware loading function
Subsystems (4)
PATCH 1/2 ASoC: codecs: adau1701: refactor firmware loading function
Pass a struct i2c_client * to adau1701_load_firmware directly to make the code more readable.
--- sound/soc/codecs/adau1701.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
sound/soc/codecs/adau1701.c +5 -4
@@ -180,9 +180,9 @@ static unsigned int adau1701_read(struct snd_soc_codec *codec, unsigned int reg)return value; } -static int adau1701_load_firmware (struct snd_soc_codec *codec) +static int adau1701_load_firmware (struct i2c_client *client) { -return process_sigma_firmware (codec->control_data,ADAU1701_FIRMWARE ); +return process_sigma_firmware (client,ADAU1701_FIRMWARE ); } static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec,
@@ -455,10 +455,11 @@ static struct snd_soc_dai_driver adau1701_dai = {static int adau1701_probe (struct snd_soc_codec *codec) {int ret; +struct i2c_client *client =to_i2c_client (codec->dev); - codec->control_data =to_i2c_client (codec->dev); + codec->control_data = client; - ret =adau1701_load_firmware (codec); + ret =adau1701_load_firmware (client);if (ret)dev_warn (codec->dev,"Failed to load firmware\n" );
Signature · 1 line
1.8.1.4
PATCH 2/2 ASoC: codecs: adau1701: add DT bindings
Apart from pure matching, the bindings also support setting the the reset gpio line.
--- .../devicetree/bindings/sound/adi,adau1701.txt | 23 ++++++++++++++++ sound/soc/codecs/adau1701.c | 31 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/adi,adau1701.txt
Documentation/devicetree/bindings/sound/adi,adau1701.txt new file +23 -0
@@ -0,0 +1,23 @@ +Analog Devices ADAU1701 + +Required properties: + + - compatible: Should contain "adi,adau1701" + - reg: The i2c address. Value depends on the state of ADDR0 + and ADDR1, as wired in hardware. + +Optional properties: + + - reset-gpio: A GPIO spec to define which pin is connected to the + chip's !RESET pin. If specified, the driver will + assert a hardware reset at probe time. + +Examples: + + i2c_bus { + adau1701@34 { + compatible = "adi,adau1701"; + reg = <0x34>; + reset-gpio = <&gpio 23 0>; + }; + };
sound/soc/codecs/adau1701.c +31 -0
@@ -13,6 +13,9 @@#include <linux/i2c.h> #include <linux/delay.h> #include <linux/slab.h> +#include <linux/of.h> +#include <linux/of_gpio.h> +#include <linux/of_device.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h>
@@ -452,13 +455,40 @@ static struct snd_soc_dai_driver adau1701_dai = { .symmetric_rates = 1, }; +#ifdef CONFIG_OF +static const struct of_device_id adau1701_dt_ids[] = { + { .compatible ="adi,adau1701" , }, + { } +}; +MODULE_DEVICE_TABLE (of, adau1701_dt_ids); +#endif +static int adau1701_probe (struct snd_soc_codec *codec) {int ret; +struct device *dev = codec->dev;struct i2c_client *client =to_i2c_client (codec->dev); +int gpio_nreset = -EINVAL ; codec->control_data = client; +if (of_match_device (of_match_ptr (adau1701_dt_ids), dev)) + gpio_nreset =of_get_named_gpio (dev->of_node, +"reset-gpio" ,0 ); + +if (gpio_is_valid (gpio_nreset)) { +if (devm_gpio_request_one (codec->dev, gpio_nreset, +GPIOF_OUT_INIT_LOW , +"ADAU1701 Reset" ) <0 ) +return -EINVAL ; + +/* minimum reset time is 20ns */ +udelay (1 ); +gpio_set_value (gpio_nreset,1 ); +/* power-up time may be as long as 85ms */ +mdelay (85 ); + } + ret =adau1701_load_firmware (client);if (ret)dev_warn (codec->dev,"Failed to load firmware\n" );
@@ -522,6 +552,7 @@ static struct i2c_driver adau1701_i2c_driver = { .driver = { .name = "adau1701", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(adau1701_dt_ids), }, .probe = adau1701_i2c_probe, .remove = adau1701_i2c_remove,
Signature · 1 line
1.8.1.4
Quoted 4 lines · Daniel Mack
Pass a struct
i2c_client* toadau1701_load_firmwaredirectly to make the code more readable.Signed-off-by Daniel Mack <[email protected]>
Quoted 34 lines
--- sound/soc/codecs/adau1701.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)sound/soc/codecs/adau1701.c +5
-4@@ -180,9 +180,9 @@ static unsigned int adau1701_read(struct snd_soc_codec *codec, unsigned int reg)return value; } -static int adau1701_load_firmware (struct snd_soc_codec *codec) +static int adau1701_load_firmware (struct i2c_client *client) { -return process_sigma_firmware (codec->control_data,ADAU1701_FIRMWARE ); +return process_sigma_firmware (client,ADAU1701_FIRMWARE ); } static int adau1701_set_capture_pcm_format(struct snd_soc_codec *codec,@@ -455,10 +455,11 @@ static struct snd_soc_dai_driver adau1701_dai = {static int adau1701_probe (struct snd_soc_codec *codec) {int ret; +struct i2c_client *client =to_i2c_client (codec->dev); - codec->control_data =to_i2c_client (codec->dev); + codec->control_data = client; - ret =adau1701_load_firmware (codec); + ret =adau1701_load_firmware (client);if (ret)dev_warn (codec->dev,"Failed to load firmware\n" );
Lars-Peter Clausen
maintainerRe: [PATCH 2/2] ASoC: codecs: adau1701: add DT bindings
In reply to Daniel MackOn 05/23/2013 01:58 PM, Daniel Mack wrote:
[...]
Quoted 8 lines
sound/soc/codecs/adau1701.c +8
-0+#ifdef CONFIG_OF +static const struct of_device_id adau1701_dt_ids[] = { + { .compatible ="adi,adau1701" , }, + { } +}; +MODULE_DEVICE_TABLE (of, adau1701_dt_ids); +#endif +
sound/soc/codecs/adau1701.c static struct snd_soc_dai_driver adau1701_dai = { · line 475
Quoted 10 lines
sound/soc/codecs/adau1701.c +3
-0static int adau1701_probe (struct snd_soc_codec *codec) {int ret; +struct device *dev = codec->dev;struct i2c_client *client =to_i2c_client (codec->dev); +int gpio_nreset = -EINVAL ; codec->control_data = client; +if (of_match_device (of_match_ptr (adau1701_dt_ids), dev))
I think just checking for dev->of_node should be simpler.
sound/soc/codecs/adau1701.c static struct snd_soc_dai_driver adau1701_dai = { · line 477
Quoted 2 lines
sound/soc/codecs/adau1701.c +2
-0+ gpio_nreset =of_get_named_gpio (dev->of_node, +"reset-gpio" ,0 );
This should check for errors. E.g. we definitely want to handle -EPROBE_DEFER, but it makes sense to also return an error if the property is present but something is wrong.
E.g something like
if (gpio_nreset < 0 && gpio_nreset != -ENOENT) return gpio_nreset;
sound/soc/codecs/adau1701.c static struct snd_soc_dai_driver adau1701_dai = { · line 490
Quoted 13 lines
sound/soc/codecs/adau1701.c +13
-0+ +if (gpio_is_valid (gpio_nreset)) { +if (devm_gpio_request_one (codec->dev, gpio_nreset, +GPIOF_OUT_INIT_LOW , +"ADAU1701 Reset" ) <0 ) +return -EINVAL ; + +/* minimum reset time is 20ns */ +udelay (1 ); +gpio_set_value (gpio_nreset,1 ); +/* power-up time may be as long as 85ms */ +mdelay (85 ); + }
I think it is better to request the gpio and reset the device in the i2c probe function.
Quoted 12 lines
sound/soc/codecs/adau1701.c +2
-0+ ret =adau1701_load_firmware (client);if (ret)dev_warn (codec->dev,"Failed to load firmware\n" );@@ -522,6 +552,7 @@ static struct i2c_driver adau1701_i2c_driver = { .driver = { .name = "adau1701", .owner = THIS_MODULE, + .of_match_table = of_match_ptr(adau1701_dt_ids), }, .probe = adau1701_i2c_probe, .remove = adau1701_i2c_remove,
Quoted 2 lines · Daniel Mack
Pass a struct
i2c_client* toadau1701_load_firmwaredirectly to make the code more readable.
Applied, thanks.