Skip to contentSkip to conversation

ALSA: ASoC: add DT bindings for cs4270

PATCH Applied Daniel Mack 4 participants 13 messages Jul 25, 2012 – Jul 31, 2012

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 ALSA: ASoC: add DT bindings for cs4270

---
 Documentation/devicetree/bindings/sound/cs4270.txt |   16 ++++++++++++++++
 sound/soc/codecs/cs4270.c                          |   11 +++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/sound/cs4270.txt
Documentation/devicetree/bindings/sound/cs4270.txt new file +16 -0
new file mode 100644
index 0000000..7f0bfd8
@@ -0,0 +1,16 @@
+CS4270 audio CODEC
+
+The driver for this device currently only supports I2C.
+
+Required properties:
+
+  - compatible : "cirrus,cs4270"
+
+  - reg : the I2C address of the device for I2C
+
+Example:
+
+codec: cs4270@48 {
+	compatible = "cirrus,cs4270";
+	reg = <0x48>;
+};
sound/soc/codecs/cs4270.c +11 -0
index 047917f..4b71b01 100644
@@ -29,6 +29,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/regulator/consumer.h>
+#include <linux/of_device.h>
 
 /*
  * The codec isn't really big-endian or little-endian, since the I2S
@@ -639,6 +640,15 @@ static const struct snd_soc_codec_driver soc_codec_device_cs4270 = {
 	.reg_cache_default =	cs4270_default_reg_cache,
 };
 
+/*
+ * cs4270_of_match - the device tree bindings
+ */
+static const struct of_device_id cs4270_of_match[] = {
+	{ .compatible = "cirrus,cs4270", },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, cs4270_of_match);
+
 /**
  * cs4270_i2c_probe - initialize the I2C interface of the CS4270
  * @i2c_client: the I2C client object
@@ -718,6 +728,7 @@ static struct i2c_driver cs4270_i2c_driver = {
 	.driver = {
 		.name = "cs4270",
 		.owner = THIS_MODULE,
+		.of_match_table = cs4270_of_match,
 	},
 	.id_table = cs4270_id,
 	.probe = cs4270_i2c_probe,
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v3 2/2 ALSA: ASoC: Add reset-gpio DT property to cs4270 driver

In the process of moving over from static board files to the device tree, reset pins of peripheral reset pins should be handled by their corresponding drivers.

Add a reset-gpio DT property to the cs4270 driver, and de-assert it before probing the chip. The logic could be augmented some day to re-assert it when codec is put to suspend.

---
v2: cleanups as requested by Timur
v3: return error code in case devm_gpio_request_one() fails

 Documentation/devicetree/bindings/sound/cs4270.txt |    5 +++++
 sound/soc/codecs/cs4270.c                          |   17 +++++++++++++++++
 2 files changed, 22 insertions(+)
Documentation/devicetree/bindings/sound/cs4270.txt +5 -0
index 7f0bfd8..6b222f9 100644
@@ -8,6 +8,11 @@ Required properties:
 
   - reg : the I2C address of the device for I2C
 
+Optional properties:
+
+  - reset-gpio : a GPIO spec for the reset pin. If specified, it will be
+		 deasserted before communication to the codec starts.
+
 Example:
 
 codec: cs4270@48 {
sound/soc/codecs/cs4270.c +17 -0
index 4b71b01..fd11bb6 100644
@@ -30,6 +30,7 @@
 #include <linux/delay.h>
 #include <linux/regulator/consumer.h>
 #include <linux/of_device.h>
+#include <linux/of_gpio.h>
 
 /*
  * The codec isn't really big-endian or little-endian, since the I2S
@@ -660,9 +661,25 @@ MODULE_DEVICE_TABLE(of, cs4270_of_match);
 static int cs4270_i2c_probe(struct i2c_client *i2c_client,
 	const struct i2c_device_id *id)
 {
+	struct device_node *np = i2c_client->dev.of_node;
 	struct cs4270_private *cs4270;
 	int ret;
 
+	/* See if we have a way to bring the codec out of reset */
+	if (np) {
+		enum of_gpio_flags flags;
+		int gpio = of_get_named_gpio_flags(np, "reset-gpio", 0, &flags);
+
+		if (gpio_is_valid(gpio)) {
+			ret = devm_gpio_request_one(&i2c_client->dev, gpio,
+				     flags & OF_GPIO_ACTIVE_LOW ?
+					GPIOF_OUT_INIT_LOW : GPIOF_OUT_INIT_HIGH,
+				     "cs4270 reset");
+			if (ret < 0)
+				return ret;
+		}
+	}
+
 	/* Verify that we have a CS4270 */
 
 	ret = i2c_smbus_read_byte_data(i2c_client, CS4270_CHIPID);
Signature · 1 line
1.7.10.4
Acked-by on v3 1/2
#3 lore raw
In reply to Daniel Mack
Quoted 3 lines · Daniel Mack

---

Both patches:

I am seeing something a little weird, though, although I doubt it's related to these patches. Audio works, even though I see this on the boot log:

cs4270 0-004f: found device at i2c address 4F
cs4270 0-004f: hardware revision 3
Freescale MPC8610 HPCD ALSA SoC machine driver soc-audio soc-audio: ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()
soc-audio soc-audio: Failed to register card
platform soc-audio: Driver soc-audio requests probe deferral
...
ALSA device list:
No soundcards found.
soc-audio soc-audio: ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()

soc-audio soc-audio:  cs4270-hifi <-> e0016000.ssi mapping ok
soc-audio soc-audio:  cs4270-hifi <-> e0016000.ssi mapping ok

Is there a connection between the message "ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()", the requests for probe deferral, and the "No soundcards found." message?

Signature · 2 lines
Timur Tabi
Linux kernel developer at Freescale
#4 lore raw
Quoted 8 lines · Timur Tabi
Quoted 3 lines · Daniel Mack

---

Both patches:

Thanks.

Quoted 3 lines

I am seeing something a little weird, though, although I doubt it's related to these patches. Audio works, even though I see this on the boot log:

I also fail to see a relation here. Does it happen without the two patches as well?

Daniel

Quoted 20 lines

cs4270 0-004f: found device at i2c address 4F
cs4270 0-004f: hardware revision 3
Freescale MPC8610 HPCD ALSA SoC machine driver soc-audio soc-audio: ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()
soc-audio soc-audio: Failed to register card
platform soc-audio: Driver soc-audio requests probe deferral
...
ALSA device list:
No soundcards found.
soc-audio soc-audio: ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()

soc-audio soc-audio:  cs4270-hifi <-> e0016000.ssi mapping ok
soc-audio soc-audio:  cs4270-hifi <-> e0016000.ssi mapping ok

Is there a connection between the message "ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()", the requests for probe deferral, and the "No soundcards found." message?

#5 lore raw
Quoted 2 lines · Daniel Mack

I also fail to see a relation here. Does it happen without the two patches as well?

Yes, it does happen without the patches, but I was wondering if changing the way the codec driver is probed would be relevant somehow. I know it's a stretch.

Signature · 2 lines
Timur Tabi
Linux kernel developer at Freescale
Acked-by Liam Girdwood
#6 lore raw
In reply to Timur Tabi
Quoted 13 lines · Timur Tabi
Quoted 3 lines · Daniel Mack

---

Both patches:

I am seeing something a little weird, though, although I doubt it's related to these patches. Audio works, even though I see this on the boot log:

Quoted 12 lines

cs4270 0-004f: found device at i2c address 4F
cs4270 0-004f: hardware revision 3
Freescale MPC8610 HPCD ALSA SoC machine driver soc-audio soc-audio: ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()
soc-audio soc-audio: Failed to register card
platform soc-audio: Driver soc-audio requests probe deferral
...
ALSA device list:
No soundcards found.
soc-audio soc-audio: ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()

I believe you are registering "soc-audio" as a device.

In the "soc-audio" driver probe (souns/soc/soc-core.c - soc_probe()), this message is printed.

This is as per the commit below

commit fe4085e84f17a57a533a210a626e0cc9ead381f9

