* [PATCH V3 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings @ 2014-07-04 13:13 Sylwester Nawrocki 2014-07-04 13:13 ` [PATCH V3 2/2] ASoC: samsung: Add machine driver for Odroid X2/U3 Sylwester Nawrocki 2014-07-09 8:34 ` [PATCH V3 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings Mark Brown 0 siblings, 2 replies; 7+ messages in thread From: Sylwester Nawrocki @ 2014-07-04 13:13 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com> --- Changes since v2: - none. --- .../bindings/sound/samsung,odroidx2-max98090.txt | 35 ++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt diff --git a/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt new file mode 100644 index 0000000..9148f72 --- /dev/null +++ b/Documentation/devicetree/bindings/sound/samsung,odroidx2-max98090.txt @@ -0,0 +1,35 @@ +Samsung Exynos Odroid X2/U3 audio complex with MAX98090 codec + +Required properties: + - compatible : "samsung,odroidx2-audio" - for Odroid X2 board, + "samsung,odroidu3-audio" - for Odroid U3 board + - samsung,model : the user-visible name of this sound complex + - samsung,i2s-controller : the phandle of the I2S controller + - samsung,audio-codec : the phandle of the MAX98090 audio codec + - samsung,audio-routing : a list of the 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; + valid names for sources and sinks are the MAX98090's pins (as + documented in its binding), and the jacks on the board + For Odroid X2: + * Headphone Jack + * Mic Jack + * DMIC + + For Odroid U3: + * Headphone Jack + * Speakers + +Example: + +sound { + compatible = "samsung,odroidu3-audio"; + samsung,i2s-controller = <&i2s0>; + samsung,audio-codec = <&max98090>; + samsung,model = "Odroid-X2"; + samsung,audio-routing = + "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "IN1", "Mic Jack", + "Mic Jack", "MICBIAS"; +}; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH V3 2/2] ASoC: samsung: Add machine driver for Odroid X2/U3 2014-07-04 13:13 [PATCH V3 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings Sylwester Nawrocki @ 2014-07-04 13:13 ` Sylwester Nawrocki 2014-07-08 9:15 ` Daniel Drake 2014-07-09 8:34 ` [PATCH V3 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings Mark Brown 1 sibling, 1 reply; 7+ messages in thread From: Sylwester Nawrocki @ 2014-07-04 13:13 UTC (permalink / raw) To: linux-arm-kernel This patch adds the sound subsystem driver for Odroid-X2 and Odroid-U3 boards. The codec works in I2S master mode; there are two separate audio routing paths defined, as there are differences in the signal routing between the X2 and U3 boards, i.e. U3 uses single jack for headphones and microphone. Signed-off-by: Chen Zhen <zhen1.chen@samsung•com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com> --- Changes since v2: - clock settings moved to late_probe, odroidx2_ops removed; - added missing driver.pm ops initialization; - minor cleanups. --- sound/soc/samsung/Kconfig | 8 ++ sound/soc/samsung/Makefile | 2 + sound/soc/samsung/odroidx2_max98090.c | 177 +++++++++++++++++++++++++++++++++ 3 files changed, 187 insertions(+) create mode 100644 sound/soc/samsung/odroidx2_max98090.c diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 3be49cd..333d645 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -237,3 +237,11 @@ config SND_SOC_SNOW help Say Y if you want to add audio support for various Snow boards based on Exynos5 series of SoCs. + +config SND_SOC_ODROIDX2 + tristate "Audio support for Odroid-X2 and Odroid-U3" + depends on SND_SOC_SAMSUNG + select SND_SOC_MAX98090 + select SND_SAMSUNG_I2S + help + Say Y here to enable audio support for the Odroid-X2/U3. diff --git a/sound/soc/samsung/Makefile b/sound/soc/samsung/Makefile index 6469199..e8d9ccd 100644 --- a/sound/soc/samsung/Makefile +++ b/sound/soc/samsung/Makefile @@ -44,6 +44,7 @@ snd-soc-tobermory-objs := tobermory.o snd-soc-lowland-objs := lowland.o snd-soc-littlemill-objs := littlemill.o snd-soc-bells-objs := bells.o +snd-soc-odroidx2-max98090-objs := odroidx2_max98090.o obj-$(CONFIG_SND_SOC_SAMSUNG_JIVE_WM8750) += snd-soc-jive-wm8750.o obj-$(CONFIG_SND_SOC_SAMSUNG_NEO1973_WM8753) += snd-soc-neo1973-wm8753.o @@ -69,3 +70,4 @@ obj-$(CONFIG_SND_SOC_TOBERMORY) += snd-soc-tobermory.o obj-$(CONFIG_SND_SOC_LOWLAND) += snd-soc-lowland.o obj-$(CONFIG_SND_SOC_LITTLEMILL) += snd-soc-littlemill.o obj-$(CONFIG_SND_SOC_BELLS) += snd-soc-bells.o +obj-$(CONFIG_SND_SOC_ODROIDX2) += snd-soc-odroidx2-max98090.o diff --git a/sound/soc/samsung/odroidx2_max98090.c b/sound/soc/samsung/odroidx2_max98090.c new file mode 100644 index 0000000..278edf9 --- /dev/null +++ b/sound/soc/samsung/odroidx2_max98090.c @@ -0,0 +1,177 @@ +/* + * Copyright (C) 2014 Samsung Electronics Co., Ltd. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include <linux/of.h> +#include <linux/module.h> +#include <sound/soc.h> +#include <sound/pcm_params.h> +#include "i2s.h" + +struct odroidx2_drv_data { + const struct snd_soc_dapm_widget *dapm_widgets; + unsigned int num_dapm_widgets; +}; + +/* The I2S CDCLK output clock frequency for the MAX98090 codec */ +#define MAX98090_MCLK 19200000 + +static int odroidx2_late_probe(struct snd_soc_card *card) +{ + struct snd_soc_dai *codec_dai = card->rtd[0].codec_dai; + struct snd_soc_dai *cpu_dai = card->rtd[0].cpu_dai; + int ret; + + ret = snd_soc_dai_set_sysclk(codec_dai, 0, MAX98090_MCLK, + SND_SOC_CLOCK_IN); + if (ret < 0) + return ret; + + /* Set the cpu DAI configuration in order to use CDCLK */ + return snd_soc_dai_set_sysclk(cpu_dai, SAMSUNG_I2S_CDCLK, + 0, SND_SOC_CLOCK_OUT); +} + +static const struct snd_soc_dapm_widget odroidx2_dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Mic Jack", NULL), + SND_SOC_DAPM_MIC("DMIC", NULL), +}; + +static const struct snd_soc_dapm_widget odroidu3_dapm_widgets[] = { + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_SPK("Speakers", NULL), +}; + +static struct snd_soc_dai_link odroidx2_dai[] = { + { + .name = "MAX98090", + .stream_name = "MAX98090 PCM", + .codec_dai_name = "HiFi", + .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBM_CFM, + } +}; + +static struct snd_soc_card odroidx2 = { + .owner = THIS_MODULE, + .dai_link = odroidx2_dai, + .num_links = ARRAY_SIZE(odroidx2_dai), + .fully_routed = true, + .late_probe = odroidx2_late_probe, +}; + +struct odroidx2_drv_data odroidx2_drvdata = { + .dapm_widgets = odroidx2_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(odroidx2_dapm_widgets), +}; + +struct odroidx2_drv_data odroidu3_drvdata = { + .dapm_widgets = odroidu3_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(odroidu3_dapm_widgets), +}; + +static const struct of_device_id odroidx2_audio_of_match[] = { + { + .compatible = "samsung,odroidx2-audio", + .data = &odroidx2_drvdata, + }, { + .compatible = "samsung,odroidu3-audio", + .data = &odroidu3_drvdata, + }, + { }, +}; +MODULE_DEVICE_TABLE(of, odroidx2_audio_of_match); + +static int odroidx2_audio_probe(struct platform_device *pdev) +{ + struct device_node *snd_node = pdev->dev.of_node; + struct snd_soc_card *card = &odroidx2; + struct device_node *i2s_node, *codec_node; + struct odroidx2_drv_data *dd; + const struct of_device_id *of_id; + int ret; + + of_id = of_match_node(odroidx2_audio_of_match, snd_node); + dd = (struct odroidx2_drv_data *)of_id->data; + + card->num_dapm_widgets = dd->num_dapm_widgets; + card->dapm_widgets = dd->dapm_widgets; + + card->dev = &pdev->dev; + + ret = snd_soc_of_parse_card_name(card, "samsung,model"); + if (ret < 0) + return ret; + + ret = snd_soc_of_parse_audio_routing(card, "samsung,audio-routing"); + if (ret < 0) + return ret; + + codec_node = of_parse_phandle(snd_node, "samsung,audio-codec", 0); + if (!codec_node) { + dev_err(&pdev->dev, + "Failed parsing samsung,i2s-codec property\n"); + return -EINVAL; + } + + i2s_node = of_parse_phandle(snd_node, "samsung,i2s-controller", 0); + if (!i2s_node) { + dev_err(&pdev->dev, + "Failed parsing samsung,i2s-controller property\n"); + ret = -EINVAL; + goto err_put_codec_n; + } + + odroidx2_dai[0].codec_of_node = codec_node; + odroidx2_dai[0].cpu_of_node = i2s_node; + odroidx2_dai[0].platform_of_node = i2s_node; + + ret = snd_soc_register_card(card); + if (ret) { + dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n", + ret); + goto err_put_i2s_n; + } + return 0; + +err_put_i2s_n: + of_node_put(i2s_node); +err_put_codec_n: + of_node_put(codec_node); + return ret; +} + +static int odroidx2_audio_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + + snd_soc_unregister_card(card); + + of_node_put((struct device_node *)odroidx2_dai[0].cpu_of_node); + of_node_put((struct device_node *)odroidx2_dai[0].codec_of_node); + + return 0; +} + +static struct platform_driver odroidx2_audio_driver = { + .driver = { + .name = "odroidx2-audio", + .owner = THIS_MODULE, + .of_match_table = odroidx2_audio_of_match, + .pm = &snd_soc_pm_ops, + }, + .probe = odroidx2_audio_probe, + .remove = odroidx2_audio_remove, +}; +module_platform_driver(odroidx2_audio_driver); + +MODULE_AUTHOR("Chen Zhen <zhen1.chen@samsung•com>"); +MODULE_AUTHOR("Sylwester Nawrocki <s.nawrocki@samsung•com>"); +MODULE_DESCRIPTION("ALSA SoC Odroid X2/U3 Audio Support"); +MODULE_LICENSE("GPL v2"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH V3 2/2] ASoC: samsung: Add machine driver for Odroid X2/U3 2014-07-04 13:13 ` [PATCH V3 2/2] ASoC: samsung: Add machine driver for Odroid X2/U3 Sylwester Nawrocki @ 2014-07-08 9:15 ` Daniel Drake 2014-07-09 17:20 ` [alsa-devel] " Sylwester Nawrocki 2014-07-10 16:15 ` Sylwester Nawrocki 0 siblings, 2 replies; 7+ messages in thread From: Daniel Drake @ 2014-07-08 9:15 UTC (permalink / raw) To: linux-arm-kernel Hi Sylwester, On Fri, Jul 4, 2014 at 2:13 PM, Sylwester Nawrocki <s.nawrocki@samsung•com> wrote: > This patch adds the sound subsystem driver for Odroid-X2 and > Odroid-U3 boards. The codec works in I2S master mode; there > are two separate audio routing paths defined, as there are > differences in the signal routing between the X2 and U3 boards, > i.e. U3 uses single jack for headphones and microphone. > > Signed-off-by: Chen Zhen <zhen1.chen@samsung•com> > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com> Testing on ODROID-U2, v3 is not quite working for me, but v2 of the patch was fine. I boot up, run: # speaker-test -c 2 -t wav As soon as I hear the word "front" I press ctrl+c and then run the command again. Now the command hangs with no audible output. Any ideas? Let me know if you have trouble reproducing. Thanks Daniel ^ permalink raw reply [flat|nested] 7+ messages in thread
* [alsa-devel] [PATCH V3 2/2] ASoC: samsung: Add machine driver for Odroid X2/U3 2014-07-08 9:15 ` Daniel Drake @ 2014-07-09 17:20 ` Sylwester Nawrocki 2014-07-10 16:15 ` Sylwester Nawrocki 1 sibling, 0 replies; 7+ messages in thread From: Sylwester Nawrocki @ 2014-07-09 17:20 UTC (permalink / raw) To: linux-arm-kernel Hi, On 08/07/14 11:15, Daniel Drake wrote: > On Fri, Jul 4, 2014 at 2:13 PM, Sylwester Nawrocki > <s.nawrocki@samsung•com> wrote: >> This patch adds the sound subsystem driver for Odroid-X2 and >> Odroid-U3 boards. The codec works in I2S master mode; there >> are two separate audio routing paths defined, as there are >> differences in the signal routing between the X2 and U3 boards, >> i.e. U3 uses single jack for headphones and microphone. >> >> Signed-off-by: Chen Zhen <zhen1.chen@samsung•com> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com> > > Testing on ODROID-U2, v3 is not quite working for me, but v2 of the > patch was fine. > I boot up, run: > # speaker-test -c 2 -t wav > > As soon as I hear the word "front" I press ctrl+c and then run the > command again. > Now the command hangs with no audible output. > > Any ideas? Let me know if you have trouble reproducing. Thanks the feedback, we have also noticed this issue. It sounds like a bug in the Samsung I2S driver, which sets the CDCLK pin to input mode in the i2s_shutdown callback and never restores it. AFAICS this setting should not be lost after a call to struct soc_snd_dai_ops::shutdown(). I'm going will prepare a proper patch soon, until then you could try and see if this fixes the problem for you: ---8<--- diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index d80121e..42c4f3e 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -724,10 +724,6 @@ static void i2s_shutdown(struct snd_pcm_substream *substream, spin_unlock_irqrestore(&lock, flags); - /* Gate CDCLK by default */ - if (!is_opened(other)) - i2s_set_sysclk(dai, SAMSUNG_I2S_CDCLK, - 0, SND_SOC_CLOCK_IN); } --->8--- -- Thanks, Sylwester ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [alsa-devel] [PATCH V3 2/2] ASoC: samsung: Add machine driver for Odroid X2/U3 2014-07-08 9:15 ` Daniel Drake 2014-07-09 17:20 ` [alsa-devel] " Sylwester Nawrocki @ 2014-07-10 16:15 ` Sylwester Nawrocki 2014-07-14 15:25 ` Daniel Drake 1 sibling, 1 reply; 7+ messages in thread From: Sylwester Nawrocki @ 2014-07-10 16:15 UTC (permalink / raw) To: linux-arm-kernel Hi Daniel, On 08/07/14 11:15, Daniel Drake wrote: > Testing on ODROID-U2, v3 is not quite working for me, but v2 of the > patch was fine. > I boot up, run: > # speaker-test -c 2 -t wav > > As soon as I hear the word "front" I press ctrl+c and then run the > command again. > Now the command hangs with no audible output. > > Any ideas? Let me know if you have trouble reproducing. I just posted a patch addressing this, please let me know if there are any further issues. -- Thanks, Sylwester ^ permalink raw reply [flat|nested] 7+ messages in thread
* [alsa-devel] [PATCH V3 2/2] ASoC: samsung: Add machine driver for Odroid X2/U3 2014-07-10 16:15 ` Sylwester Nawrocki @ 2014-07-14 15:25 ` Daniel Drake 0 siblings, 0 replies; 7+ messages in thread From: Daniel Drake @ 2014-07-14 15:25 UTC (permalink / raw) To: linux-arm-kernel On Thu, Jul 10, 2014 at 5:15 PM, Sylwester Nawrocki <s.nawrocki@samsung•com> wrote: > On 08/07/14 11:15, Daniel Drake wrote: >> Testing on ODROID-U2, v3 is not quite working for me, but v2 of the >> patch was fine. >> I boot up, run: >> # speaker-test -c 2 -t wav >> >> As soon as I hear the word "front" I press ctrl+c and then run the >> command again. >> Now the command hangs with no audible output. >> >> Any ideas? Let me know if you have trouble reproducing. > > I just posted a patch addressing this, please let me know > if there are any further issues. Sorry for not testing sooner. Your patch solves the issue. Thanks Daniel ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH V3 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings 2014-07-04 13:13 [PATCH V3 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings Sylwester Nawrocki 2014-07-04 13:13 ` [PATCH V3 2/2] ASoC: samsung: Add machine driver for Odroid X2/U3 Sylwester Nawrocki @ 2014-07-09 8:34 ` Mark Brown 1 sibling, 0 replies; 7+ messages in thread From: Mark Brown @ 2014-07-09 8:34 UTC (permalink / raw) To: linux-arm-kernel On Fri, Jul 04, 2014 at 03:13:44PM +0200, Sylwester Nawrocki wrote: > Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung•com> Applied both, thanks. Please use subject lines consistent with the subsystem style. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140709/2395ee4d/attachment.sig> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-07-14 15:25 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-07-04 13:13 [PATCH V3 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings Sylwester Nawrocki 2014-07-04 13:13 ` [PATCH V3 2/2] ASoC: samsung: Add machine driver for Odroid X2/U3 Sylwester Nawrocki 2014-07-08 9:15 ` Daniel Drake 2014-07-09 17:20 ` [alsa-devel] " Sylwester Nawrocki 2014-07-10 16:15 ` Sylwester Nawrocki 2014-07-14 15:25 ` Daniel Drake 2014-07-09 8:34 ` [PATCH V3 1/2] doc: dt bindings: Document Odroid X2/U3 audio subsystem bindings Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox