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

[alsa-devel] [PATCH V4 0/4] Add i2s support on smdk5420
by Padmavathi Venna 12 Aug '13

12 Aug '13

Samsung has different versions of I2S introduced in different platforms. Each version has some new support added for multichannel, secondary fifo, s/w reset control, internal mux for rclk src clk and tdm support. Each newly added change has a quirk. So this patch adds all the required quirks as driver data and based on compatible string from dtsi fetches the quirks. This also adds i2s support on exynos5420. Changes since V3: - Addressed review comments by Tomasz Figa related to const qualifier for samsung_i2s_dai_data - Removed passing quirks as driver data for non-dt platforms. - Separated out adding i2s nodes and enabling audio support on 5420 into different patch set as they are dependent on some of already posted but not yet merged i2c, dwmmc, dma and audss clock controller patches. Changes since V2: - Separated out driver side changes and dts changes in two patch sets. - Replaced samsung,s3c6410-i2s-v4 with samsung,s3c6410-i2s-multi for more clarity as suggested by Tomasz Figa. Changes since V1: - Pass quirks as driver data and fetch the quirks based on compatible string from dtsi file as suggested by Tomasz Figa and Mark Brown - Make the I2S driver more flexible with respect to register access as suggested by Tomasz Figa and Mark Brown - Add 5420 support in the driver. - Modify the dtsi files with the corresponding compatible strings and removed the i2s quirks from 5250 dtsi file. - Updated the i2s Documentation with relevent changes and i2s versioning info. - Add i2s nodes on exynos5420.dtsi - Enable sound support on smdk5420 This patch set is made based on Mark Brown for-next branch on sound.git. Padmavathi Venna (4): ASoC: Samsung: I2S: Add quirks as driver data in I2S ASoC: Samsung: I2S: Modify the I2S driver to support I2S on Exynos5420 ARM: dts: exynos5250: move common i2s properties to exynos5 dtsi ARM: dts: Change i2s compatible string on exynos5250 .../devicetree/bindings/sound/samsung-i2s.txt | 22 ++-- arch/arm/boot/dts/exynos5.dtsi | 21 +++ arch/arm/boot/dts/exynos5250.dtsi | 17 +--- include/linux/platform_data/asoc-s3c.h | 1 + sound/soc/samsung/i2s-regs.h | 15 ++ sound/soc/samsung/i2s.c | 143 +++++++++++++++----- 6 files changed, 157 insertions(+), 62 deletions(-) -- 1.7.4.4

5 13

[alsa-devel] [PATCH] ASoC: arizona: Add widget<->mux route into mux route macro
by Charles Keepax 12 Aug '13

12 Aug '13

