June 2012 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] ASoC:isabelle:Remove regmap_exit()
by MR.Swami.Reddy＠ti.com 06 Jun '12

06 Jun '12

From: MR Swami Reddy <MR.Swami.Reddy(a)ti.com> ASoC:isabelle:With devm_ APIs regmap_exit() not needed, so remove regmap_exit(). Signed-off-by: Vishwas A Deshpande <vishwas.a.deshpande(a)ti.com> Signed-off-by: M R Swami Reddy <mr.swami.reddy(a)ti.com> --- sound/soc/codecs/isabelle.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/isabelle.c b/sound/soc/codecs/isabelle.c index 69228ec..bcc77ef 100644 --- a/sound/soc/codecs/isabelle.c +++ b/sound/soc/codecs/isabelle.c @@ -1141,7 +1141,6 @@ static int __devinit isabelle_i2c_probe(struct i2c_client *i2c, ARRAY_SIZE(isabelle_dai)); if (ret < 0) { dev_err(&i2c->dev, "Failed to register codec: %d\n", ret); - regmap_exit(dev_get_regmap(&i2c->dev, NULL)); return ret; } @@ -1151,7 +1150,6 @@ static int __devinit isabelle_i2c_probe(struct i2c_client *i2c, static int __devexit isabelle_i2c_remove(struct i2c_client *client) { snd_soc_unregister_codec(&client->dev); - regmap_exit(dev_get_regmap(&client->dev, NULL)); return 0; }

3 2

[alsa-devel] [PATCH v3] ASoC: omap-abe-twl6040: Add device tree support
by Peter Ujfalusi 06 Jun '12

06 Jun '12

When the board boots with device tree the driver will receive the name of the card, DAPM routing map, phandle for the audio components described in the dts file, mclk speed, and the possibility of detecting the jack detection. The card will be set up based on this information. Since the routing is provided via DT we can mark the card fully routed so core can take care of disconnecting the unused pins. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Reviwed-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- Hi, Changes since v2 (resend): - Do not override the return value from snd_soc_of_parse_audio_routing in case of error. Regards, Peter .../devicetree/bindings/sound/omap-abe-twl6040.txt | 91 ++++++++++++ sound/soc/omap/omap-abe-twl6040.c | 145 ++++++++++++++++---- 2 files changed, 206 insertions(+), 30 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt diff --git a/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt new file mode 100644 index 0000000..65dec87 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/omap-abe-twl6040.txt @@ -0,0 +1,91 @@ +* Texas Instruments OMAP4+ and twl6040 based audio setups + +Required properties: +- compatible: "ti,abe-twl6040" +- ti,model: Name of the sound card ( for example "SDP4430") +- ti,mclk-freq: MCLK frequency for HPPLL operation +- ti,mcpdm: phandle for the McPDM node +- ti,twl6040: phandle for the twl6040 core node +- ti,audio-routing: List of connections between audio components. + Each entry is a pair of strings, the first being the connection's sink, + the second being the connection's source. + +Optional properties: +- ti,dmic: phandle for the OMAP dmic node if the machine have it connected +- ti,jack_detection: Need to be set to <1> if the board capable to detect jack + insertion, removal. + +Available audio endpoints for the audio-routing table: + +Board connectors: + * Headset Stereophone + * Earphone Spk + * Ext Spk + * Line Out + * Vibrator + * Headset Mic + * Main Handset Mic + * Sub Handset Mic + * Line In + * Digital Mic + +twl6040 pins: + * HSOL + * HSOR + * EP + * HFL + * HFR + * AUXL + * AUXR + * VIBRAL + * VIBRAR + * HSMIC + * MAINMIC + * SUBMIC + * AFML + * AFMR + + * Headset Mic Bias + * Main Mic Bias + * Digital Mic1 Bias + * Digital Mic2 Bias + +Digital mic pins: + * DMic + +Example: + +sound { + compatible = "ti,abe-twl6040"; + ti,model = "SDP4430"; + + ti,jack-detection = <1>; + ti,mclk-freq = <38400000>; + + ti,mcpdm = <&mcpdm>; + ti,dmic = <&dmic>; + + ti,twl6040 = <&twl6040>; + + /* Audio routing */ + ti,audio-routing = + "Headset Stereophone", "HSOL", + "Headset Stereophone", "HSOR", + "Earphone Spk", "EP", + "Ext Spk", "HFL", + "Ext Spk", "HFR", + "Line Out", "AUXL", + "Line Out", "AUXR", + "Vibrator", "VIBRAL", + "Vibrator", "VIBRAR", + "HSMIC", "Headset Mic", + "Headset Mic", "Headset Mic Bias", + "MAINMIC", "Main Handset Mic", + "Main Handset Mic", "Main Mic Bias", + "SUBMIC", "Sub Handset Mic", + "Sub Handset Mic", "Main Mic Bias", + "AFML", "Line In", + "AFMR", "Line In", + "DMic", "Digital Mic", + "Digital Mic", "Digital Mic1 Bias"; +}; diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/omap/omap-abe-twl6040.c index 9d93793..1343147 100644 --- a/sound/soc/omap/omap-abe-twl6040.c +++ b/sound/soc/omap/omap-abe-twl6040.c @@ -25,6 +25,7 @@ #include <linux/mfd/twl6040.h> #include <linux/platform_data/omap-abe-twl6040.h> #include <linux/module.h> +#include <linux/of.h> #include <sound/core.h> #include <sound/pcm.h> @@ -43,6 +44,8 @@ struct abe_twl6040 { int jack_detection; /* board can detect jack events */ int mclk_freq; /* MCLK frequency speed for twl6040 */ + + struct platform_device *dmic_codec_dev; }; static int omap_abe_hw_params(struct snd_pcm_substream *substream, @@ -185,17 +188,6 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) int hs_trim; int ret = 0; - /* Disable not connected paths if not used */ - twl6040_disconnect_pin(dapm, pdata->has_hs, "Headset Stereophone"); - twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk"); - twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk"); - twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out"); - twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vinrator"); - twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic"); - twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic"); - twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic"); - twl6040_disconnect_pin(dapm, pdata->has_afm, "Line In"); - /* * Configure McPDM offset cancellation based on the HSOTRIM value from * twl6040. @@ -216,6 +208,24 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd) twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET); } + /* + * NULL pdata means we booted with DT. In this case the routing is + * provided and the card is fully routed, no need to mark pins. + */ + if (!pdata) + return ret; + + /* Disable not connected paths if not used */ + twl6040_disconnect_pin(dapm, pdata->has_hs, "Headset Stereophone"); + twl6040_disconnect_pin(dapm, pdata->has_hf, "Ext Spk"); + twl6040_disconnect_pin(dapm, pdata->has_ep, "Earphone Spk"); + twl6040_disconnect_pin(dapm, pdata->has_aux, "Line Out"); + twl6040_disconnect_pin(dapm, pdata->has_vibra, "Vinrator"); + twl6040_disconnect_pin(dapm, pdata->has_hsmic, "Headset Mic"); + twl6040_disconnect_pin(dapm, pdata->has_mainmic, "Main Handset Mic"); + twl6040_disconnect_pin(dapm, pdata->has_submic, "Sub Handset Mic"); + twl6040_disconnect_pin(dapm, pdata->has_afm, "Line In"); + return ret; } @@ -270,52 +280,116 @@ static struct snd_soc_card omap_abe_card = { static __devinit int omap_abe_probe(struct platform_device *pdev) { struct omap_abe_twl6040_data *pdata = dev_get_platdata(&pdev->dev); + struct device_node *node = pdev->dev.of_node; struct snd_soc_card *card = &omap_abe_card; struct abe_twl6040 *priv; int num_links = 0; - int ret; + int ret = 0; card->dev = &pdev->dev; - if (!pdata) { - dev_err(&pdev->dev, "Missing pdata\n"); - return -ENODEV; - } - priv = devm_kzalloc(&pdev->dev, sizeof(struct abe_twl6040), GFP_KERNEL); if (priv == NULL) return -ENOMEM; - if (pdata->card_name) { - card->name = pdata->card_name; + priv->dmic_codec_dev = ERR_PTR(-EINVAL); + + if (node) { + struct device_node *dai_node; + + if (snd_soc_of_parse_card_name(card, "ti,model")) { + dev_err(&pdev->dev, "Card name is not provided\n"); + return -ENODEV; + } + + ret = snd_soc_of_parse_audio_routing(card, + "ti,audio-routing"); + if (ret) { + dev_err(&pdev->dev, + "Error while parsing DAPM routing\n"); + return ret; + } + + dai_node = of_parse_phandle(node, "ti,mcpdm", 0); + if (!dai_node) { + dev_err(&pdev->dev, "McPDM node is not provided\n"); + return -EINVAL; + } + abe_twl6040_dai_links[0].cpu_dai_name = NULL; + abe_twl6040_dai_links[0].cpu_dai_of_node = dai_node; + + dai_node = of_parse_phandle(node, "ti,dmic", 0); + if (dai_node) { + num_links = 2; + abe_twl6040_dai_links[1].cpu_dai_name = NULL; + abe_twl6040_dai_links[1].cpu_dai_of_node = dai_node; + + priv->dmic_codec_dev = platform_device_register_simple( + "dmic-codec", -1, NULL, 0); + if (IS_ERR(priv->dmic_codec_dev)) { + dev_err(&pdev->dev, + "Can't instantiate dmic-codec\n"); + return PTR_ERR(priv->dmic_codec_dev); + } + } else { + num_links = 1; + } + + of_property_read_u32(node, "ti,jack-detection", + &priv->jack_detection); + of_property_read_u32(node, "ti,mclk-freq", + &priv->mclk_freq); + if (!priv->mclk_freq) { + dev_err(&pdev->dev, "MCLK frequency not provided\n"); + ret = -EINVAL; + goto err_unregister; + } + + omap_abe_card.fully_routed = 1; + } else if (pdata) { + if (pdata->card_name) { + card->name = pdata->card_name; + } else { + dev_err(&pdev->dev, "Card name is not provided\n"); + return -ENODEV; + } + + if (pdata->has_dmic) + num_links = 2; + else + num_links = 1; + + priv->jack_detection = pdata->jack_detection; + priv->mclk_freq = pdata->mclk_freq; } else { - dev_err(&pdev->dev, "Card name is not provided\n"); + dev_err(&pdev->dev, "Missing pdata\n"); return -ENODEV; } - priv->jack_detection = pdata->jack_detection; - priv->mclk_freq = pdata->mclk_freq; - if (!priv->mclk_freq) { dev_err(&pdev->dev, "MCLK frequency missing\n"); - return -ENODEV; + ret = -ENODEV; + goto err_unregister; } - if (pdata->has_dmic) - num_links = 2; - else - num_links = 1; - card->dai_link = abe_twl6040_dai_links; card->num_links = num_links; snd_soc_card_set_drvdata(card, priv); ret = snd_soc_register_card(card); - if (ret) + if (ret) { dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", ret); + goto err_unregister; + } + + return 0; + +err_unregister: + if (!IS_ERR(priv->dmic_codec_dev)) + platform_device_unregister(priv->dmic_codec_dev); return ret; } @@ -323,17 +397,28 @@ static __devinit int omap_abe_probe(struct platform_device *pdev) static int __devexit omap_abe_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); + struct abe_twl6040 *priv = snd_soc_card_get_drvdata(card); snd_soc_unregister_card(card); + if (!IS_ERR(priv->dmic_codec_dev)) + platform_device_unregister(priv->dmic_codec_dev); + return 0; } +static const struct of_device_id omap_abe_of_match[] = { + {.compatible = "ti,abe-twl6040", }, + { }, +}; +MODULE_DEVICE_TABLE(of, omap_abe_of_match); + static struct platform_driver omap_abe_driver = { .driver = { .name = "omap-abe-twl6040", .owner = THIS_MODULE, .pm = &snd_soc_pm_ops, + .of_match_table = omap_abe_of_match, }, .probe = omap_abe_probe, .remove = __devexit_p(omap_abe_remove), -- 1.7.8.6

1 0

[alsa-devel] [PATCH 9/8] printk: Only look for prefix levels in kernel messages
by Joe Perches 06 Jun '12

06 Jun '12

vprintk_emit prefix parsing should only be done for internal kernel messages. This allows existing behavior to be kept in all cases. Signed-off-by: Joe Perches <joe(a)perches.com> --- kernel/printk.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/kernel/printk.c b/kernel/printk.c index 5cd73f7..4e72c07 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -1267,7 +1267,6 @@ asmlinkage int vprintk_emit(int facility, int level, static char cont_buf[LOG_LINE_MAX]; static size_t cont_len; static int cont_level; - int kern_level; static struct task_struct *cont_task; static char textbuf[LOG_LINE_MAX]; char *text = textbuf; @@ -1329,21 +1328,24 @@ asmlinkage int vprintk_emit(int facility, int level, newline = true; } - /* strip syslog prefix and extract log level or control flags */ - kern_level = printk_get_level(text); - if (kern_level) { - const char *end_of_header = printk_skip_level(text); - switch (kern_level) { - case '0' ... '7': - if (level == -1) - level = kern_level - '0'; - case 'd': /* KERN_DEFAULT */ - prefix = true; - case 'c': /* KERN_CONT */ - break; + /* strip kernel syslog prefix and extract log level or control flags */ + if (facility == 0) { + int kern_level = printk_get_level(text); + + if (kern_level) { + const char *end_of_header = printk_skip_level(text); + switch (kern_level) { + case '0' ... '7': + if (level == -1) + level = kern_level - '0'; + case 'd': /* KERN_DEFAULT */ + prefix = true; + case 'c': /* KERN_CONT */ + break; + } + text_len -= end_of_header - text; + text = (char *)end_of_header; } - text_len -= end_of_header - text; - text = (char *)end_of_header; } if (level == -1)

1 0

Re: [alsa-devel] [PATCH 0/8] Rework KERN_<LEVEL>
by Joe Perches 06 Jun '12

06 Jun '12

On Wed, 2012-06-06 at 03:10 +0200, Kay Sievers wrote: > On Wed, Jun 6, 2012 at 2:46 AM, Andrew Morton <akpm(a)linux-foundation.org> wrote: > > On Tue, 05 Jun 2012 17:40:05 -0700 Joe Perches <joe(a)perches.com> wrote: > > > >> On Tue, 2012-06-05 at 17:37 -0700, Andrew Morton wrote: > >> > On Tue, 05 Jun 2012 17:07:27 -0700 Joe Perches <joe(a)perches.com> wrote: > >> > > >> > > On Tue, 2012-06-05 at 16:58 -0700, Andrew Morton wrote: > >> > > > echo "\0014Hello Joe" > /dev/kmsg > >> > > > >> > > # echo -e "\x014Hello Me" > /dev/kmsg > >> > > gives: > >> > > 12,778,4057982669;Hello Me > >> > > >> > That's changed behavior. > >> > >> Which is an improvement too. > > > > No it isn't. It exposes internal kernel implementation details in > > random weird inexplicable ways. It doesn't seem at all important > > though. > > > >> I very much doubt a single app will change > >> because of this. > > > > I doubt it as well. > > Yeah, the value of injecting such binary data is kind of questionable. :) > > Joe, maybe you can change printk_emit() to skip the prefix > detection/stripping if a prefix is already passed to the function? Sure, it's pretty trivial. Perhaps all binary data data should be elided. Maybe print . for all non-printable ascii chars.

1 0

Re: [alsa-devel] [PATCH 0/8] Rework KERN_<LEVEL>
by Andrew Morton 06 Jun '12

06 Jun '12

On Tue, 05 Jun 2012 17:07:27 -0700 Joe Perches <joe(a)perches.com> wrote: > On Tue, 2012-06-05 at 16:58 -0700, Andrew Morton wrote: > > echo "\0014Hello Joe" > /dev/kmsg > > # echo -e "\x014Hello Me" > /dev/kmsg > gives: > 12,778,4057982669;Hello Me That's changed behavior. On Wed, 6 Jun 2012 02:28:39 +0200 Kay Sievers <kay(a)vrfy.org> wrote: > Yeah, but printk_emit() will not try to parse it? I did not check, but > with your change, the prefix parsing in printk_emit() is still skipped > if a level is given as a parameter to printk_emit(), right? printk_emit() does parse the leading \0014, and then skips over it, removing it from the output stream. printk_emit() then throws away the resulting level because devkmsg_writev() did not pass in level==-1.

2 2

Re: [alsa-devel] [PATCH 0/8] Rework KERN_<LEVEL>
by Joe Perches 06 Jun '12

06 Jun '12

On Wed, 2012-06-06 at 02:28 +0200, Kay Sievers wrote: > On Wed, Jun 6, 2012 at 2:19 AM, Joe Perches <joe(a)perches.com> wrote: > > On Wed, 2012-06-06 at 02:13 +0200, Kay Sievers wrote: > >> The question is what happens if you inject your new binary two-byte > >> prefix, like: > >> echo -e "\x01\x02Hello" > /dev/kmsg > > > > It's not a 2 byte binary. > > It's a leading ascii SOH and a standard ascii char > > '0' ... '7' or 'd'. > > > > #define KERN_EMERG KERN_SOH "0" /* system is unusable */ > > #define KERN_ALERT KERN_SOH "1" /* action must be taken immediately */ > > etc... > > Ok. > > >> And if that changes the log-level to "2" instead of the default "4"? > > > > No it doesn't. > > So: > echo -e "\x012Hello" > /dev/kmsg > is still level 4? Sounds all fine then. Yes. # echo -e "\x012Hello again Kay" > /dev/kmsg gives: 12,780,6031964979;Hello again Kay > > It's not triggering that because devkmsg_writev does > > prefix parsing only on the old "<n>" form. > > Yeah, but printk_emit() will not try to parse it? I did not check, but > with your change, the prefix parsing in printk_emit() is still skipped > if a level is given as a parameter to printk_emit(), right? If level is not -1, then whatever prefix level the string has is ignored by vprintk_emit. from vprintk_emit: /* strip syslog prefix and extract log level or control flags */ kern_level = printk_get_level(text); if (kern_level) { const char *end_of_header = printk_skip_level(text); switch (kern_level) { case '0' ... '7': if (level == -1) level = kern_level - '0'; case 'd': /* Strip d KERN_DEFAULT, start new line */ plen = 0; default: if (!new_text_line) { log_buf_emit_char('\n'); new_text_line = 1; } } text_len -= end_of_header - text; text = (char *)end_of_header; } Only level == -1 will use the prefix level. devkmsg_writev always passes a non -1 level. cheers, Joe

1 0

Re: [alsa-devel] [PATCH 0/8] Rework KERN_<LEVEL>
by Joe Perches 06 Jun '12

06 Jun '12

On Wed, 2012-06-06 at 02:13 +0200, Kay Sievers wrote: > The question is what happens if you inject your new binary two-byte > prefix, like: > echo -e "\x01\x02Hello" > /dev/kmsg It's not a 2 byte binary. It's a leading ascii SOH and a standard ascii char '0' ... '7' or 'd'. #define KERN_EMERG KERN_SOH "0" /* system is unusable */ #define KERN_ALERT KERN_SOH "1" /* action must be taken immediately */ etc... > And if that changes the log-level to "2" instead of the default "4"? No it doesn't. It's not triggering that because devkmsg_writev does prefix parsing only on the old "<n>" form.

1 0

Re: [alsa-devel] [PATCH 0/8] Rework KERN_<LEVEL>
by Joe Perches 06 Jun '12

06 Jun '12

On Wed, 2012-06-06 at 01:48 +0200, Kay Sievers wrote: > On Wed, Jun 6, 2012 at 1:43 AM, Joe Perches <joe(a)perches.com> wrote: > > On Wed, 2012-06-06 at 01:39 +0200, Kay Sievers wrote: > > >> > # echo "\001Hello Andrew" > /dev/kmsg > >> > /dev/kmsg has > >> > 12,774,2462339252;\001Hello Andrew > >> > >> Try "echo -e"? The stuff is copied verbatim otherwise. > > > > # echo -e "\001Hello Kay" > /dev/kmsg > > gives > > 12,776,3046752764;\x01Hello Kay > > Don't you need two bytes to trigger the logic? Yes. Angle brackets fore and aft. If you use a "<n>" prefix for write to /dev/kmsg, then it's supported just like before. Otherwise, it's emitted at KERN_DEFAULT. cheers, Joe

2 2

Re: [alsa-devel] [PATCH 0/8] Rework KERN_<LEVEL>
by Joe Perches 06 Jun '12

06 Jun '12

On Wed, 2012-06-06 at 01:39 +0200, Kay Sievers wrote: > Try "echo -e"? The stuff is copied verbatim otherwise. btw: I didn't change the devkmsg_writev function which does the decoding of any "<n>" prefix for printk_emit.

1 0

Re: [alsa-devel] [PATCH 0/8] Rework KERN_<LEVEL>
by Joe Perches 06 Jun '12

06 Jun '12

On Wed, 2012-06-06 at 01:39 +0200, Kay Sievers wrote: > On Wed, Jun 6, 2012 at 1:35 AM, Joe Perches <joe(a)perches.com> wrote: > > On Tue, 2012-06-05 at 16:29 -0700, Andrew Morton wrote: > >> What about writes starting with \001n? AFACIT, that will be stripped > >> away and the printk level will be altered. This is new behavior. > > > > Nope. > > > > # echo "\001Hello Andrew" > /dev/kmsg > > /dev/kmsg has > > 12,774,2462339252;\001Hello Andrew > > Try "echo -e"? The stuff is copied verbatim otherwise. # echo -e "\001Hello Kay" > /dev/kmsg gives 12,776,3046752764;\x01Hello Kay

1 0