Author:     Mark Brown <[email protected]>
AuthorDate: Fri Mar 2 13:07:41 2012 +0000
Commit:     Mark Brown <[email protected]>
CommitDate: Fri Mar 2 16:21:25 2012 +0000

ASoC: core: Log a warning when machines use soc-audio

snd_soc_register_card() has been available and strongly preferred since 2.6.38 but we're still seeing new drivers using it and the conversion rate for older machines has been low. Help address both issues by logging a warning when the soc-audio device probes.

Quoted 16 lines
soc-audio soc-audio:  cs4270-hifi <-> e0016000.ssi mapping ok
soc-audio soc-audio:  cs4270-hifi <-> e0016000.ssi mapping ok

Is there a connection between the message "ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()", the requests for probe deferral, and the "No soundcards found." message?

Signature · 7 lines
Timur Tabi
Linux kernel developer at Freescale

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Regards,
Gururaja

#7 lore raw
In reply to Timur Tabi
Quoted 3 lines · Timur Tabi

Is there a connection between the message "ASoC machine snd-soc-mpc8610hpcd should use snd_soc_register_card()", the requests for probe deferral, and the "No soundcards found." message?

Probe deferral is related to the "No soundcards found" since the deferred probe runs start after the init completes. The lack of an update to snd_soc_register_card() isn't related.

#8 lore raw
Quoted 2 lines · Mark Brown

Probe deferral is related to the "No soundcards found" since the deferred probe runs start after the init completes.

Is there anything I can do to fix this?

Quoted 2 lines

The lack of an
update to snd_soc_register_card() isn't related.

Are you planning on removing support for soc-audio (thereby forcing me to update to snd_soc_register_card), or can I just ignore the warning?

Signature · 2 lines
Timur Tabi
Linux kernel developer at Freescale
#9 lore raw
Quoted 6 lines · Timur Tabi
Quoted 2 lines · Mark Brown

Probe deferral is related to the "No soundcards found" since the deferred probe runs start after the init completes.

Is there anything I can do to fix this?

It's not a problem. If you ensure that all the dependencies for the card are registered before the card it won't happen but that'll depend on the order people have in their DT.

Quoted 5 lines
Quoted 2 lines

The lack of an
update to snd_soc_register_card() isn't related.

Are you planning on removing support for soc-audio (thereby forcing me to update to snd_soc_register_card), or can I just ignore the warning?

You should update.

#10 lore raw
Quoted 3 lines · Mark Brown

It's not a problem. If you ensure that all the dependencies for the card are registered before the card it won't happen but that'll depend on the order people have in their DT.

Well, it may not be a real problem, but it is disconcerting. I can imagine a bunch of bogus bug reports coming my way because people think the drivers have not loaded properly.

Quoted 7 lines
Quoted 5 lines
Quoted 2 lines

The lack of an
update to snd_soc_register_card() isn't related.

Are you planning on removing support for soc-audio (thereby forcing me to update to snd_soc_register_card), or can I just ignore the warning?

You should update.

I know, but is it urgent that I update? How much time do I have? If you're telling me that you're going to yank it in 3.7, then I need to re-prioritize my work.

Signature · 2 lines
Timur Tabi
Linux kernel developer at Freescale
#11 lore raw
Quoted 9 lines · Timur Tabi
Quoted 3 lines · Mark Brown

It's not a problem. If you ensure that all the dependencies for the card are registered before the card it won't happen but that'll depend on the order people have in their DT.

Well, it may not be a real problem, but it is disconcerting. I can imagine a bunch of bogus bug reports coming my way because people think the drivers have not loaded properly.

Yeah. TBH I think the best fix is to remove the logging of the cards rather than anything else, make the core announce each card as it appears if it's useful.

Quoted 8 lines
Quoted 4 lines
Quoted 2 lines

Are you planning on removing support for soc-audio (thereby forcing me to update to snd_soc_register_card), or can I just ignore the warning?

You should update.

I know, but is it urgent that I update? How much time do I have? If you're telling me that you're going to yank it in 3.7, then I need to re-prioritize my work.

Not that urgent, no - conversion won't be forced until it's blocking something in the framework and that's not likely to happen any time soon.