July 2015 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [RFT PATCH 1/2] ASoC: zx: i2s: Fix devm_ioremap_resource return value check
by Jun Nie 11 Jul '15

11 Jul '15

2015-07-09 21:19 GMT+08:00 Krzysztof Kozlowski <k.kozlowski.k(a)gmail.com>: > Value returned by devm_ioremap_resource() was checked for non-NULL but > devm_ioremap_resource() returns IOMEM_ERR_PTR, not NULL. In case of > error this could lead to dereference of ERR_PTR. > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k(a)gmail.com> > Cc: <stable(a)vger.kernel.org> > Fixes: e5d4cd87800c ("ASoC: zx: Add ZTE zx296702 I2S DAI driver") > > --- > > Patch only compile tested. > --- > sound/soc/zte/zx296702-i2s.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/zte/zx296702-i2s.c b/sound/soc/zte/zx296702-i2s.c > index 98d96e1b17e0..1930c42e1f55 100644 > --- a/sound/soc/zte/zx296702-i2s.c > +++ b/sound/soc/zte/zx296702-i2s.c > @@ -393,9 +393,9 @@ static int zx_i2s_probe(struct platform_device *pdev) > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > zx_i2s->mapbase = res->start; > zx_i2s->reg_base = devm_ioremap_resource(&pdev->dev, res); > - if (!zx_i2s->reg_base) { > + if (IS_ERR(zx_i2s->reg_base)) { > dev_err(&pdev->dev, "ioremap failed!\n"); > - return -EIO; > + return PTR_ERR(zx_i2s->reg_base); > } > > writel_relaxed(0, zx_i2s->reg_base + ZX_I2S_FIFO_CTRL); > -- > 2.1.4 > Reviewed-by: Jun Nie <jun.nie(a)linaro.org>

1 0

Re: [alsa-devel] [RFT PATCH 2/2] ASoC: zx: spdif: Fix devm_ioremap_resource return value check
by Jun Nie 11 Jul '15

11 Jul '15

2015-07-09 21:19 GMT+08:00 Krzysztof Kozlowski <k.kozlowski.k(a)gmail.com>: > Value returned by devm_ioremap_resource() was checked for non-NULL but > devm_ioremap_resource() returns IOMEM_ERR_PTR, not NULL. In case of > error this could lead to dereference of ERR_PTR. > > Signed-off-by: Krzysztof Kozlowski <k.kozlowski.k(a)gmail.com> > Cc: <stable(a)vger.kernel.org> > Fixes: 6fc3d24d4277 ("ASoC: zx: Add zx296702 SPDIF support") > > --- > > Patch only compile tested. > --- > sound/soc/zte/zx296702-spdif.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/soc/zte/zx296702-spdif.c b/sound/soc/zte/zx296702-spdif.c > index 11a0e46a1156..26265ce4caca 100644 > --- a/sound/soc/zte/zx296702-spdif.c > +++ b/sound/soc/zte/zx296702-spdif.c > @@ -322,9 +322,9 @@ static int zx_spdif_probe(struct platform_device *pdev) > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > zx_spdif->mapbase = res->start; > zx_spdif->reg_base = devm_ioremap_resource(&pdev->dev, res); > - if (!zx_spdif->reg_base) { > + if (IS_ERR(zx_spdif->reg_base)) { > dev_err(&pdev->dev, "ioremap failed!\n"); > - return -EIO; > + return PTR_ERR(zx_spdif->reg_base); > } > > zx_spdif_dev_init(zx_spdif->reg_base); > -- > 2.1.4 > Reviewed-by: Jun Nie <jun.nie(a)linaro.org>

1 0

Re: [alsa-devel] Fwd: Front speakers doesn't work in multichannel output, regression in ALC888
by Raymond Yau 11 Jul '15

11 Jul '15

> > > > http://www.alsa-project.org/db/?f=30b3f0087374b914a20dbe20a618fb892a5d6fd5 > > > > > > Are there any offical specificaion ? > > > > > > > > So far most review only mention stereo speakers and subwoofer, the > > > > service > > > > > > guide only show how to replace two internal speakers > > > > > > Service manual mentions > > > > > > "Dolby®-certified surround sound system with two built-in stereo > > > > speakers and > > > > > one subwoofer supporting low-frequency effects" > > > > > > so all additional channels what I'm hearing in Windows is emulated. I hope > > > that it is clear now that my laptop has two internal speakers and one > > > subwoofer. > > > > https://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/commit/sound/pc > > i/hda?id=8e38395360844806041ea69ab9690f5f174bc40c > > > > You need to define your 2.1 chmap if the subwoofer only use left channel > > > > Compiling and running PulseAudio from git > > > > http://colin.guthr.ie/2010/09/compiling-and-running-pulseaudio-from-git/ > > In Fedora 22 workaround with setting "Line out (front)" for 0x15 pin doesn't > work. > > Sound on my system is totally fucked up. http://cgit.freedesktop.org/pulseaudio/pulseaudio/tree/src/modules/alsa/mix… Are you sure that it is alsa driver bug since pulseaudio seem not using line out jack to mute internal speakers ? by adding new hint alt_config , you can use alt_config to select different set of pin config diff --git a/sound/pci/hda/hda_auto_parser.c b/sound/pci/hda/hda_auto_parser.c index 03b7399..683a0ab 100644 --- a/sound/pci/hda/hda_auto_parser.c +++ b/sound/pci/hda/hda_auto_parser.c @@ -952,6 +952,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec, const struct snd_pci_quirk *q; int id = HDA_FIXUP_ID_NOT_SET; const char *name = NULL; + int i; if (codec->fixup_id != HDA_FIXUP_ID_NOT_SET) return; @@ -966,6 +967,9 @@ void snd_hda_pick_fixup(struct hda_codec *codec, return; } + if (!snd_hda_get_int_hint(codec, "alt_config", &i)) + codec->alt_config = i; + if (codec->modelname && models) { while (models->name) { if (!strcmp(codec->modelname, models->name)) { diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 8e02cdf..f406835 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -1914,6 +1914,31 @@ static void alc889_fixup_mba21_vref(struct hda_codec *codec, alc889_fixup_mac_pins(codec, nids, ARRAY_SIZE(nids)); } +static void alc888_fixup_acer_aspire_4930g(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + struct hda_pintbl subwoofer_config[] = { + { 0x16, 0x90170111 }, /* internal subwoofer */ + {} + }; + struct hda_pintbl alt_config[] = { + { 0x15, 0x02014010}, + { 0x1a, 0x02014011}, + { 0x18, 0x02014012}, + {} + }; + snd_hda_apply_pincfgs(codec, subwoofer_config); + switch(codec->alt_config){ + case 1: + codec_info(codec, "5.1 External Speaker\n"); + snd_hda_apply_pincfgs(codec, alt_config); + break; + default: + codec_info(codec, "use [Hint]\nalt_config=1 for 5.1 External Speaker\n"); + break; + } +} + /* Don't take HP output as primary * Strangely, the speaker output doesn't work on Vaio Z and some Vaio * all-in-one desktop PCs (for example VGC-LN51JGB) through DAC 0x05 @@ -2048,12 +2073,8 @@ static const struct hda_fixup alc882_fixups[] = { .v.func = alc889_fixup_coef, }, [ALC882_FIXUP_ACER_ASPIRE_4930G] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl[]) { - { 0x16, 0x99130111 }, /* CLFE speaker */ - { 0x17, 0x99130112 }, /* surround speaker */ - { } - }, + .type = HDA_FIXUP_FUNC, + .v.func = alc888_fixup_acer_aspire_4930g, .chained = true, .chain_id = ALC882_FIXUP_GPIO1, },

1 0

[alsa-devel] [Alsa-user] HBR audio not working with radeon/caicos below 60Hz
by Dominique Dumont 10 Jul '15

10 Jul '15

Hello Unfortunately, I cannot get HBR audio (DTS-HD and dolby TrueHD) on my system with all refresh rates. Only 59 and 60 Hz refresh rates are working more or less properly: there's a dropout every now and then. Refresh rates below that are silent: no error is reported by kodi or by the kernel but my yamaha amp does not detect the audio stream. My yamaha amplifier is connected by HDMI to a radeon Caicos card. See [1] for the output of alsa-info.sh. DTS, dolby digital and DD-plus are working fine. This is a known issue [2] for kodi people. A bug [3] was reported on freedesktop.org to no avail. Can this issue be solved by alsa people or is this more an xorg bug ? Feel free to get back to me if you need more info. All the best -- https://github.com/dod38fr/config-model/ -o- http://search.cpan.org/~ddumont/ http://ddumont.wordpress.com/ -o- irc: dod at irc.debian.org [1] http://www.alsa-project.org/db/?f=4c59e10da7600d45ccff18ea0f655e2e97ce9ae6 [2] http://forum.kodi.tv/showthread.php?tid=174854 [3] https://bugs.freedesktop.org/show_bug.cgi?id=75064

1 0

[alsa-devel] [PATCH] ASoC: arizona: Fix error path in codec probe
by Charles Keepax 10 Jul '15

10 Jul '15

If we fail to add some DSPs or fail to add the controls we should call wm_adsp2_codec_remove for all the cores we have already added. This patch fixes this up on the wm5102 and wm5110. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5102.c | 7 ++++++- sound/soc/codecs/wm5110.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 6ddee99..64637d1 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1879,7 +1879,7 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) ret = snd_soc_add_codec_controls(codec, arizona_adsp2_rate_controls, 1); if (ret) - return ret; + goto err_adsp2_codec_probe; arizona_init_spk(codec); arizona_init_gpio(codec); @@ -1889,6 +1889,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) priv->core.arizona->dapm = dapm; return 0; + +err_adsp2_codec_probe: + wm_adsp2_codec_remove(&priv->core.adsp[0], codec); + + return ret; } static int wm5102_codec_remove(struct snd_soc_codec *codec) diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index 429be44..df6a998 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -1874,18 +1874,24 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) for (i = 0; i < WM5110_NUM_ADSP; ++i) { ret = wm_adsp2_codec_probe(&priv->core.adsp[i], codec); if (ret) - return ret; + goto err_adsp2_codec_probe; } ret = snd_soc_add_codec_controls(codec, arizona_adsp2_rate_controls, WM5110_NUM_ADSP); if (ret) - return ret; + goto err_adsp2_codec_probe; snd_soc_dapm_disable_pin(dapm, "HAPTICS"); return 0; + +err_adsp2_codec_probe: + for (--i; i >= 0; --i) + wm_adsp2_codec_remove(&priv->core.adsp[i], codec); + + return ret; } static int wm5110_codec_remove(struct snd_soc_codec *codec) -- 1.7.2.5

