August 2016 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH v8 1/5] video: rmk's HDMI notification prototype
by Russell King - ARM Linux 11 Aug '16

11 Aug '16

On Thu, Aug 11, 2016 at 12:49:21PM +0200, Hans Verkuil wrote: > On 08/11/16 12:39, Russell King - ARM Linux wrote: > > On Thu, Aug 11, 2016 at 12:30:03PM +0200, Hans Verkuil wrote: > >> Hi Russell, > >> > >> I like this approach and it is something I will need for other CEC drivers > >> (not yet merged) as well. > >> > >> Just a few comments: > >> > >> On 08/11/16 11:20, Philipp Zabel wrote: > >>> This is Russell's HDMI notification prototype [1], currently waiting > >>> for the HDMI CEC situation to resolve. > >>> > >>> The use case for the notifications on MediaTek MT8173 is to let the > >>> (dis)connection notifications control an ALSA jack object. > >>> > >>> No Signed-off-by since this is not my code, and still up for discussion. > >>> > >>> [1] https://patchwork.kernel.org/patch/8351501/ > >>> --- > >>> drivers/video/Kconfig | 3 +++ > >>> drivers/video/Makefile | 1 + > >>> drivers/video/hdmi-notifier.c | 61 +++++++++++++++++++++++++++++++++++++++++++ > >>> include/linux/hdmi-notifier.h | 44 +++++++++++++++++++++++++++++++ > >>> 4 files changed, 109 insertions(+) > >>> create mode 100644 drivers/video/hdmi-notifier.c > >>> create mode 100644 include/linux/hdmi-notifier.h > >>> > >>> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > >>> index 3c20af9..1ee7b9f 100644 > >>> --- a/drivers/video/Kconfig > >>> +++ b/drivers/video/Kconfig > >>> @@ -36,6 +36,9 @@ config VIDEOMODE_HELPERS > >>> config HDMI > >>> bool > >>> > >>> +config HDMI_NOTIFIERS > >>> + bool > >>> + > >>> if VT > >>> source "drivers/video/console/Kconfig" > >>> endif > >>> diff --git a/drivers/video/Makefile b/drivers/video/Makefile > >>> index 9ad3c17..65f5649 100644 > >>> --- a/drivers/video/Makefile > >>> +++ b/drivers/video/Makefile > >>> @@ -1,5 +1,6 @@ > >>> obj-$(CONFIG_VGASTATE) += vgastate.o > >>> obj-$(CONFIG_HDMI) += hdmi.o > >>> +obj-$(CONFIG_HDMI_NOTIFIERS) += hdmi-notifier.o > >>> > >>> obj-$(CONFIG_VT) += console/ > >>> obj-$(CONFIG_LOGO) += logo/ > >>> diff --git a/drivers/video/hdmi-notifier.c b/drivers/video/hdmi-notifier.c > >>> new file mode 100644 > >>> index 0000000..a233359 > >>> --- /dev/null > >>> +++ b/drivers/video/hdmi-notifier.c > >>> @@ -0,0 +1,61 @@ > >>> +#include <linux/export.h> > >>> +#include <linux/hdmi-notifier.h> > >>> +#include <linux/notifier.h> > >>> +#include <linux/string.h> > >>> + > >>> +static BLOCKING_NOTIFIER_HEAD(hdmi_notifier); > >>> + > >>> +int hdmi_register_notifier(struct notifier_block *nb) > >>> +{ > >>> + return blocking_notifier_chain_register(&hdmi_notifier, nb); > >>> +} > >>> +EXPORT_SYMBOL_GPL(hdmi_register_notifier); > >>> + > >>> +int hdmi_unregister_notifier(struct notifier_block *nb) > >>> +{ > >>> + return blocking_notifier_chain_unregister(&hdmi_notifier, nb); > >>> +} > >>> +EXPORT_SYMBOL_GPL(hdmi_unregister_notifier); > >>> + > >>> +void hdmi_event_connect(struct device *dev) > >>> +{ > >>> + struct hdmi_event_base base; > >>> + > >>> + base.source = dev; > >>> + > >>> + blocking_notifier_call_chain(&hdmi_notifier, HDMI_CONNECTED, &base); > >>> +} > >>> +EXPORT_SYMBOL_GPL(hdmi_event_connect); > >>> + > >>> +void hdmi_event_disconnect(struct device *dev) > >>> +{ > >>> + struct hdmi_event_base base; > >>> + > >>> + base.source = dev; > >>> + > >>> + blocking_notifier_call_chain(&hdmi_notifier, HDMI_DISCONNECTED, &base); > >>> +} > >>> +EXPORT_SYMBOL_GPL(hdmi_event_disconnect); > >>> + > >>> +void hdmi_event_new_edid(struct device *dev, const void *edid, size_t size) > >> > >> I would prefer const u8 *edid. It is after all just a u8 array and not some > >> opaque data structure. > > > > In DRM, the edid is of type "struct edid" (defined in > > include/drm/drm_edid.h). So, making it "const u8 *" means that all > > DRM drivers will have to explicitly cast it - not something I'm in > > favour of. > > I thought this was the raw EDID data. But if you pass a struct edid around, > then why not make this const struct edid *edid? I fail to see why you would > want to use a void pointer here. struct edid is a DRM thing - it's not generic. Using struct edid here would force everyone to use the DRM structure, whereas other subsystems use, eg, unsigned char. > Also struct edid is for the first EDID block only, whereas CEC drivers need > the CEA-861 block to get the physical address. That may be, but DRM parses the HDMI vendor block too while still using struct edid to represent it. See drm_find_edid_extension() in drivers/gpu/drm/drm_edid.c This is just how DRM is... I'm not sure what the design decisions were that came up with this, but it's what we have, and I'm not sure whether DRM would be open to changing it. > > The ELD stands for EDID-like data. See information on HDA039. It's a > > method of conveying the EDID data specific to audio drivers to them > > without having the complexities of parsing the full EDID each time. > > It's also exported to userland so that userland can determine the > > capabilities of the audio path, again, without having to have full > > EDID parsers and exporting the full EDID data block through audio > > drivers. > > > > OK. Since eld is an unsigned char array I would suggest changing void to > unsigned char here. > > Or perhaps const unsigned char eld[128]. Yes, I'll make that change. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.

1 0

[alsa-devel] [PATCH] ASoC: arizona: Connect ASRCs to both clock domains
by Charles Keepax 11 Aug '16

11 Aug '16

The two clock domains are enabled based on each input and output of the chip being connected to its respective clock domain. The ASRC however can bridge the two domains and as such can function as an input/output to either domain. The hardware also requires that both clocks are enabled before the ASRC is. Ensure these constraints by linking the ASRCs to both SYSCLK and ASYNCCLK. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/cs47l24.c | 10 ++++++++++ sound/soc/codecs/wm5102.c | 10 ++++++++++ sound/soc/codecs/wm5110.c | 10 ++++++++++ sound/soc/codecs/wm8998.c | 10 ++++++++++ 4 files changed, 40 insertions(+) diff --git a/sound/soc/codecs/cs47l24.c b/sound/soc/codecs/cs47l24.c index 779a7bf..257b152 100644 --- a/sound/soc/codecs/cs47l24.c +++ b/sound/soc/codecs/cs47l24.c @@ -746,6 +746,16 @@ static const struct snd_soc_dapm_route cs47l24_dapm_routes[] = { { "IN2L", NULL, "SYSCLK" }, { "IN2R", NULL, "SYSCLK" }, + { "ASRC1L", NULL, "SYSCLK" }, + { "ASRC1R", NULL, "SYSCLK" }, + { "ASRC2L", NULL, "SYSCLK" }, + { "ASRC2R", NULL, "SYSCLK" }, + + { "ASRC1L", NULL, "ASYNCCLK" }, + { "ASRC1R", NULL, "ASYNCCLK" }, + { "ASRC2L", NULL, "ASYNCCLK" }, + { "ASRC2R", NULL, "ASYNCCLK" }, + { "MICBIAS1", NULL, "MICVDD" }, { "MICBIAS2", NULL, "MICVDD" }, diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 1295978..2d6c19d 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1521,6 +1521,16 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = { { "IN3L", NULL, "SYSCLK" }, { "IN3R", NULL, "SYSCLK" }, + { "ASRC1L", NULL, "SYSCLK" }, + { "ASRC1R", NULL, "SYSCLK" }, + { "ASRC2L", NULL, "SYSCLK" }, + { "ASRC2R", NULL, "SYSCLK" }, + + { "ASRC1L", NULL, "ASYNCCLK" }, + { "ASRC1R", NULL, "ASYNCCLK" }, + { "ASRC2L", NULL, "ASYNCCLK" }, + { "ASRC2R", NULL, "ASYNCCLK" }, + { "MICBIAS1", NULL, "MICVDD" }, { "MICBIAS2", NULL, "MICVDD" }, { "MICBIAS3", NULL, "MICVDD" }, diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 3e7f873..fa35e19 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -1745,6 +1745,16 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { { "IN4L", NULL, "SYSCLK" }, { "IN4R", NULL, "SYSCLK" }, + { "ASRC1L", NULL, "SYSCLK" }, + { "ASRC1R", NULL, "SYSCLK" }, + { "ASRC2L", NULL, "SYSCLK" }, + { "ASRC2R", NULL, "SYSCLK" }, + + { "ASRC1L", NULL, "ASYNCCLK" }, + { "ASRC1R", NULL, "ASYNCCLK" }, + { "ASRC2L", NULL, "ASYNCCLK" }, + { "ASRC2R", NULL, "ASYNCCLK" }, + { "MICBIAS1", NULL, "MICVDD" }, { "MICBIAS2", NULL, "MICVDD" }, { "MICBIAS3", NULL, "MICVDD" }, diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c index 315b23b..edaa4cf 100644 --- a/sound/soc/codecs/wm8998.c +++ b/sound/soc/codecs/wm8998.c @@ -966,6 +966,16 @@ static const struct snd_soc_dapm_route wm8998_dapm_routes[] = { { "IN2A", NULL, "SYSCLK" }, { "IN2B", NULL, "SYSCLK" }, + { "ASRC1L", NULL, "SYSCLK" }, + { "ASRC1R", NULL, "SYSCLK" }, + { "ASRC2L", NULL, "SYSCLK" }, + { "ASRC2R", NULL, "SYSCLK" }, + + { "ASRC1L", NULL, "ASYNCCLK" }, + { "ASRC1R", NULL, "ASYNCCLK" }, + { "ASRC2L", NULL, "ASYNCCLK" }, + { "ASRC2R", NULL, "ASYNCCLK" }, + { "SPD1", NULL, "SYSCLK" }, { "SPD1", NULL, "SPD1TX1" }, { "SPD1", NULL, "SPD1TX2" }, -- 2.1.4

1 0

[alsa-devel] [PATCH] ASoC: wm2000: Fix return of uninitialised varible
by Charles Keepax 11 Aug '16

11 Aug '16

Anything that sets ret in wm2000_anc_transition will have immediately returned anyway as such we will always return an uninitialised ret at the bottom of the function. Simply replace the return with a return 0; Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm2000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm2000.c b/sound/soc/codecs/wm2000.c index 1ebaf99..199a3d8 100644 --- a/sound/soc/codecs/wm2000.c +++ b/sound/soc/codecs/wm2000.c @@ -581,7 +581,7 @@ static int wm2000_anc_transition(struct wm2000_priv *wm2000, if (anc_transitions[i].dest == ANC_OFF) clk_disable_unprepare(wm2000->mclk); - return ret; + return 0; } static int wm2000_anc_set_mode(struct wm2000_priv *wm2000) -- 2.1.4

1 0

[alsa-devel] [PATCH] ASoC: Fix leak of rtd in soc_bind_dai_link
by Charles Keepax 11 Aug '16

11 Aug '16

If we fail to find a platform we simply return EPROBE_DEFER, but we have allocated the rtd pointer. All error paths before soc_add_pcm_runtime need to call soc_free_pcm_runtime first to avoid leaking the rtd pointer. A suitable error path already exists and is used else where in the function so simply use that here as well. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 054d94f..84e3fa1 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1056,7 +1056,7 @@ static int soc_bind_dai_link(struct snd_soc_card *card, if (!rtd->platform) { dev_err(card->dev, "ASoC: platform %s not registered\n", dai_link->platform_name); - return -EPROBE_DEFER; + goto _err_defer; } soc_add_pcm_runtime(card, rtd); -- 2.1.4

1 0

[alsa-devel] [PATCH] ASoC: rt5659: Add mclk controls
by Nicolin Chen 11 Aug '16

11 Aug '16

The codec driver should control the mclk. So this patch adds this support. Signed-off-by: Nicolin Chen <nicoleotsuka(a)gmail.com> --- Documentation/devicetree/bindings/sound/rt5659.txt | 3 +++ sound/soc/codecs/rt5659.c | 24 ++++++++++++++++++++++ sound/soc/codecs/rt5659.h | 1 + 3 files changed, 28 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rt5659.txt b/Documentation/devicetree/bindings/sound/rt5659.txt index 5f79e7f..1766e05 100644 --- a/Documentation/devicetree/bindings/sound/rt5659.txt +++ b/Documentation/devicetree/bindings/sound/rt5659.txt @@ -12,6 +12,9 @@ Required properties: Optional properties: +- clocks: The phandle of the master clock to the CODEC +- clock-names: Should be "mclk" + - realtek,in1-differential - realtek,in3-differential - realtek,in4-differential diff --git a/sound/soc/codecs/rt5659.c b/sound/soc/codecs/rt5659.c index 1b30914..d9ead96 100644 --- a/sound/soc/codecs/rt5659.c +++ b/sound/soc/codecs/rt5659.c @@ -9,6 +9,7 @@ * published by the Free Software Foundation. */ +#include <linux/clk.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/init.h> @@ -3565,7 +3566,9 @@ static int rt5659_set_bclk_ratio(struct snd_soc_dai *dai, unsigned int ratio) static int rt5659_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { + struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct rt5659_priv *rt5659 = snd_soc_codec_get_drvdata(codec); + int ret; switch (level) { case SND_SOC_BIAS_PREPARE: @@ -3582,6 +3585,17 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec, RT5659_PWR_FV1 | RT5659_PWR_FV2); break; + case SND_SOC_BIAS_STANDBY: + if (dapm->bias_level == SND_SOC_BIAS_OFF) { + ret = clk_prepare_enable(rt5659->mclk); + if (ret) { + dev_err(codec->dev, + "failed to enable MCLK: %d\n", ret); + return ret; + } + } + break; + case SND_SOC_BIAS_OFF: regmap_update_bits(rt5659->regmap, RT5659_PWR_DIG_1, RT5659_PWR_LDO, 0); @@ -3591,6 +3605,7 @@ static int rt5659_set_bias_level(struct snd_soc_codec *codec, RT5659_PWR_MB | RT5659_PWR_VREF2); regmap_update_bits(rt5659->regmap, RT5659_DIG_MISC, RT5659_DIG_GATE_CTRL, 0); + clk_disable_unprepare(rt5659->mclk); break; default: @@ -4020,6 +4035,15 @@ static int rt5659_i2c_probe(struct i2c_client *i2c, regmap_write(rt5659->regmap, RT5659_RESET, 0); + /* Check if MCLK provided */ + rt5659->mclk = devm_clk_get(&i2c->dev, "mclk"); + if (IS_ERR(rt5659->mclk)) { + if (PTR_ERR(rt5659->mclk) == -EPROBE_DEFER) + return -EPROBE_DEFER; + /* Otherwise mark the mclk pointer to NULL */ + rt5659->mclk = NULL; + } + rt5659_calibrate(rt5659); /* line in diff mode*/ diff --git a/sound/soc/codecs/rt5659.h b/sound/soc/codecs/rt5659.h index d31c9e5..d69b0eb 100644 --- a/sound/soc/codecs/rt5659.h +++ b/sound/soc/codecs/rt5659.h @@ -1796,6 +1796,7 @@ struct rt5659_priv { struct gpio_desc *gpiod_reset; struct snd_soc_jack *hs_jack; struct delayed_work jack_detect_work; + struct clk *mclk; int sysclk; int sysclk_src; -- 2.1.4

5 15

Re: [alsa-devel] [PATCH v8 1/5] video: rmk's HDMI notification prototype
by Russell King - ARM Linux 11 Aug '16

11 Aug '16

On Thu, Aug 11, 2016 at 12:30:03PM +0200, Hans Verkuil wrote: > Hi Russell, > > I like this approach and it is something I will need for other CEC drivers > (not yet merged) as well. > > Just a few comments: > > On 08/11/16 11:20, Philipp Zabel wrote: > > This is Russell's HDMI notification prototype [1], currently waiting > > for the HDMI CEC situation to resolve. > > > > The use case for the notifications on MediaTek MT8173 is to let the > > (dis)connection notifications control an ALSA jack object. > > > > No Signed-off-by since this is not my code, and still up for discussion. > > > > [1] https://patchwork.kernel.org/patch/8351501/ > > --- > > drivers/video/Kconfig | 3 +++ > > drivers/video/Makefile | 1 + > > drivers/video/hdmi-notifier.c | 61 +++++++++++++++++++++++++++++++++++++++++++ > > include/linux/hdmi-notifier.h | 44 +++++++++++++++++++++++++++++++ > > 4 files changed, 109 insertions(+) > > create mode 100644 drivers/video/hdmi-notifier.c > > create mode 100644 include/linux/hdmi-notifier.h > > > > diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig > > index 3c20af9..1ee7b9f 100644 > > --- a/drivers/video/Kconfig > > +++ b/drivers/video/Kconfig > > @@ -36,6 +36,9 @@ config VIDEOMODE_HELPERS > > config HDMI > > bool > > > > +config HDMI_NOTIFIERS > > + bool > > + > > if VT > > source "drivers/video/console/Kconfig" > > endif > > diff --git a/drivers/video/Makefile b/drivers/video/Makefile > > index 9ad3c17..65f5649 100644 > > --- a/drivers/video/Makefile > > +++ b/drivers/video/Makefile > > @@ -1,5 +1,6 @@ > > obj-$(CONFIG_VGASTATE) += vgastate.o > > obj-$(CONFIG_HDMI) += hdmi.o > > +obj-$(CONFIG_HDMI_NOTIFIERS) += hdmi-notifier.o > > > > obj-$(CONFIG_VT) += console/ > > obj-$(CONFIG_LOGO) += logo/ > > diff --git a/drivers/video/hdmi-notifier.c b/drivers/video/hdmi-notifier.c > > new file mode 100644 > > index 0000000..a233359 > > --- /dev/null > > +++ b/drivers/video/hdmi-notifier.c > > @@ -0,0 +1,61 @@ > > +#include <linux/export.h> > > +#include <linux/hdmi-notifier.h> > > +#include <linux/notifier.h> > > +#include <linux/string.h> > > + > > +static BLOCKING_NOTIFIER_HEAD(hdmi_notifier); > > + > > +int hdmi_register_notifier(struct notifier_block *nb) > > +{ > > + return blocking_notifier_chain_register(&hdmi_notifier, nb); > > +} > > +EXPORT_SYMBOL_GPL(hdmi_register_notifier); > > + > > +int hdmi_unregister_notifier(struct notifier_block *nb) > > +{ > > + return blocking_notifier_chain_unregister(&hdmi_notifier, nb); > > +} > > +EXPORT_SYMBOL_GPL(hdmi_unregister_notifier); > > + > > +void hdmi_event_connect(struct device *dev) > > +{ > > + struct hdmi_event_base base; > > + > > + base.source = dev; > > + > > + blocking_notifier_call_chain(&hdmi_notifier, HDMI_CONNECTED, &base); > > +} > > +EXPORT_SYMBOL_GPL(hdmi_event_connect); > > + > > +void hdmi_event_disconnect(struct device *dev) > > +{ > > + struct hdmi_event_base base; > > + > > + base.source = dev; > > + > > + blocking_notifier_call_chain(&hdmi_notifier, HDMI_DISCONNECTED, &base); > > +} > > +EXPORT_SYMBOL_GPL(hdmi_event_disconnect); > > + > > +void hdmi_event_new_edid(struct device *dev, const void *edid, size_t size) > > I would prefer const u8 *edid. It is after all just a u8 array and not some > opaque data structure. In DRM, the edid is of type "struct edid" (defined in include/drm/drm_edid.h). So, making it "const u8 *" means that all DRM drivers will have to explicitly cast it - not something I'm in favour of. > > +{ > > + struct hdmi_event_new_edid new_edid; > > + > > + new_edid.base.source = dev; > > + new_edid.edid = edid; > > + new_edid.size = size; > > + > > + blocking_notifier_call_chain(&hdmi_notifier, HDMI_NEW_EDID, &new_edid); > > +} > > +EXPORT_SYMBOL_GPL(hdmi_event_new_edid); > > + > > +void hdmi_event_new_eld(struct device *dev, const void *eld) > > Stupid question: what does ELD stand for? I've no idea... > > And is void the right choice here or should it also be u8? The ELD stands for EDID-like data. See information on HDA039. It's a method of conveying the EDID data specific to audio drivers to them without having the complexities of parsing the full EDID each time. It's also exported to userland so that userland can determine the capabilities of the audio path, again, without having to have full EDID parsers and exporting the full EDID data block through audio drivers. -- RMK's Patch system: http://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.

1 0

[alsa-devel] [PATCH 0/3] ASoC: Intel: Skylake: Refine manifest module info
by Vinod Koul 10 Aug '16

10 Aug '16

The module query uses a local structure dfw_config and then populates module skl_module_cfg. Instead we can pass skl_module_cfg as argument and get it updated in snd_skl_get_module_info() Also we can optimize runtime processing by using driver list to populate module info after init. That makes runtime query introduced earlier redundant so remove that while keeping error messages. Dharageswari R (1): ASoC: Intel: Skylake: modify snd_skl_get_module_info args Vinod Koul (2): ASoC: Intel: Skylake: Populate modules after loading ASoC: Intel: Skylake: remove module id query at runtime sound/soc/intel/skylake/skl-pcm.c | 27 +++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-sst-dsp.h | 7 ++++--- sound/soc/intel/skylake/skl-sst-utils.c | 10 +++++----- sound/soc/intel/skylake/skl-topology.c | 22 ++++------------------ 4 files changed, 40 insertions(+), 26 deletions(-) -- 1.9.1

2 5

[alsa-devel] [PATCH 0/6] ASoC: simple-card: add canonicalize_cpu / clean_reference
by Kuninori Morimoto 10 Aug '16

10 Aug '16

Hi Mark These add canonicalize_cpu / clean_reference to simple utiles. These are part of simple-card cleanup Kuninori Morimoto (6): ASoC: simple-card-utils: add asoc_simple_card_init_dai() ASoC: simple-card: use asoc_simple_card_init_dai() ASoC: rsrc-card: use asoc_simple_card_init_dai() ASoC: simple-card-utils: add asoc_simple_card_canonicalize_dailink() ASoC: simple-card: use asoc_simple_card_canonicalize_dailink() ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink() include/sound/simple_card_utils.h | 5 +++++ sound/soc/generic/simple-card-utils.c | 42 ++++++++++++++++++++++++++++++++++++++++++ sound/soc/generic/simple-card.c | 47 +++++------------------------------------------ sound/soc/sh/rcar/rsrc-card.c | 32 +++++--------------------------- 4 files changed, 57 insertions(+), 69 deletions(-) -- 1.9.1

2 10

[alsa-devel] [PATCH 00/49] ASoC: add simple-card-core and standardize "simple" card
by Kuninori Morimoto 10 Aug '16

10 Aug '16

Hi Mark These are very big patch-set, but basically just cleanup for simple-card driver. Now, we have simple-card driver, but it is not simple today. I would like to cleanup this. And Renesas already have rsrc-card driver which is supporting DPCM, and it is based on simple-card. This measn rsrc-card and simple-card are very similar. Thus, I would like to share these code between rsrc-card and simple-card. This rsrc-card is only used from Renesas (actually, there is no upstream user, current user is only me, by local). But this is not Renesas special driver, I can say it is DPCM version of simple-card. I would like to open it for all of ALSA people. But, not merge simple-card <-> rsrc-card, to avoid diffcult future maintenance. Thus, rsrc-card will be simple-dpcm-audio-card, and we can maintenance both simple-card, and simple-dpcm-card. I'm not sure this is good nameing. And finally, we will need HDMI sound support which uses graph base probing. I know it needs more discussion with V4L2 people. But in my understanding, basically, we can reuse simple-card base feature/function on graph base driver somehow. I would like to standardize simple card style, and use/share it with graph driver too. It will be simple-graph-card ? I'm not sure. But I think we can share same code, and can avoid development from 0. These patch are for it. Basically, it pickups common function/feature from simple-card and rsrc-card, and standardize each feature/parse/init etc in simple-card-core. Because of this patch-set, "simple-card" become "simple" again :) I tested these (simple-card, rsrc-card) on my lager, Salvator boards. But I couldn't test some feature. I hope test it on many environment. 1) - 4) cleanup for these patch-set 5) - 19) pickuped common function/feature and put it to simple-card-core 20) - 32) use simple-card-core on simple-card 33) - 46) use simple-card-core on rsrc-card 47) - 49) rename rsrc-card to simple-dpcm-audio-card Kuninori Morimoto (49): 1) ASoC: simple-card: remove duplicate header 2) ASoC: rsrc-card: remove duplicate header 3) ASoC: rsrc-card: remove unused dai_num 4) ASoC: simple-card: platform also uses asoc_simple_card_sub_parse_of() 5) ASoC: add new simple-card-core.c 6) ASoC: simple-card-core: add asoc_simple_card_parse_tdm() 7) ASoC: simple-card-core: add asoc_simple_card_parse_dailink_name() 8) ASoC: simple-card-core: add asoc_simple_card_parse_card_name() 9) ASoC: simple-card-core: add asoc_simple_card_parse_card_prefix() 10) ASoC: simple-card-core: add asoc_simple_card_parse_card_widgets() 11) ASoC: simple-card-core: add asoc_simple_card_parse_card_widgets() 12) ASoC: simple-card-core: add asoc_simple_card_parse_clk() 13) ASoC: simple-card-core: add asoc_simple_card_parse_endpoint() 14) ASoC: simple-card-core: add asoc_simple_card_parse_dpcm() 15) ASoC: simple-card-core: add asoc_simple_card_init_jack() 16) ASoC: simple-card-core: add asoc_simple_card_init_dai() 17) ASoC: simple-card-core: add asoc_simple_card_canonicalize_dailink() 18) ASoC: simple-card-core: add asoc_simple_card_canonicalize_cpu() 19) ASoC: simple-card-core: add asoc_simple_card_clean_reference() 20) ASoC: simple-card: use asoc_simple_card_parse_daifmt() 21) ASoC: simple-card: use asoc_simple_card_parse_clk() 22) ASoC: simple-card: use asoc_simple_card_parse_endpoint() 23) ASoC: simple-card: use asoc_simple_card_parse_tdm() 24) ASoC: simple-card: use asoc_simple_card_parse_card_name() 25) ASoC: simple-card: use asoc_simple_card_parse_card_route() 26) ASoC: simple-card: use asoc_simple_card_parse_card_widgets() 27) ASoC: simple-card: use asoc_simple_card_parse_dailink_name() 28) ASoC: simple-card: use asoc_simple_card_init_jack() 29) ASoC: simple-card: use asoc_simple_card_init_dai() 30) ASoC: simple-card: use asoc_simple_card_canonicalize_dailink() 31) ASoC: simple-card: use asoc_simple_card_canonicalize_cpu() 32) ASoC: simple-card: use asoc_simple_card_clean_reference() 33) ASoC: rsrc-card: use asoc_simple_card_parse_daifmt() 34) ASoC: rsrc-card: use asoc_simple_card_parse_dailink_name() 35) ASoC: rsrc-card: use asoc_simple_dai instead of rsrc_card_dai 36) ASoC: rsrc-card: use asoc_simple_card_parse_clk() 37) ASoC: rsrc-card: use asoc_simple_card_parse_endpoint() 38) ASoC: rsrc-card: use asoc_simple_card_parse_card_name() 39) ASoC: rsrc-card: use asoc_simple_card_parse_card_prefix() 40) ASoC: rsrc-card: use asoc_simple_card_parse_dpcm() 41) ASoC: rsrc-card: use asoc_simple_card_parse_card_route() 42) ASoC: rsrc-card: use asoc_simple_card_parse_tdm() 43) ASoC: rsrc-card: use asoc_simple_card_init_dai() 44) ASoC: rsrc-card: use asoc_simple_card_canonicalize_cpu() 45) ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink() 46) ASoC: rsrc-card: use asoc_simple_card_clean_reference() 47) ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase1 48) ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase2 49) ASoC: rsrc-card: rename rsrc-card to simple-dpcm-card phase3 Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt | 75 -------------- Documentation/devicetree/bindings/sound/simple-dpcm-card.txt | 79 +++++++++++++++ include/sound/simple_card.h | 11 +-- include/sound/simple_card_core.h | 106 ++++++++++++++++++++ sound/soc/generic/Kconfig | 10 ++ sound/soc/generic/Makefile | 4 + sound/soc/generic/simple-card-core.c | 409 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/generic/simple-card.c | 359 ++++++++++++------------------------------------------------------ sound/soc/generic/simple-dpcm-card.c | 330 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/sh/Kconfig | 5 - sound/soc/sh/rcar/Makefile | 3 - sound/soc/sh/rcar/rsrc-card.c | 529 -------------------------------------------------------------------------------------------------- 12 files changed, 999 insertions(+), 921 deletions(-)

2 72

[alsa-devel] [PATCH v4 2/4] mfd: Add Samsung Exynos Low Power Audio Subsystem driver
by Sylwester Nawrocki 10 Aug '16

10 Aug '16

This patch adds common driver for the Top block of the Samsung Exynos SoC Low Power Audio Subsystem. This is a minimal driver which prepares resources for IP blocks like I2S, audio DMA and UART and exposes a regmap for the Top block registers. Also system power ops are added to ensure the Audio Subsystem is operational after system suspend/resume cycle. Signed-off-by: Inha Song <ideal.song(a)samsung.com> Signed-off-by: Beomho Seo <beomho.seo(a)samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- Changes since v3: - moved from sound/soc/samsung and rewritten as a MFD driver, - PMU register definitions moved to include/linux/mfd/syscon/exynos5-pmu.h, - added regmap for LPASS Top SFR region, - cleaned up register bit field defintions. Changes since v2: - move misplaced SND_SAMSUNG_AUDSS Kconfig symbol addition to this patch. --- drivers/mfd/Kconfig | 8 ++ drivers/mfd/Makefile | 1 + drivers/mfd/exynos-lpass.c | 185 +++++++++++++++++++++++++++++++++ include/linux/mfd/syscon/exynos5-pmu.h | 4 +- 4 files changed, 197 insertions(+), 1 deletion(-) create mode 100644 drivers/mfd/exynos-lpass.c diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 1bcf601..fc2dffb 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -270,6 +270,14 @@ config MFD_DLN2 etc. must be enabled in order to use the functionality of the device. +config MFD_EXYNOS_LPASS + tristate "Samsung Exynos SoC Low Power Audio Subsystem" + select MFD_CORE + select REGMAP_MMIO + help + Select this option to enable support for Samsung Exynos Low Power + Audio Subsystem. + config MFD_MC13XXX tristate depends on (SPI_MASTER || I2C) diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 42a66e1..5c4be31 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -13,6 +13,7 @@ obj-$(CONFIG_MFD_BCM590XX) += bcm590xx.o obj-$(CONFIG_MFD_CROS_EC) += cros_ec.o obj-$(CONFIG_MFD_CROS_EC_I2C) += cros_ec_i2c.o obj-$(CONFIG_MFD_CROS_EC_SPI) += cros_ec_spi.o +obj-$(CONFIG_MFD_EXYNOS_LPASS) += exynos-lpass.o rtsx_pci-objs := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o obj-$(CONFIG_MFD_RTSX_PCI) += rtsx_pci.o diff --git a/drivers/mfd/exynos-lpass.c b/drivers/mfd/exynos-lpass.c new file mode 100644 index 0000000..956ce1f --- /dev/null +++ b/drivers/mfd/exynos-lpass.c @@ -0,0 +1,185 @@ +/* + * Copyright (C) 2015 - 2016 Samsung Electronics Co., Ltd. + * + * Authors: Inha Song <ideal.song(a)samsung.com> + * Sylwester Nawrocki <s.nawrocki(a)samsung.com> + * + * Samsung Exynos SoC series Low Power Audio Subsystem driver. + * + * This module provides regmap for the Top SFR region and instantiates + * devices for IP blocks like DMAC, I2S, UART. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + */ + +#include <linux/delay.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/mfd/syscon.h> +#include <linux/mfd/syscon/exynos5-pmu.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/types.h> + +/* LPASS Top register definitions */ +#define SFR_LPASS_CORE_SW_RESET (0x08) +#define LPASS_SB_SW_RESET (1 << 11) +#define LPASS_UART_SW_RESET (1 << 10) +#define LPASS_PCM_SW_RESET (1 << 9) +#define LPASS_I2S_SW_RESET (1 << 8) +#define LPASS_WDT1_SW_RESET (1 << 4) +#define LPASS_WDT0_SW_RESET (1 << 3) +#define LPASS_TIMER_SW_RESET (1 << 2) +#define LPASS_MEM_SW_RESET (1 << 1) +#define LPASS_DMA_SW_RESET (1 << 0) + +#define SFR_LPASS_INTR_CA5_MASK (0x48) +#define SFR_LPASS_INTR_CPU_MASK (0x58) +#define LPASS_INTR_APM (1 << 9) +#define LPASS_INTR_MIF (1 << 8) +#define LPASS_INTR_TIMER (1 << 7) +#define LPASS_INTR_DMA (1 << 6) +#define LPASS_INTR_GPIO (1 << 5) +#define LPASS_INTR_I2S (1 << 4) +#define LPASS_INTR_PCM (1 << 3) +#define LPASS_INTR_SLIMBUS (1 << 2) +#define LPASS_INTR_UART (1 << 1) +#define LPASS_INTR_SFR (1 << 0) + +struct exynos_lpass { + struct regmap *pmu; + struct regmap *top; +}; + +static void exynos_lpass_core_sw_reset(struct exynos_lpass *lpass, int mask) +{ + unsigned int val = 0; + + regmap_read(lpass->top, SFR_LPASS_CORE_SW_RESET, &val); + + val &= ~mask; + regmap_write(lpass->top, SFR_LPASS_CORE_SW_RESET, val); + + usleep_range(100, 150); + + val |= mask; + regmap_write(lpass->top, SFR_LPASS_CORE_SW_RESET, val); +} + +static void exynos_lpass_enable(struct exynos_lpass *lpass) +{ + /* Unmask SFR, DMA and I2S interrupt */ + regmap_write(lpass->top, SFR_LPASS_INTR_CA5_MASK, + LPASS_INTR_SFR | LPASS_INTR_DMA | LPASS_INTR_I2S); + + regmap_write(lpass->top, SFR_LPASS_INTR_CPU_MASK, + LPASS_INTR_SFR | LPASS_INTR_DMA | LPASS_INTR_I2S); + + /* Activate related PADs from retention state */ + regmap_write(lpass->pmu, EXYNOS5433_PAD_RETENTION_AUD_OPTION, + EXYNOS5433_PAD_INITIATE_WAKEUP_FROM_LOWPWR); + + exynos_lpass_core_sw_reset(lpass, LPASS_I2S_SW_RESET); + exynos_lpass_core_sw_reset(lpass, LPASS_DMA_SW_RESET); + exynos_lpass_core_sw_reset(lpass, LPASS_MEM_SW_RESET); +} + +static void exynos_lpass_disable(struct exynos_lpass *lpass) +{ + /* Mask any unmasked IP interrupt sources */ + regmap_write(lpass->top, SFR_LPASS_INTR_CPU_MASK, 0); + regmap_write(lpass->top, SFR_LPASS_INTR_CA5_MASK, 0); + + /* Deactivate related PADs from retention state */ + regmap_write(lpass->pmu, EXYNOS5433_PAD_RETENTION_AUD_OPTION, 0); +} + +static const struct regmap_config exynos_lpass_reg_conf = { + .reg_bits = 32, + .reg_stride = 4, + .val_bits = 32, + .max_register = 0xfc, + .fast_io = true, +}; + +static int exynos_lpass_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct exynos_lpass *lpass; + void __iomem *base_top; + struct resource *res; + + if (!dev->of_node) + return -ENODEV; + + lpass = devm_kzalloc(dev, sizeof(*lpass), GFP_KERNEL); + if (!lpass) + return -ENOMEM; + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + + base_top = devm_ioremap_resource(dev, res); + if (IS_ERR(base_top)) + return PTR_ERR(base_top); + + lpass->top = regmap_init_mmio(dev, base_top, + &exynos_lpass_reg_conf); + if (IS_ERR(lpass->top)) { + dev_err(dev, "LPASS top regmap initialization failed\n"); + return PTR_ERR(lpass->top); + } + + lpass->pmu = syscon_regmap_lookup_by_phandle(dev->of_node, + "samsung,pmu-syscon"); + if (IS_ERR(lpass->pmu)) { + dev_err(dev, "Failed to lookup PMU regmap\n"); + return PTR_ERR(lpass->pmu); + } + + platform_set_drvdata(pdev, lpass); + exynos_lpass_enable(lpass); + + return of_platform_populate(dev->of_node, NULL, NULL, dev); +} + +static int exynos_lpass_suspend(struct device *dev) +{ + struct exynos_lpass *lpass = dev_get_drvdata(dev); + + exynos_lpass_disable(lpass); + return 0; +} + +static int exynos_lpass_resume(struct device *dev) +{ + struct exynos_lpass *lpass = dev_get_drvdata(dev); + + exynos_lpass_enable(lpass); + return 0; +} + +static const struct of_device_id exynos_lpass_of_match[] = { + { .compatible = "samsung,exynos5433-lpass" }, + { }, +}; +MODULE_DEVICE_TABLE(of, exynos_lpass_of_match); + +static SIMPLE_DEV_PM_OPS(lpass_pm_ops, exynos_lpass_suspend, + exynos_lpass_resume); + +static struct platform_driver exynos_lpass_driver = { + .driver = { + .name = "exynos-lpass", + .pm = &lpass_pm_ops, + .of_match_table = exynos_lpass_of_match, + }, + .probe = exynos_lpass_probe, +}; +module_platform_driver(exynos_lpass_driver); + +MODULE_DESCRIPTION("Samsung Low Power Audio Subsystem driver"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/syscon/exynos5-pmu.h b/include/linux/mfd/syscon/exynos5-pmu.h index 76f30f9..c28ff21 100644 --- a/include/linux/mfd/syscon/exynos5-pmu.h +++ b/include/linux/mfd/syscon/exynos5-pmu.h @@ -43,8 +43,10 @@ #define EXYNOS5433_MIPI_PHY2_CONTROL (0x718) #define EXYNOS5_PHY_ENABLE BIT(0) - #define EXYNOS5_MIPI_PHY_S_RESETN BIT(1) #define EXYNOS5_MIPI_PHY_M_RESETN BIT(2) +#define EXYNOS5433_PAD_RETENTION_AUD_OPTION (0x3028) +#define EXYNOS5433_PAD_INITIATE_WAKEUP_FROM_LOWPWR BIT(28) + #endif /* _LINUX_MFD_SYSCON_PMU_EXYNOS5_H_ */ -- 1.9.1

2 7