The routes linking the widget and the input mux were being added manually, rather than by the ARIZONA_MUX_ROUTES macro. This patchs adds the routes to the macro. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/arizona.h | 3 ++- sound/soc/codecs/wm5102.c | 41 ++++++++++++----------------------------- sound/soc/codecs/wm5110.c | 8 ++++---- 3 files changed, 18 insertions(+), 34 deletions(-) diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h index b60b08c..bf67d65 100644 --- a/sound/soc/codecs/arizona.h +++ b/sound/soc/codecs/arizona.h @@ -150,7 +150,8 @@ extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; ARIZONA_MUX(name_str " Aux 5", &name##_aux5_mux), \ ARIZONA_MUX(name_str " Aux 6", &name##_aux6_mux) -#define ARIZONA_MUX_ROUTES(name) \ +#define ARIZONA_MUX_ROUTES(widget, name) \ + { widget, NULL, name " Input" }, \ ARIZONA_MIXER_INPUT_ROUTES(name " Input") #define ARIZONA_MIXER_ROUTES(widget, name) \ diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 282fd23..9e9a0c1 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1499,23 +1499,6 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = { { "IN3L PGA", NULL, "IN3L" }, { "IN3R PGA", NULL, "IN3R" }, - { "ASRC1L", NULL, "ASRC1L Input" }, - { "ASRC1R", NULL, "ASRC1R Input" }, - { "ASRC2L", NULL, "ASRC2L Input" }, - { "ASRC2R", NULL, "ASRC2R Input" }, - - { "ISRC1DEC1", NULL, "ISRC1DEC1 Input" }, - { "ISRC1DEC2", NULL, "ISRC1DEC2 Input" }, - - { "ISRC1INT1", NULL, "ISRC1INT1 Input" }, - { "ISRC1INT2", NULL, "ISRC1INT2 Input" }, - - { "ISRC2DEC1", NULL, "ISRC2DEC1 Input" }, - { "ISRC2DEC2", NULL, "ISRC2DEC2 Input" }, - - { "ISRC2INT1", NULL, "ISRC2INT1 Input" }, - { "ISRC2INT2", NULL, "ISRC2INT2 Input" }, - ARIZONA_MIXER_ROUTES("OUT1L", "HPOUT1L"), ARIZONA_MIXER_ROUTES("OUT1R", "HPOUT1R"), ARIZONA_MIXER_ROUTES("OUT2L", "HPOUT2L"), @@ -1567,22 +1550,22 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = { ARIZONA_MIXER_ROUTES("LHPF3", "LHPF3"), ARIZONA_MIXER_ROUTES("LHPF4", "LHPF4"), - ARIZONA_MUX_ROUTES("ASRC1L"), - ARIZONA_MUX_ROUTES("ASRC1R"), - ARIZONA_MUX_ROUTES("ASRC2L"), - ARIZONA_MUX_ROUTES("ASRC2R"), + ARIZONA_MUX_ROUTES("ASRC1L", "ASRC1L"), + ARIZONA_MUX_ROUTES("ASRC1R", "ASRC1R"), + ARIZONA_MUX_ROUTES("ASRC2L", "ASRC2L"), + ARIZONA_MUX_ROUTES("ASRC2R", "ASRC2R"), - ARIZONA_MUX_ROUTES("ISRC1INT1"), - ARIZONA_MUX_ROUTES("ISRC1INT2"), + ARIZONA_MUX_ROUTES("ISRC1INT1", "ISRC1INT1"), + ARIZONA_MUX_ROUTES("ISRC1INT2", "ISRC1INT2"), - ARIZONA_MUX_ROUTES("ISRC1DEC1"), - ARIZONA_MUX_ROUTES("ISRC1DEC2"), + ARIZONA_MUX_ROUTES("ISRC1DEC1", "ISRC1DEC1"), + ARIZONA_MUX_ROUTES("ISRC1DEC2", "ISRC1DEC2"), - ARIZONA_MUX_ROUTES("ISRC2INT1"), - ARIZONA_MUX_ROUTES("ISRC2INT2"), + ARIZONA_MUX_ROUTES("ISRC2INT1", "ISRC2INT1"), + ARIZONA_MUX_ROUTES("ISRC2INT2", "ISRC2INT2"), - ARIZONA_MUX_ROUTES("ISRC2DEC1"), - ARIZONA_MUX_ROUTES("ISRC2DEC2"), + ARIZONA_MUX_ROUTES("ISRC2DEC1", "ISRC2DEC1"), + ARIZONA_MUX_ROUTES("ISRC2DEC2", "ISRC2DEC2"), ARIZONA_DSP_ROUTES("DSP1"), diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 2e7cb4b..0cfc5e6 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -979,10 +979,10 @@ static const struct snd_soc_dapm_route wm5110_dapm_routes[] = { ARIZONA_MIXER_ROUTES("LHPF3", "LHPF3"), ARIZONA_MIXER_ROUTES("LHPF4", "LHPF4"), - ARIZONA_MUX_ROUTES("ASRC1L"), - ARIZONA_MUX_ROUTES("ASRC1R"), - ARIZONA_MUX_ROUTES("ASRC2L"), - ARIZONA_MUX_ROUTES("ASRC2R"), + ARIZONA_MUX_ROUTES("ASRC1L", "ASRC1L"), + ARIZONA_MUX_ROUTES("ASRC1R", "ASRC1R"), + ARIZONA_MUX_ROUTES("ASRC2L", "ASRC2L"), + ARIZONA_MUX_ROUTES("ASRC2R", "ASRC2R"), { "HPOUT1L", NULL, "OUT1L" }, { "HPOUT1R", NULL, "OUT1R" }, -- 1.7.2.5

2 1

[alsa-devel] Another possible race in deferred probing...
by Russell King - ARM Linux 12 Aug '13

12 Aug '13

There is no better way to provoke bugs than to show a device to someone who has never seen it before. Obviously, I didn't get much chance to investigate what happened, so all I have are the kernel messages: kirkwood-spdif-audio kirkwood-spdif-audio.1: ASoC: CPU DAI mvebu-audio.1 not registered kirkwood-spdif-audio kirkwood-spdif-audio.1: failed to register card platform kirkwood-spdif-audio.1: Driver kirkwood-spdif-audio requests probe deferral mvebu-audio mvebu-audio.1: found external clock kirkwood-spdif-audio kirkwood-spdif-audio.1: ASoC: CODEC spdif-dit not registered kirkwood-spdif-audio kirkwood-spdif-audio.1: failed to register card platform kirkwood-spdif-audio.1: Driver kirkwood-spdif-audio requests probe deferral kirkwood-spdif-audio kirkwood-spdif-audio.1: ASoC: CODEC spdif-dit not registered kirkwood-spdif-audio kirkwood-spdif-audio.1: failed to register card platform kirkwood-spdif-audio.1: Driver kirkwood-spdif-audio requests probe deferral and then when manually removing the kirkwood-spdif module and re-inserting it: kirkwood-spdif-audio kirkwood-spdif-audio.1: dit-hifi <-> mvebu-audio.1 mapping ok First, remember that Ubuntu loads kernel modules from separate threads, so module loading here is multithreaded. What I suspect happened was the spdif-dit module was inserted and initialized between kirkwood-spdif starting to be re-probed, and returning from its probe function with -EPROBE_DEFER, and I suspect that spdif-dit was the last module. As there was no further module loading or driver activity, there was no attempt to re-probe the kirkwood-spdif module. This seems to be a very rare event (it's the first time I've seen it since the last fix to the deferred probing, and that's many hundreds of reboots.) Nevertheless, the fact that it has happened indicates that deferred probing still has holes that can leave modular drivers unbound after boot. Let's consider this scenario, which from a quick scan of the code looks like it's possible to happen: Thread 0 Thread 1 deferred probe triggered driver A's probe function called (kirkwood_spdif_probe in my case) takes lock L to lookup resource A checks for resource A (the spdif_dit codec) releases lock L resource A is not found ----- context switch ------ module init function called (to register spdif_dit_driver) driver B's probe function called (to register the spdif_dit codec via snd_soc_register_codec) takes lock L for adding resource A registers resource A releases lock L driver B's probe function completes deferred probe triggered, deferred probe list empty module init completes ----- context switch ------ probe returns -EPROBE_DEFER deferred probe mutex taken added to deferred probe list deferred probe mutex released This can happen because there's no locking between looking up the resource and having the driver added to the list of devices waiting to be probed. Given that deferred probing is becoming the "normal" thing for device drivers, these races are only going to get worse. Consider that as we're working on ARM towards having a single zImage bootable on many boards, most drivers will be modules, and if they're inserted into the kernel in a multi-threaded way, the above race is going to continually come back and bite us. I don't see an easy solution to this; we can't serialise device probes, because we have some places where device driver probe functions register devices themselves, which then go on to have their drivers probed (nested probes). Maybe this reflects back into Greg's whole argument against platform devices: maybe we need a struct device which lists _all_ the resources which a device requires, have the bus layer safely check for the presence of all those resources before calling the probe function, and move the deferred probe out of the core into the bus layer(s). Another solution would be to have a way to attach to the device a list of resources which failed, and have the driver core scan that list after the probe returns rechecking to see if all the resources are now present. That to me sounds particularly horrid, invasive and quite disgusting to implement safely.