2 1

[alsa-devel] [PATCH 0/7] asoc: Add audio for sti platforms
by Arnaud Pouliquen 10 Jul '15

10 Jul '15

version 1: - First patches submission Set of patches concerns the audio part of the STi platform Hardware is split in two main blocks: Unipheriperal IPs and codec IPs Uniperipheral IPs: Ips in charge of the I2S buses Uniperipheral IPs are in charge the PCM rendering/capturing on/from I2S. - 4 uniperipheral player IPs receive the PCM audio data or audio encoded bit stream data from the memory (via FDMA)and performs optional IEC-60958 or IEC-61937 formatting on the audio data and sends them out on the I2S output. - 2 uniperipheral reader IPS receive the PCM audio or encoded bit stream on the I2S input interface and writes the processed data in memory (via FDMA) Codec IPs: - HDMI_TX: format and generate HDMI signal. - SPDIF: format and generate biphase signal for SPDIF output - DAC: format and generate stereo analogic signal - HDMI_RX: receive HDMI signal from external source. In addition 2 I2S/TDM interfaces are available to connect external ICs - PCM_IN to external capture codec (ADC, BT...) - PCM_OUT for external player codec (DAC, BT..) On Sti platform audio driver is splitted in 2 part to support Hw architecture - sti_audio_platform for uniperipheral IPs mmannagement - sti-sas codec for codec IP management +-----------------------+ +-----------------+ | +-----------------+ | | | | | +---------+ | | | +---------+ | | | |Uniperif | | | | | HDMI | | +---+ | | |player 0 +---------------> TX +-------> | | | +---------+ | | | +---------+ | +---+ | | +---------+ | | | | | | |Uniperif | | | | | +---+ | | |player 1 +---------------------------------> | | | +---------+ | | | | +---+ | | +---------+ | | | +---------+ | +---+ | | |Uniperif | | | | | DAC | | | | | | |player 2 +---------------> +------^----+ | | +---------+ | | | +---------+ | | | +---------+ | | | +---------+ | | | |Uniperif | | | | | SPDIF | | +---+ | | |player 3 +---------------> +-------> | | | +---------+ | | | +---------+ | +---+ | | +---------+ | | | | | | |Uniperif | | | | | +---+ | | |reader 0 <---------------------------------+ | | | +---------+ | | | | +---+ | | +---------+ | | | +---------+ | | | |Uniperif | | | | | HDMIF | | +---+ | | |reader 1 <---------------+ RX <-------+ | | | +---------+ | | | +---------+ | +---+ | | | | | | | | CPU DAI | | | | | +-----------------+ | | | | STI platform | | SAS CODEC | +-----------------------+ +-----------------+ In the first version of the driver only SPDIF and DAC are supported. in future HDMI TX, HDMI_RX and support for TDM mode should be added. Arnaud Pouliquen (7): ASoC: sti: add binding for ASoc driver Asoc: sti: add uniperipheral header file Asoc: sti: add CPU DAI driver for playback Asoc: sti: add CPU DAI driver for capture Asoc: sti: Add platform driver ASoc: Add ability to build sti drivers ASoc: Codec: add sti platform codec .../devicetree/bindings/sound/st,sti-asoc-card.txt | 176 +++ sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/codecs/Kconfig | 4 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/sti-sas.c | 663 ++++++++++ sound/soc/sti/Kconfig | 17 + sound/soc/sti/Makefile | 5 + sound/soc/sti/sti_platform.c | 643 +++++++++ sound/soc/sti/uniperif.h | 1236 ++++++++++++++++++ sound/soc/sti/uniperif_player.c | 1367 ++++++++++++++++++++ sound/soc/sti/uniperif_reader.c | 493 +++++++ 12 files changed, 4608 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt create mode 100644 sound/soc/codecs/sti-sas.c create mode 100644 sound/soc/sti/Kconfig create mode 100644 sound/soc/sti/Makefile create mode 100644 sound/soc/sti/sti_platform.c create mode 100644 sound/soc/sti/uniperif.h create mode 100644 sound/soc/sti/uniperif_player.c create mode 100644 sound/soc/sti/uniperif_reader.c -- 1.9.1

2 18

Re: [alsa-devel] Intel Baytrail Linux Audio
by Vinod Koul 10 Jul '15

10 Jul '15

On Wed, Jul 08, 2015 at 10:32:01PM +0200, Luka Karinja wrote: > Hello guys. I have been trying to get sound on my Asus T100TAF with rt5642. > I have been following your various threads but i'm not succesfull > with getting sound working. > Hoppfully you can give me a hand > > The changes i made to the kernel: > > diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c > index bb19b58..b45cf3e 100644 > --- a/sound/soc/intel/atom/sst/sst_acpi.c > +++ b/sound/soc/intel/atom/sst/sst_acpi.c > @@ -118,7 +118,7 @@ static const struct sst_res_info byt_rvp_res_info = { > .mbox_size = 0x1000, > .acpi_lpe_res_index = 0, > .acpi_ddr_index = 2, > - .acpi_ipc_irq_index = 5, > + .acpi_ipc_irq_index = 0, irq index in deafult shoudl work for t100, you should see interrupts > }; > static struct sst_platform_info byt_rvp_platform_data = { > @@ -345,6 +345,8 @@ static int sst_acpi_remove(struct platform_device *pdev) > static struct sst_machines sst_acpi_bytcr[] = { > {"10EC5640", "T100", "bytt100_rt5640", NULL, "intel/fw_sst_0f28.bin", > &byt_rvp_platform_data }, > + {"10EC5642", "T100", "bytt100_rt5640", NULL, "intel/fw_sst_0f28_ssp0.bin", > + &byt_rvp_platform_data }, That wont work, I have verfied with T100, it is SSP2 based, so SSP0 will nto work here. I am trying to get this tested on latest driver and provide a working config. Will update shortly -- ~Vinod