1 0

[alsa-devel] [PATCH] ALSA: compress: update the MAINTAINER entry
by Vinod Koul 12 Aug '13

12 Aug '13

add missing uapi/ headers and Documentation files Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- MAINTAINERS | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 38a870e..a40e393 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7667,7 +7667,9 @@ M: Vinod Koul <vinod.koul(a)intel.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git S: Supported +F: Documentation/sound/alsa/compress_offload.txt F: include/sound/compress_driver.h +F: include/uapi/sound/compress_* F: sound/core/compress_offload.c F: sound/soc/soc-compress.c -- 1.7.0.4

2 1

[alsa-devel] [PATCH 2/2] 6fire: make buffers DMA-able (midi)
by Torsten Schenk 12 Aug '13

12 Aug '13

Patch makes midi output buffer DMA-able by allocating it separately. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> --- diff -Nur a/sound/6fire/midi.c b/sound/6fire/midi.c --- a/sound/6fire/midi.c 2013-08-04 22:46:46.000000000 +0200 +++ b/sound/6fire/midi.c 2013-08-11 10:51:05.682482388 +0200 @@ -19,6 +19,10 @@ #include "chip.h" #include "comm.h" +enum { + MIDI_BUFSIZE = 64 +}; + static void usb6fire_midi_out_handler(struct urb *urb) { struct midi_runtime *rt = urb->context; @@ -156,6 +160,12 @@ if (!rt) return -ENOMEM; + rt->out_buffer = kzalloc(MIDI_BUFSIZE, GFP_KERNEL); + if (!rt->out_buffer) { + kfree(rt); + return -ENOMEM; + } + rt->chip = chip; rt->in_received = usb6fire_midi_in_received; rt->out_buffer[0] = 0x80; /* 'send midi' command */ @@ -169,6 +179,7 @@ ret = snd_rawmidi_new(chip->card, "6FireUSB", 0, 1, 1, &rt->instance); if (ret < 0) { + kfree(rt->out_buffer); kfree(rt); snd_printk(KERN_ERR PREFIX "unable to create midi.\n"); return ret; @@ -197,6 +208,9 @@ void usb6fire_midi_destroy(struct sfire_chip *chip) { - kfree(chip->midi); + struct midi_runtime *rt = chip->midi; + + kfree(rt->out_buffer); + kfree(rt); chip->midi = NULL; } diff -Nur a/sound/6fire/midi.h b/sound/6fire/midi.h --- a/sound/6fire/midi.h 2013-08-04 22:46:46.000000000 +0200 +++ b/sound/6fire/midi.h 2013-08-11 10:51:05.682482388 +0200 @@ -16,10 +16,6 @@ #include "common.h" -enum { - MIDI_BUFSIZE = 64 -}; - struct midi_runtime { struct sfire_chip *chip; struct snd_rawmidi *instance; @@ -32,7 +28,7 @@ struct snd_rawmidi_substream *out; struct urb out_urb; u8 out_serial; /* serial number of out packet */ - u8 out_buffer[MIDI_BUFSIZE]; + u8 *out_buffer; int buffer_offset; void (*in_received)(struct midi_runtime *rt, u8 *data, int length);

2 1

[alsa-devel] [PATCH] 6fire: fix URB transfer buffer for midi output
by Torsten Schenk 12 Aug '13

12 Aug '13