2 1

Re: [alsa-devel] Possible Bug Found with Xonar Stx Driver
by Clemens Ladisch 10 Jul '15

10 Jul '15

nick wrote: > After running the latest version of Linus's tree I am noticed way more buffering What exactly do you mean with the word "buffering"? > when playing music with my Xonar STX card when building kernels then > under the Ubuntu kernel version of 3.19.16. Sounds like a change in the disk access patterns. The audio buffer size is chosen by the playing application (whatever it is). > I have tried bisecting it between the releases of 3.18 and 4.0 > and was unable to narrow it down to a buggy commit. There was no relevant change in the sound driver. Regards, Clemens

2 1

[alsa-devel] Applied "regmap: add force_write option on _regmap_update_bits()" to the asoc tree
by Mark Brown 10 Jul '15

10 Jul '15

The patch regmap: add force_write option on _regmap_update_bits() has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 7ff0589c7bff4ca31b255ac2028f633f14047762 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Tue, 16 Jun 2015 08:52:22 +0000 Subject: [PATCH] regmap: add force_write option on _regmap_update_bits() Sometimes we want to write data even though it doesn't change value. Then, force_write option on _regmap_update_bits() helps this purpose. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/base/regmap/regmap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 7111d04f2621..69ec411ce722 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -34,7 +34,7 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val, - bool *change); + bool *change, bool force_write); static int _regmap_bus_reg_read(void *context, unsigned int reg, unsigned int *val); @@ -1178,7 +1178,7 @@ static int _regmap_select_page(struct regmap *map, unsigned int *reg, ret = _regmap_update_bits(map, range->selector_reg, range->selector_mask, win_page << range->selector_shift, - &page_chg); + &page_chg, false); map->work_buf = orig_work_buf; @@ -2327,7 +2327,7 @@ EXPORT_SYMBOL_GPL(regmap_bulk_read); static int _regmap_update_bits(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val, - bool *change) + bool *change, bool force_write) { int ret; unsigned int tmp, orig; @@ -2339,7 +2339,7 @@ static int _regmap_update_bits(struct regmap *map, unsigned int reg, tmp = orig & ~mask; tmp |= val & mask; - if (tmp != orig) { + if (force_write || (tmp != orig)) { ret = _regmap_write(map, reg, tmp); if (change) *change = true; @@ -2367,7 +2367,7 @@ int regmap_update_bits(struct regmap *map, unsigned int reg, int ret; map->lock(map->lock_arg); - ret = _regmap_update_bits(map, reg, mask, val, NULL); + ret = _regmap_update_bits(map, reg, mask, val, NULL, false); map->unlock(map->lock_arg); return ret; @@ -2398,7 +2398,7 @@ int regmap_update_bits_async(struct regmap *map, unsigned int reg, map->async = true; - ret = _regmap_update_bits(map, reg, mask, val, NULL); + ret = _regmap_update_bits(map, reg, mask, val, NULL, false); map->async = false; @@ -2427,7 +2427,7 @@ int regmap_update_bits_check(struct regmap *map, unsigned int reg, int ret; map->lock(map->lock_arg); - ret = _regmap_update_bits(map, reg, mask, val, change); + ret = _regmap_update_bits(map, reg, mask, val, change, false); map->unlock(map->lock_arg); return ret; } @@ -2460,7 +2460,7 @@ int regmap_update_bits_check_async(struct regmap *map, unsigned int reg, map->async = true; - ret = _regmap_update_bits(map, reg, mask, val, change); + ret = _regmap_update_bits(map, reg, mask, val, change, false); map->async = false; -- 2.1.4