Patch fixes URB transfer buffer allocation for midi output to be DMA-able. Signed-off-by: Torsten Schenk <torsten.schenk(a)zoho.com> --- diff -Nur a/sound/usb/6fire/midi.c b/sound/usb/6fire/midi.c --- a/sound/usb/6fire/midi.c 2013-08-07 16:32:10.579639391 +0200 +++ b/sound/usb/6fire/midi.c 2013-08-07 16:32:31.363378104 +0200 @@ -19,6 +19,10 @@ #include "chip.h" #include "comm.h" +enum { + MIDI_BUFSIZE = 64 +}; + static void usb6fire_midi_out_handler(struct urb *urb) { struct midi_runtime *rt = urb->context; @@ -156,6 +160,12 @@ if (!rt) return -ENOMEM; + rt->out_buffer = kzalloc(MIDI_BUFSIZE, GFP_KERNEL); + if (!rt->out_buffer) { + kfree(rt); + return -ENOMEM; + } + rt->chip = chip; rt->in_received = usb6fire_midi_in_received; rt->out_buffer[0] = 0x80; /* 'send midi' command */ @@ -169,6 +179,7 @@ ret = snd_rawmidi_new(chip->card, "6FireUSB", 0, 1, 1, &rt->instance); if (ret < 0) { + kfree(rt->out_buffer); kfree(rt); snd_printk(KERN_ERR PREFIX "unable to create midi.\n"); return ret; @@ -197,6 +208,9 @@ void usb6fire_midi_destroy(struct sfire_chip *chip) { - kfree(chip->midi); + struct midi_runtime *rt = chip->midi; + + kfree(rt->out_buffer); + kfree(rt); chip->midi = NULL; } diff -Nur a/sound/usb/6fire/midi.h b/sound/usb/6fire/midi.h --- a/sound/usb/6fire/midi.h 2013-08-07 16:32:10.579639391 +0200 +++ b/sound/usb/6fire/midi.h 2013-08-07 16:32:31.363378104 +0200 @@ -16,10 +16,6 @@ #include "common.h" -enum { - MIDI_BUFSIZE = 64 -}; - struct midi_runtime { struct sfire_chip *chip; struct snd_rawmidi *instance; @@ -32,7 +28,7 @@ struct snd_rawmidi_substream *out; struct urb out_urb; u8 out_serial; /* serial number of out packet */ - u8 out_buffer[MIDI_BUFSIZE]; + u8 *out_buffer; int buffer_offset; void (*in_received)(struct midi_runtime *rt, u8 *data, int length);

4 7

[alsa-devel] LG LW25 pin fix
by Joonas Saarinen 12 Aug '13

12 Aug '13

Hello, I discovered that the LG LW25 laptop needs a small fix to its pin mapping. The functions of blue and green jacks simply have to be interchanged. The rest of the configuration is correct. Can this fix be made permanent in the driver? The fixed mappings are: 0x1a 0x0181344f 0x1b 0x0321403f Here's the full correct map: [codec] 0x10ec0880 0x00001854 0 [pincfg] 0x14 0xb7031110 0x15 0x411111f0 0x16 0x411111f0 0x17 0x411111f0 0x18 0x01a19c22 0x19 0xb7a31120 0x1a 0x0181344f 0x1b 0x0321403f 0x1c 0x411111f0 0x1d 0x411111f0 0x1e 0x0145311e 0x1f 0x411111f0 Thanks, Joonas

2 5

Re: [alsa-devel] [PATCH v3 5/5] ALSA: snd-usb: add quirks handler for DSD streams
by Jesus R 12 Aug '13

12 Aug '13

Daniel/team, I have access to a few DSD devices and or USB based devices. I can provide any information you need to help with allowing ALSA to identify the device's capabilities. Just let me know how to get the information you need from command line:) I also have a list of known DSD/DoP devices in Google Drive that may be helpful. Let me know if it's okay to post the link. Jesus R sonore.us

2 2

[alsa-devel] [PATCH] ASoC: adau1701: Use gpio_set_value_cansleep()
by Mark Brown 12 Aug '13

12 Aug '13

From: Mark Brown <broonie(a)linaro.org> The GPIO manipulation done by this driver is never in atomic context so we can use gpio_set_value_cansleep() and support GPIOs that can't be set from atomic context. Signed-off-by: Mark Brown <broonie(a)linaro.org> --- sound/soc/codecs/adau1701.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sound/soc/codecs/adau1701.c b/sound/soc/codecs/adau1701.c index 2c10252..ebff112 100644 --- a/sound/soc/codecs/adau1701.c +++ b/sound/soc/codecs/adau1701.c @@ -247,21 +247,21 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv) gpio_is_valid(adau1701->gpio_pll_mode[1])) { switch (clkdiv) { case 64: - gpio_set_value(adau1701->gpio_pll_mode[0], 0); - gpio_set_value(adau1701->gpio_pll_mode[1], 0); + gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 0); + gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 0); break; case 256: - gpio_set_value(adau1701->gpio_pll_mode[0], 0); - gpio_set_value(adau1701->gpio_pll_mode[1], 1); + gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 0); + gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 1); break; case 384: - gpio_set_value(adau1701->gpio_pll_mode[0], 1); - gpio_set_value(adau1701->gpio_pll_mode[1], 0); + gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 1); + gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 0); break; case 0: /* fallback */ case 512: - gpio_set_value(adau1701->gpio_pll_mode[0], 1); - gpio_set_value(adau1701->gpio_pll_mode[1], 1); + gpio_set_value_cansleep(adau1701->gpio_pll_mode[0], 1); + gpio_set_value_cansleep(adau1701->gpio_pll_mode[1], 1); break; } } @@ -269,10 +269,10 @@ static int adau1701_reset(struct snd_soc_codec *codec, unsigned int clkdiv) adau1701->pll_clkdiv = clkdiv; if (gpio_is_valid(adau1701->gpio_nreset)) { - gpio_set_value(adau1701->gpio_nreset, 0); + gpio_set_value_cansleep(adau1701->gpio_nreset, 0); /* minimum reset time is 20ns */ udelay(1); - gpio_set_value(adau1701->gpio_nreset, 1); + gpio_set_value_cansleep(adau1701->gpio_nreset, 1); /* power-up time may be as long as 85ms */ mdelay(85); } -- 1.8.4.rc1

2 1

[alsa-devel] [PATCH] ASoC: rt5640: change widget sequence for depop
by bardliao＠realtek.com 12 Aug '13

12 Aug '13

From: Bard Liao <bardliao(a)realtek.com> Add mute/unmute control in widget event and modify the power on/off sequence to avoid pop noise. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- Please ignore the previous patch. I have tested speaker and headphone playback on this patch. --- sound/soc/codecs/rt5640.c | 389 +++++++++++++++++++++++++++++++++++++++------- sound/soc/codecs/rt5640.h | 15 ++ 2 files changed, 352 insertions(+), 52 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index 4db7314..cae3f46 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -50,8 +50,6 @@ static const struct regmap_range_cfg rt5640_ranges[] = { static struct reg_default init_list[] = { {RT5640_PR_BASE + 0x3d, 0x3600}, - {RT5640_PR_BASE + 0x1c, 0x0D21}, - {RT5640_PR_BASE + 0x1b, 0x0000}, {RT5640_PR_BASE + 0x12, 0x0aa8}, {RT5640_PR_BASE + 0x14, 0x0aaa}, {RT5640_PR_BASE + 0x20, 0x6110}, @@ -378,21 +376,119 @@ static const SOC_ENUM_SINGLE_DECL(rt5640_if2_adc_enum, RT5640_DIG_INF_DATA, static const char * const rt5640_clsd_spk_ratio[] = {"1.66x", "1.83x", "1.94x", "2x", "2.11x", "2.22x", "2.33x", "2.44x", "2.55x", "2.66x", "2.77x"}; +static const char * const rt5640_mute_mode[] = {"mute", "unmute"}; + +static const SOC_ENUM_SINGLE_DECL(rt5640_hp_enum, 0, 0, rt5640_mute_mode); +static const SOC_ENUM_SINGLE_DECL(rt5640_spo_enum, 0, 0, rt5640_mute_mode); + static const SOC_ENUM_SINGLE_DECL( rt5640_clsd_spk_ratio_enum, RT5640_CLS_D_OUT, RT5640_CLSD_RATIO_SFT, rt5640_clsd_spk_ratio); +static int rt5640_spo_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + + ucontrol->value.integer.value[0] = !rt5640->spo_l_mute; + ucontrol->value.integer.value[1] = !rt5640->spo_r_mute; + + return 0; +} + +static int rt5640_spo_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + unsigned int pow; + + pow = snd_soc_read(codec, RT5640_PWR_DIG1) & RT5640_PWR_CLS_D; + + if (ucontrol->value.integer.value[0]) { + rt5640->spo_l_mute = false; + if (pow) + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_L_MUTE, 0); + } else { + rt5640->spo_l_mute = true; + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_L_MUTE, + RT5640_L_MUTE); + } + if (ucontrol->value.integer.value[1]) { + rt5640->spo_r_mute = false; + if (pow) + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_R_MUTE, 0); + } else { + rt5640->spo_r_mute = true; + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_R_MUTE, + RT5640_R_MUTE); + } + + return 0; +} + +static int rt5640_hp_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + + ucontrol->value.integer.value[0] = !rt5640->hp_l_mute; + ucontrol->value.integer.value[1] = !rt5640->hp_r_mute; + + return 0; +} + +static int rt5640_hp_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + unsigned int pow; + + pow = snd_soc_read(codec, RT5640_PWR_ANLG1); + + if (ucontrol->value.integer.value[0]) { + rt5640->hp_l_mute = false; + if (pow & RT5640_PWR_HP_L) + snd_soc_update_bits(codec, RT5640_HP_VOL, + RT5640_L_MUTE, 0); + } else { + rt5640->hp_l_mute = true; + snd_soc_update_bits(codec, RT5640_HP_VOL, + RT5640_L_MUTE, RT5640_L_MUTE); + } + if (ucontrol->value.integer.value[1]) { + rt5640->hp_r_mute = false; + if (pow & RT5640_PWR_HP_R) + snd_soc_update_bits(codec, RT5640_HP_VOL, + RT5640_R_MUTE, 0); + } else { + rt5640->hp_r_mute = true; + snd_soc_update_bits(codec, RT5640_HP_VOL, + RT5640_R_MUTE, RT5640_R_MUTE); + } + + + return 0; +} + static const struct snd_kcontrol_new rt5640_snd_controls[] = { /* Speaker Output Volume */ - SOC_DOUBLE("Speaker Playback Switch", RT5640_SPK_VOL, - RT5640_L_MUTE_SFT, RT5640_R_MUTE_SFT, 1, 1), + SOC_DOUBLE_EXT("Speaker Playback Switch", SND_SOC_NOPM, + 0, 1, 1, 0, rt5640_spo_get, rt5640_spo_put), SOC_DOUBLE("Speaker Channel Switch", RT5640_SPK_VOL, RT5640_VOL_L_SFT, RT5640_VOL_R_SFT, 1, 1), SOC_DOUBLE_TLV("Speaker Playback Volume", RT5640_SPK_VOL, RT5640_L_VOL_SFT, RT5640_R_VOL_SFT, 39, 1, out_vol_tlv), /* Headphone Output Volume */ - SOC_DOUBLE("HP Playback Switch", RT5640_HP_VOL, - RT5640_L_MUTE_SFT, RT5640_R_MUTE_SFT, 1, 1), + SOC_DOUBLE_EXT("HP Playback Switch", SND_SOC_NOPM, + 0, 1, 1, 0, rt5640_hp_get, rt5640_hp_put), SOC_DOUBLE("HP Channel Switch", RT5640_HP_VOL, RT5640_VOL_L_SFT, RT5640_VOL_R_SFT, 1, 1), SOC_DOUBLE_TLV("HP Playback Volume", RT5640_HP_VOL, @@ -868,33 +964,6 @@ static const SOC_ENUM_SINGLE_DECL( static const struct snd_kcontrol_new rt5640_sdi_mux = SOC_DAPM_ENUM("SDI select", rt5640_sdi_sel_enum); -static int spk_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - struct snd_soc_codec *codec = w->codec; - struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); - - switch (event) { - case SND_SOC_DAPM_POST_PMU: - regmap_update_bits(rt5640->regmap, RT5640_PWR_DIG1, - 0x0001, 0x0001); - regmap_update_bits(rt5640->regmap, RT5640_PR_BASE + 0x1c, - 0xf000, 0xf000); - break; - - case SND_SOC_DAPM_PRE_PMD: - regmap_update_bits(rt5640->regmap, RT5640_PR_BASE + 0x1c, - 0xf000, 0x0000); - regmap_update_bits(rt5640->regmap, RT5640_PWR_DIG1, - 0x0001, 0x0000); - break; - - default: - return 0; - } - return 0; -} - static int rt5640_set_dmic1_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -943,6 +1012,216 @@ static int rt5640_set_dmic2_event(struct snd_soc_dapm_widget *w, return 0; } +static int rt5640_spo_r_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + if (!rt5640->spo_r_mute) + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_R_MUTE, 0); + break; + + case SND_SOC_DAPM_PRE_PMD: + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_R_MUTE, + RT5640_R_MUTE); + break; + + default: + return 0; + } + + return 0; +} + +static int rt5640_spo_l_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + if (!rt5640->spo_l_mute) + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_L_MUTE, 0); + break; + + case SND_SOC_DAPM_PRE_PMD: + snd_soc_update_bits(codec, RT5640_SPK_VOL, + RT5640_L_MUTE, RT5640_L_MUTE); + break; + + default: + return 0; + } + + return 0; +} + +void hp_amp_power_on(struct snd_soc_codec *codec) +{ + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + /* depop parameters */ + regmap_update_bits(rt5640->regmap, RT5640_PR_BASE + + RT5640_CHPUMP_INT_REG1, 0x0700, 0x0200); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M2, + RT5640_DEPOP_MASK, + RT5640_DEPOP_MAN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_CP_MASK | + RT5640_HP_SG_MASK | + RT5640_HP_CB_MASK, + RT5640_HP_CP_PU | RT5640_HP_SG_DIS | + RT5640_HP_CB_PU); + regmap_write(rt5640->regmap, RT5640_PR_BASE + RT5640_HP_DCC_INT1, + 0x9f00); + /* headphone amp power on */ + regmap_update_bits(rt5640->regmap, RT5640_PWR_ANLG1, + RT5640_PWR_FV1 | RT5640_PWR_FV2, 0); + regmap_update_bits(rt5640->regmap, RT5640_PWR_ANLG1, + RT5640_PWR_HA, + RT5640_PWR_HA); + usleep_range(20000, 25000); + regmap_update_bits(rt5640->regmap, RT5640_PWR_ANLG1, + RT5640_PWR_FV1 | RT5640_PWR_FV2, + RT5640_PWR_FV1 | RT5640_PWR_FV2); + + regmap_update_bits(rt5640->regmap, RT5640_CHARGE_PUMP, + RT5640_PM_HP_MASK, RT5640_PM_HP_HV); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_CO_MASK | + RT5640_HP_SG_MASK, + RT5640_HP_CO_EN | RT5640_HP_SG_EN); + regmap_update_bits(rt5640->regmap, RT5640_PR_BASE + + RT5640_CHPUMP_INT_REG1, 0x0700, 0x0400); +} + +static void rt5640_pmu_depop(struct snd_soc_codec *codec) +{ + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + unsigned int val = 0, pow; + + regmap_read(rt5640->regmap, RT5640_PWR_ANLG1, &pow); + if (rt5640->hp_l_mute || !(pow & RT5640_PWR_HP_L)) + val |= RT5640_L_MUTE; + if (rt5640->hp_r_mute || !(pow & RT5640_PWR_HP_R)) + val |= RT5640_R_MUTE; + /* headphone unmute sequence */ + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M3, + RT5640_CP_FQ1_MASK | RT5640_CP_FQ2_MASK | + RT5640_CP_FQ3_MASK, + (RT5640_CP_FQ_192_KHZ << RT5640_CP_FQ1_SFT) | + (RT5640_CP_FQ_12_KHZ << RT5640_CP_FQ2_SFT) | + (RT5640_CP_FQ_192_KHZ << RT5640_CP_FQ3_SFT)); + regmap_write(rt5640->regmap, + RT5640_PR_BASE + RT5640_MAMP_INT_REG2, 0xfc00); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_SMT_TRIG_MASK, RT5640_SMT_TRIG_EN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_RSTN_MASK, RT5640_RSTN_EN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_RSTN_MASK | RT5640_HP_L_SMT_MASK | + RT5640_HP_R_SMT_MASK, + RT5640_RSTN_DIS | RT5640_HP_L_SMT_EN | + RT5640_HP_R_SMT_EN); + regmap_update_bits(rt5640->regmap, RT5640_HP_VOL, + RT5640_L_MUTE | RT5640_R_MUTE, val); + usleep_range(40000, 45000); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_SG_MASK | RT5640_HP_L_SMT_MASK | + RT5640_HP_R_SMT_MASK, RT5640_HP_SG_DIS | + RT5640_HP_L_SMT_DIS | RT5640_HP_R_SMT_DIS); + +} + +static void rt5640_pmd_depop(struct snd_soc_codec *codec) +{ + struct rt5640_priv *rt5640 = snd_soc_codec_get_drvdata(codec); + /* headphone mute sequence */ + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M3, + RT5640_CP_FQ1_MASK | RT5640_CP_FQ2_MASK | + RT5640_CP_FQ3_MASK, + (RT5640_CP_FQ_96_KHZ << RT5640_CP_FQ1_SFT) | + (RT5640_CP_FQ_12_KHZ << RT5640_CP_FQ2_SFT) | + (RT5640_CP_FQ_96_KHZ << RT5640_CP_FQ3_SFT)); + regmap_write(rt5640->regmap, + RT5640_PR_BASE + RT5640_MAMP_INT_REG2, 0xfc00); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_SG_MASK, RT5640_HP_SG_EN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_RSTP_MASK, RT5640_RSTP_EN); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_RSTP_MASK | RT5640_HP_L_SMT_MASK | + RT5640_HP_R_SMT_MASK, RT5640_RSTP_DIS | + RT5640_HP_L_SMT_EN | RT5640_HP_R_SMT_EN); + + regmap_update_bits(rt5640->regmap, RT5640_HP_VOL, + RT5640_L_MUTE | RT5640_R_MUTE, + RT5640_L_MUTE | RT5640_R_MUTE); + usleep_range(40000, 45000); + + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_HP_SG_MASK | + RT5640_HP_L_SMT_MASK | + RT5640_HP_R_SMT_MASK, + RT5640_HP_SG_DIS | + RT5640_HP_L_SMT_DIS | + RT5640_HP_R_SMT_DIS); + regmap_update_bits(rt5640->regmap, RT5640_DEPOP_M1, + RT5640_SMT_TRIG_MASK | + RT5640_HP_CD_PD_MASK | + RT5640_HP_CO_MASK | + RT5640_HP_CP_MASK | + RT5640_HP_SG_MASK | + RT5640_HP_CB_MASK, + RT5640_SMT_TRIG_DIS | + RT5640_HP_CD_PD_EN | + RT5640_HP_CO_DIS | RT5640_HP_CP_PD | + RT5640_HP_SG_EN | RT5640_HP_CB_PD); +} + +static int rt5640_hp_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + rt5640_pmu_depop(codec); + break; + + case SND_SOC_DAPM_PRE_PMD: + rt5640_pmd_depop(codec); + break; + + default: + return 0; + } + + return 0; +} + +static int rt5640_hp_power_event(struct snd_soc_dapm_widget *w, + struct snd_kcontrol *kcontrol, int event) +{ + struct snd_soc_codec *codec = w->codec; + + switch (event) { + case SND_SOC_DAPM_POST_PMU: + hp_amp_power_on(codec); + break; + default: + return 0; + } + + return 0; +} + static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("PLL1", RT5640_PWR_ANLG2, RT5640_PWR_PLL_BIT, 0, NULL, 0), @@ -1132,15 +1411,23 @@ static const struct snd_soc_dapm_widget rt5640_dapm_widgets[] = { rt5640_mono_mix, ARRAY_SIZE(rt5640_mono_mix)), SND_SOC_DAPM_SUPPLY("Improve MONO Amp Drv", RT5640_PWR_ANLG1, RT5640_PWR_MA_BIT, 0, NULL, 0), - SND_SOC_DAPM_SUPPLY("Improve HP Amp Drv", RT5640_PWR_ANLG1, - SND_SOC_NOPM, 0, NULL, 0), - SND_SOC_DAPM_PGA("HP L Amp", RT5640_PWR_ANLG1, + SND_SOC_DAPM_SUPPLY_S("Improve HP Amp Drv", 1, SND_SOC_NOPM, + 0, 0, rt5640_hp_power_event, SND_SOC_DAPM_POST_PMU), + SND_SOC_DAPM_PGA_S("HP Amp", 1, SND_SOC_NOPM, 0, 0, + rt5640_hp_event, + SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), + SND_SOC_DAPM_SUPPLY("HP L Amp", RT5640_PWR_ANLG1, RT5640_PWR_HP_L_BIT, 0, NULL, 0), - SND_SOC_DAPM_PGA("HP R Amp", RT5640_PWR_ANLG1, + SND_SOC_DAPM_SUPPLY("HP R Amp", RT5640_PWR_ANLG1, RT5640_PWR_HP_R_BIT, 0, NULL, 0), + SND_SOC_DAPM_PGA_E("SPO L Amp", SND_SOC_NOPM, + 0, 0, NULL, 0, rt5640_spo_l_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), + SND_SOC_DAPM_PGA_E("SPO R Amp", SND_SOC_NOPM, + 0, 0, NULL, 0, rt5640_spo_r_event, + SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_SUPPLY("Improve SPK Amp Drv", RT5640_PWR_DIG1, - SND_SOC_NOPM, 0, spk_event, - SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMU), + RT5640_PWR_CLS_D_BIT, 0, NULL, 0), /* Output Lines */ SND_SOC_DAPM_OUTPUT("SPOLP"), SND_SOC_DAPM_OUTPUT("SPOLN"), @@ -1396,13 +1683,15 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { {"Mono MIX", "OUTVOL L Switch", "OUTVOL L"}, {"Mono MIX", "BST1 Switch", "BST1"}, - {"HP L Amp", NULL, "HPO MIX L"}, - {"HP R Amp", NULL, "HPO MIX R"}, + {"HP Amp", NULL, "HPO MIX L"}, + {"HP Amp", NULL, "HPO MIX R"}, - {"SPOLP", NULL, "SPOL MIX"}, - {"SPOLN", NULL, "SPOL MIX"}, - {"SPORP", NULL, "SPOR MIX"}, - {"SPORN", NULL, "SPOR MIX"}, + {"SPO L Amp", NULL, "SPOL MIX"}, + {"SPO R Amp", NULL, "SPOR MIX"}, + {"SPOLP", NULL, "SPO L Amp"}, + {"SPOLN", NULL, "SPO L Amp"}, + {"SPORP", NULL, "SPO R Amp"}, + {"SPORN", NULL, "SPO R Amp"}, {"SPOLP", NULL, "Improve SPK Amp Drv"}, {"SPOLN", NULL, "Improve SPK Amp Drv"}, @@ -1412,7 +1701,9 @@ static const struct snd_soc_dapm_route rt5640_dapm_routes[] = { {"HPOL", NULL, "Improve HP Amp Drv"}, {"HPOR", NULL, "Improve HP Amp Drv"}, + {"HPOL", NULL, "HP Amp"}, {"HPOL", NULL, "HP L Amp"}, + {"HPOR", NULL, "HP Amp"}, {"HPOR", NULL, "HP R Amp"}, {"LOUTL", NULL, "LOUT MIX"}, {"LOUTR", NULL, "LOUT MIX"}, @@ -1792,17 +2083,13 @@ static int rt5640_set_bias_level(struct snd_soc_codec *codec, RT5640_PWR_BG | RT5640_PWR_VREF2, RT5640_PWR_VREF1 | RT5640_PWR_MB | RT5640_PWR_BG | RT5640_PWR_VREF2); - mdelay(10); + usleep_range(15000, 20000); snd_soc_update_bits(codec, RT5640_PWR_ANLG1, RT5640_PWR_FV1 | RT5640_PWR_FV2, RT5640_PWR_FV1 | RT5640_PWR_FV2); regcache_sync(rt5640->regmap); snd_soc_update_bits(codec, RT5640_DUMMY1, 0x0301, 0x0301); - snd_soc_update_bits(codec, RT5640_DEPOP_M1, - 0x001d, 0x0019); - snd_soc_update_bits(codec, RT5640_DEPOP_M2, - 0x2000, 0x2000); snd_soc_update_bits(codec, RT5640_MICBIAS, 0x0030, 0x0030); } @@ -1846,8 +2133,6 @@ static int rt5640_probe(struct snd_soc_codec *codec) rt5640_set_bias_level(codec, SND_SOC_BIAS_OFF); snd_soc_update_bits(codec, RT5640_DUMMY1, 0x0301, 0x0301); - snd_soc_update_bits(codec, RT5640_DEPOP_M1, 0x001d, 0x0019); - snd_soc_update_bits(codec, RT5640_DEPOP_M2, 0x2000, 0x2000); snd_soc_update_bits(codec, RT5640_MICBIAS, 0x0030, 0x0030); snd_soc_update_bits(codec, RT5640_DSP_PATH2, 0xfc00, 0x0c00); diff --git a/sound/soc/codecs/rt5640.h b/sound/soc/codecs/rt5640.h index c48286d..cb6bce9 100644 --- a/sound/soc/codecs/rt5640.h +++ b/sound/soc/codecs/rt5640.h @@ -145,6 +145,8 @@ /* Index of Codec Private Register definition */ +#define RT5640_CHPUMP_INT_REG1 0x24 +#define RT5640_MAMP_INT_REG2 0x37 #define RT5640_3D_SPK 0x63 #define RT5640_WND_1 0x6c #define RT5640_WND_2 0x6d @@ -153,6 +155,7 @@ #define RT5640_WND_5 0x70 #define RT5640_WND_8 0x73 #define RT5640_DIP_SPK_INF 0x75 +#define RT5640_HP_DCC_INT1 0x77 #define RT5640_EQ_BW_LOP 0xa0 #define RT5640_EQ_GN_LOP 0xa1 #define RT5640_EQ_FC_BP1 0xa2 @@ -1201,6 +1204,14 @@ #define RT5640_CP_FQ2_SFT 4 #define RT5640_CP_FQ3_MASK (0x7) #define RT5640_CP_FQ3_SFT 0 +#define RT5640_CP_FQ_1_5_KHZ 0 +#define RT5640_CP_FQ_3_KHZ 1 +#define RT5640_CP_FQ_6_KHZ 2 +#define RT5640_CP_FQ_12_KHZ 3 +#define RT5640_CP_FQ_24_KHZ 4 +#define RT5640_CP_FQ_48_KHZ 5 +#define RT5640_CP_FQ_96_KHZ 6 +#define RT5640_CP_FQ_192_KHZ 7 /* HPOUT charge pump (0x91) */ #define RT5640_OSW_L_MASK (0x1 << 11) @@ -2087,6 +2098,10 @@ struct rt5640_priv { int pll_out; int dmic_en; + bool spo_l_mute; + bool spo_r_mute; + bool hp_l_mute; + bool hp_r_mute; }; #endif -- 1.8.1.1.439.g50a6b54

5 26