1 0

[alsa-devel] Applied "regmap: add regmap_write_bits()" to the asoc tree
by Mark Brown 10 Jul '15

10 Jul '15

The patch regmap: add regmap_write_bits() has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From fd4b7286ccc469bf5dde22db6b8fcc455c3c4a66 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Tue, 16 Jun 2015 08:52:39 +0000 Subject: [PATCH] regmap: add regmap_write_bits() regmap_write_bits() is similar to regmap_update_bits(), but regmap_write_bits() write data to register even though it is same value. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- drivers/base/regmap/regmap.c | 23 +++++++++++++++++++++++ include/linux/regmap.h | 9 +++++++++ 2 files changed, 32 insertions(+) diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 69ec411ce722..d93bb9a8ab98 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -2375,6 +2375,29 @@ int regmap_update_bits(struct regmap *map, unsigned int reg, EXPORT_SYMBOL_GPL(regmap_update_bits); /** + * regmap_write_bits: Perform a read/modify/write cycle on the register map + * + * @map: Register map to update + * @reg: Register to update + * @mask: Bitmask to change + * @val: New value for bitmask + * + * Returns zero for success, a negative number on error. + */ +int regmap_write_bits(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val) +{ + int ret; + + map->lock(map->lock_arg); + ret = _regmap_update_bits(map, reg, mask, val, NULL, true); + map->unlock(map->lock_arg); + + return ret; +} +EXPORT_SYMBOL_GPL(regmap_write_bits); + +/** * regmap_update_bits_async: Perform a read/modify/write cycle on the register * map asynchronously * diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 59c55ea0f0b5..e4b9ad4f05ef 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -424,6 +424,8 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, size_t val_count); int regmap_update_bits(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val); +int regmap_write_bits(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val); int regmap_update_bits_async(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val); int regmap_update_bits_check(struct regmap *map, unsigned int reg, @@ -645,6 +647,13 @@ static inline int regmap_update_bits(struct regmap *map, unsigned int reg, return -EINVAL; } +static inline int regmap_write_bits(struct regmap *map, unsigned int reg, + unsigned int mask, unsigned int val) +{ + WARN_ONCE(1, "regmap API is disabled"); + return -EINVAL; +} + static inline int regmap_update_bits_async(struct regmap *map, unsigned int reg, unsigned int mask, unsigned int val) -- 2.1.4

1 0