Merge tag 'sound-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

abebcdfb · Linus Torvalds <[email protected]> · 2015-09-04 11:46:02 -07:00

Pull sound updates from Takashi Iwai:
 "There are little changes in core part, but lots of development are
  found in drivers, especially ASoC.  The diffstat shows regmap-related
  changes for a slight API additions / changes, and that's all.

  Looking at the code size statistics, the most significant addition is
  for Intel Skylake.  (Note that SKL support is still underway, the
  codec driver is missing.) Also STI controller driver is a major
  addition as well as a few new codec drivers.

  In HD-audio side, there are fewer changes than the past.  The
  noticeable change is the support of ELD notification from i915
  graphics driver.  Thus this pull request carries a few changes in
  drm/i915.

  Other than that, USB-audio got a rewrite of runtime PM code.  It was
  initiated by lockdep warning, but resulted in a good cleanup in the
  end.

  Below are the highlights:

  Common:
   - Factoring out of AC'97 reset code from ASoC into the core helper
   - A few regmap API extensions (in case it's not pulled yet)

  ASoC:
   - New drivers for Cirrus CS4349, GTM601, InvenSense ICS43432, Realtek
     RT298 and ST STI controllers
   - Machine drivers for Rockchip systems with MAX98090 and RT5645 and
     RT5650
   - Initial driver support for Intel Skylake devices
   - Lots of rsnd cleanup and enhancements
   - A few DAPM fixes and cleanups
   - A large number of cleanups in various drivers (conversion and
     standardized to regmap, component) mostly by Lars-Peter and Axel

  HD-audio:
   - Extended HD-audio core for Intel Skylake controller support
   - Quirks for Dell headsets, Alienware 15
   - Clean up of pin-based quirk tables for Realtek codecs
   - ELD notifier implenetation for Intel HDMI/DP

  USB-audio:
   - Refactor runtime PM code to make lockdep happier"

* tag 'sound-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (411 commits)
  drm/i915: Add locks around audio component bind/unbind
  drm/i915: Drop port_mst_index parameter from pin/eld callback
  ALSA: hda - Fix missing inline for dummy snd_hdac_set_codec_wakeup()
  ALSA: hda - Wake the codec up on pin/ELD notify events
  ALSA: hda - allow codecs to access the i915 pin/ELD callback
  drm/i915: Call audio pin/ELD notify function
  drm/i915: Add audio pin sense / ELD callback
  ASoC: zx296702-i2s: Fix resource leak when unload module
  ASoC: sti_uniperif: Ensure component is unregistered when unload module
  ASoC: au1x: psc-i2s: Convert to use devm_ioremap_resource
  ASoC: sh: dma-sh7760: Convert to devm_snd_soc_register_platform
  ASoC: spear_pcm: Use devm_snd_dmaengine_pcm_register to fix resource leak
  ALSA: fireworks/bebob/dice/oxfw: fix substreams counting at vmalloc failure
  ASoC: Clean up docbook warnings
  ASoC: txx9: Convert to devm_snd_soc_register_platform
  ASoC: pxa: Convert to devm_snd_soc_register_platform
  ASoC: nuc900: Convert to devm_snd_soc_register_platform
  ASoC: blackfin: Convert to devm_snd_soc_register_platform
  ASoC: au1x: Convert to devm_snd_soc_register_platform
  ASoC: qcom: Constify asoc_qcom_lpass_cpu_dai_ops
  ...

Commit: abebcdfb64f1b39eeeb14282d9cd4aad1ed86f8d
Parents: 670c039d · d5f362a7

Merge commit. Changes below are compared with the first parent: 670c039d.

Changes

368 files changed · +17063 −4617

File	Status	Add	Del	Content
Documentation/DocBook/alsa-driver-api.tmpl	modified	+1	−1	View file
Documentation/devicetree/bindings/sound/cs4349.txt	added	+19	−0	View file
Documentation/devicetree/bindings/sound/ics43432.txt	added	+17	−0	View file
Documentation/devicetree/bindings/sound/max98357a.txt	modified	+5	−1	View file
Documentation/devicetree/bindings/sound/renesas,rsnd.txt	modified	+22	−0	View file
Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt	modified	+7	−0	View file
Documentation/devicetree/bindings/sound/rockchip-max98090.txt	added	+19	−0	View file
Documentation/devicetree/bindings/sound/rockchip-rt5645.txt	added	+17	−0	View file
Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt	added	+155	−0	View file
Documentation/devicetree/bindings/vendor-prefixes.txt	modified	+2	−0	View file
drivers/base/regmap/internal.h	modified	+1	−1	View file
drivers/base/regmap/regmap.c	modified	+54	−19	View file
drivers/gpu/drm/i2c/adv7511.c	modified	+1	−1	View file
drivers/gpu/drm/i915/i915_drv.h	modified	+1	−0	View file
drivers/gpu/drm/i915/intel_audio.c	modified	+24	−3	View file
drivers/input/misc/drv260x.c	modified	+3	−3	View file
drivers/input/misc/drv2665.c	modified	+1	−1	View file
drivers/input/misc/drv2667.c	modified	+2	−2	View file
drivers/input/touchscreen/wm97xx-core.c	modified	+4	−9	View file
drivers/mfd/arizona-core.c	modified	+1	−1	View file
drivers/mfd/twl6040.c	modified	+1	−1	View file
drivers/mfd/wm5102-tables.c	modified	+3	−3	View file
drivers/mfd/wm5110-tables.c	modified	+18	−4	View file
drivers/mfd/wm8994-core.c	modified	+4	−4	View file
drivers/mfd/wm8997-tables.c	modified	+1	−1	View file
include/drm/i915_component.h	modified	+11	−0	View file
include/linux/mfd/arizona/registers.h	modified	+37	−0	View file
include/linux/regmap.h	modified	+25	−3	View file
include/sound/ac97_codec.h	modified	+2	−0	View file
include/sound/hda_i915.h	modified	+8	−1	View file
include/sound/hda_register.h	modified	+4	−0	View file
include/sound/hdaudio.h	modified	+11	−8	View file
include/sound/hdaudio_ext.h	modified	+71	−0	View file
include/sound/rcar_snd.h	modified	+14	−0	View file
include/sound/rt298.h	added	+20	−0	View file
include/sound/soc-dapm.h	modified	+72	−12	View file
include/sound/soc-topology.h	modified	+12	−1	View file
include/sound/soc.h	modified	+16	−13	View file
include/trace/events/asoc.h	modified	+15	−38	View file
sound/ac97_bus.c	modified	+59	−23	View file
sound/aoa/codecs/onyx.c	modified	+0	−1	View file
sound/aoa/codecs/tas.c	modified	+0	−1	View file
sound/aoa/fabrics/layout.c	modified	+12	−9	View file
sound/aoa/soundbus/core.c	modified	+0	−28	View file
sound/aoa/soundbus/soundbus.h	modified	+0	−2	View file
sound/firewire/bebob/bebob_pcm.c	modified	+16	−4	View file
sound/firewire/dice/dice-pcm.c	modified	+14	−4	View file
sound/firewire/fireworks/fireworks_pcm.c	modified	+14	−4	View file
sound/firewire/oxfw/oxfw-pcm.c	modified	+13	−4	View file
sound/firewire/oxfw/oxfw-stream.c	modified	+3	−6	View file
sound/hda/ext/hdac_ext_bus.c	modified	+94	−4	View file
sound/hda/ext/hdac_ext_controller.c	modified	+25	−5	View file
sound/hda/ext/hdac_ext_stream.c	modified	+55	−7	View file
sound/hda/hdac_device.c	modified	+48	−8	View file
sound/hda/hdac_i915.c	modified	+10	−0	View file
sound/hda/hdac_regmap.c	modified	+6	−4	View file
sound/hda/hdac_stream.c	modified	+22	−0	View file
sound/hda/hdac_sysfs.c	modified	+4	−2	View file
sound/pci/echoaudio/darla20_dsp.c	modified	+3	−3	View file
sound/pci/echoaudio/darla24_dsp.c	modified	+3	−3	View file
sound/pci/echoaudio/echo3g_dsp.c	modified	+8	−8	View file
sound/pci/echoaudio/echoaudio.c	modified	+1	−1	View file
sound/pci/echoaudio/echoaudio.h	modified	+2	−5	View file
sound/pci/echoaudio/echoaudio_3g.c	modified	+6	−6	View file
sound/pci/echoaudio/echoaudio_dsp.c	modified	+13	−13	View file
sound/pci/echoaudio/echoaudio_gml.c	modified	+2	−2	View file
sound/pci/echoaudio/gina20.c	modified	+1	−1	View file
sound/pci/echoaudio/gina20_dsp.c	modified	+4	−4	View file
sound/pci/echoaudio/gina24_dsp.c	modified	+11	−11	View file
sound/pci/echoaudio/indigo_dsp.c	modified	+3	−3	View file
sound/pci/echoaudio/indigodj_dsp.c	modified	+3	−3	View file
sound/pci/echoaudio/indigodjx_dsp.c	modified	+3	−3	View file
sound/pci/echoaudio/indigoio_dsp.c	modified	+3	−3	View file
sound/pci/echoaudio/indigoiox_dsp.c	modified	+3	−3	View file
sound/pci/echoaudio/layla20.c	modified	+1	−1	View file
sound/pci/echoaudio/layla20_dsp.c	modified	+6	−6	View file
sound/pci/echoaudio/layla24_dsp.c	modified	+13	−13	View file
sound/pci/echoaudio/mia.c	modified	+1	−1	View file
sound/pci/echoaudio/mia_dsp.c	modified	+4	−4	View file
sound/pci/echoaudio/mona_dsp.c	modified	+10	−10	View file
sound/pci/emu10k1/emumixer.c	modified	+14	−11	View file
sound/pci/hda/hda_auto_parser.c	modified	+24	−3	View file
sound/pci/hda/hda_codec.c	modified	+3	−74	View file
sound/pci/hda/hda_codec.h	modified	+0	−7	View file
sound/pci/hda/hda_eld.c	modified	+5	−5	View file
sound/pci/hda/hda_proc.c	modified	+81	−26	View file
sound/pci/hda/patch_ca0132.c	modified	+59	−28	View file
sound/pci/hda/patch_hdmi.c	modified	+21	−1	View file
sound/pci/hda/patch_realtek.c	modified	+33	−275	View file
sound/pci/rme9652/hdsp.c	modified	+4	−3	View file
sound/ppc/keywest.c	modified	+2	−0	View file
sound/soc/Kconfig	modified	+1	−0	View file
sound/soc/Makefile	modified	+1	−0	View file
sound/soc/atmel/atmel_ssc_dai.c	modified	+1	−1	View file
sound/soc/au1x/dbdma2.c	modified	+2	−9	View file
sound/soc/au1x/dma.c	modified	+2	−9	View file
sound/soc/au1x/psc-i2s.c	modified	+3	−13	View file
sound/soc/bcm/bcm2835-i2s.c	modified	+2	−0	View file
sound/soc/blackfin/bf5xx-ac97-pcm.c	modified	+2	−8	View file
sound/soc/blackfin/bf5xx-i2s-pcm.c	modified	+2	−8	View file
sound/soc/blackfin/bfin-eval-adau1x61.c	modified	+1	−0	View file
sound/soc/codecs/88pm860x-codec.c	modified	+13	−19	View file
sound/soc/codecs/Kconfig	modified	+25	−0	View file
sound/soc/codecs/Makefile	modified	+10	−0	View file
sound/soc/codecs/ab8500-codec.c	modified	+3	−4	View file
sound/soc/codecs/ad1980.c	modified	+12	−24	View file
sound/soc/codecs/adau1373.c	modified	+9	−13	View file
sound/soc/codecs/adau1701.c	modified	+0	−1	View file
sound/soc/codecs/adau1761-i2c.c	modified	+0	−1	View file
sound/soc/codecs/adau1781-i2c.c	modified	+0	−1	View file
sound/soc/codecs/adau1977-i2c.c	modified	+0	−1	View file
sound/soc/codecs/adav803.c	modified	+0	−1	View file
sound/soc/codecs/adav80x.c	modified	+1	−2	View file
sound/soc/codecs/ak4535.c	modified	+0	−1	View file
sound/soc/codecs/ak4641.c	modified	+0	−1	View file
sound/soc/codecs/ak4642.c	modified	+26	−8	View file
sound/soc/codecs/ak4671.c	modified	+0	−1	View file
sound/soc/codecs/alc5623.c	modified	+3	−5	View file
sound/soc/codecs/alc5632.c	modified	+4	−6	View file
sound/soc/codecs/arizona.c	modified	+98	−31	View file
sound/soc/codecs/arizona.h	modified	+19	−1	View file
sound/soc/codecs/cs35l32.c	modified	+10	−50	View file
sound/soc/codecs/cs35l32.h	modified	+1	−1	View file
sound/soc/codecs/cs4265.c	modified	+1	−18	View file
sound/soc/codecs/cs4270.c	modified	+0	−1	View file
sound/soc/codecs/cs4271-i2c.c	modified	+0	−1	View file
sound/soc/codecs/cs42l51-i2c.c	modified	+0	−1	View file
sound/soc/codecs/cs42l52.c	modified	+6	−59	View file
sound/soc/codecs/cs42l56.c	modified	+11	−60	View file
sound/soc/codecs/cs42l73.c	modified	+10	−105	View file
sound/soc/codecs/cs42xx8-i2c.c	modified	+2	−2	View file
sound/soc/codecs/cs42xx8.c	modified	+10	−9	View file
sound/soc/codecs/cs42xx8.h	modified	+1	−0	View file
sound/soc/codecs/cs4349.c	added	+392	−0	View file
sound/soc/codecs/cs4349.h	added	+136	−0	View file
sound/soc/codecs/da7210.c	modified	+12	−17	View file
sound/soc/codecs/da7213.c	modified	+7	−11	View file
sound/soc/codecs/da732x.c	modified	+4	−11	View file
sound/soc/codecs/da9055.c	modified	+8	−11	View file
sound/soc/codecs/gtm601.c	added	+95	−0	View file
sound/soc/codecs/ics43432.c	added	+76	−0	View file
sound/soc/codecs/isabelle.c	modified	+5	−6	View file
sound/soc/codecs/jz4740.c	modified	+3	−4	View file
sound/soc/codecs/lm4857.c	modified	+0	−1	View file
sound/soc/codecs/lm49453.c	modified	+7	−12	View file
sound/soc/codecs/max9768.c	modified	+22	−49	View file
sound/soc/codecs/max98088.c	modified	+35	−294	View file
sound/soc/codecs/max98088.h	modified	+1	−1	View file
sound/soc/codecs/max98090.c	modified	+67	−104	View file
sound/soc/codecs/max98090.h	modified	+1	−0	View file
sound/soc/codecs/max98095.c	modified	+44	−310	View file
sound/soc/codecs/max98357a.c	modified	+9	−16	View file
sound/soc/codecs/max9850.c	modified	+3	−5	View file
sound/soc/codecs/max9877.c	modified	+11	−22	View file
sound/soc/codecs/max98925.c	modified	+1	−5	View file
sound/soc/codecs/mc13783.c	modified	+3	−3	View file
sound/soc/codecs/ml26124.c	modified	+1	−2	View file
sound/soc/codecs/pcm1681.c	modified	+9	−5	View file
sound/soc/codecs/pcm512x-i2c.c	modified	+0	−1	View file
sound/soc/codecs/pcm512x.c	modified	+2	−2	View file
sound/soc/codecs/rl6231.c	modified	+88	−16	View file
sound/soc/codecs/rl6231.h	modified	+1	−0	View file
sound/soc/codecs/rt286.c	modified	+5	−6	View file
sound/soc/codecs/rt298.c	added	+1271	−0	View file
sound/soc/codecs/rt298.h	added	+206	−0	View file
sound/soc/codecs/rt5631.c	modified	+3	−5	View file
sound/soc/codecs/rt5640.c	modified	+46	−13	View file
sound/soc/codecs/rt5645.c	modified	+226	−217	View file
sound/soc/codecs/rt5645.h	modified	+1	−26	View file
sound/soc/codecs/rt5651.c	modified	+9	−10	View file
sound/soc/codecs/rt5670.c	modified	+10	−11	View file
sound/soc/codecs/rt5677-spi.c	modified	+173	−60	View file
sound/soc/codecs/rt5677-spi.h	modified	+3	−5	View file
sound/soc/codecs/rt5677.c	modified	+61	−98	View file
sound/soc/codecs/rt5677.h	modified	+3	−2	View file
sound/soc/codecs/sgtl5000.c	modified	+3	−5	View file
sound/soc/codecs/si476x.c	modified	+1	−1	View file
sound/soc/codecs/sirf-audio-codec.c	modified	+2	−2	View file
sound/soc/codecs/ssm2518.c	modified	+9	−1	View file
sound/soc/codecs/ssm2602-i2c.c	modified	+0	−1	View file
sound/soc/codecs/ssm2602.c	modified	+3	−4	View file
sound/soc/codecs/ssm4567.c	modified	+33	−1	View file
sound/soc/codecs/sta32x.c	modified	+0	−1	View file
sound/soc/codecs/sta350.c	modified	+0	−1	View file
sound/soc/codecs/sta529.c	modified	+0	−4	View file
sound/soc/codecs/stac9766.c	modified	+7	−50	View file
sound/soc/codecs/sti-sas.c	added	+628	−0	View file
sound/soc/codecs/tas2552.c	modified	+7	−13	View file
sound/soc/codecs/tas2552.h	modified	+1	−1	View file
sound/soc/codecs/tas5086.c	modified	+7	−4	View file
sound/soc/codecs/tas571x.c	modified	+1	−1	View file
sound/soc/codecs/tfa9879.c	modified	+1	−2	View file
sound/soc/codecs/tlv320aic31xx.c	modified	+1	−2	View file
sound/soc/codecs/tlv320aic32x4.c	modified	+0	−1	View file
sound/soc/codecs/tlv320aic3x.c	modified	+1	−2	View file
sound/soc/codecs/tlv320dac33.c	modified	+0	−1	View file
sound/soc/codecs/tpa6130a2.c	modified	+6	−9	View file
sound/soc/codecs/ts3a227e.c	modified	+45	−3	View file
sound/soc/codecs/twl4030.c	modified	+3	−4	View file
sound/soc/codecs/uda134x.c	modified	+76	−104	View file
sound/soc/codecs/uda134x.h	modified	+0	−2	View file
sound/soc/codecs/uda1380.c	modified	+6	−9	View file
sound/soc/codecs/wm0010.c	modified	+1	−2	View file
sound/soc/codecs/wm1250-ev1.c	modified	+0	−1	View file
sound/soc/codecs/wm2000.c	modified	+0	−1	View file
sound/soc/codecs/wm2200.c	modified	+4	−5	View file
sound/soc/codecs/wm5100.c	modified	+5	−8	View file
sound/soc/codecs/wm5102.c	modified	+14	−13	View file
sound/soc/codecs/wm5110.c	modified	+292	−23	View file
sound/soc/codecs/wm8350.c	modified	+3	−4	View file
sound/soc/codecs/wm8400.c	modified	+1	−4	View file
sound/soc/codecs/wm8510.c	modified	+1	−1	View file
sound/soc/codecs/wm8523.c	modified	+1	−1	View file
sound/soc/codecs/wm8580.c	modified	+1	−1	View file
sound/soc/codecs/wm8711.c	modified	+0	−1	View file
sound/soc/codecs/wm8728.c	modified	+0	−1	View file
sound/soc/codecs/wm8731.c	modified	+47	−41	View file
sound/soc/codecs/wm8737.c	modified	+3	−5	View file
sound/soc/codecs/wm8741.c	modified	+14	−49	View file
sound/soc/codecs/wm8750.c	modified	+0	−1	View file
sound/soc/codecs/wm8753.c	modified	+3	−11	View file
sound/soc/codecs/wm8776.c	modified	+2	−3	View file
sound/soc/codecs/wm8804-i2c.c	modified	+0	−1	View file
sound/soc/codecs/wm8804.c	modified	+1	−1	View file
sound/soc/codecs/wm8900.c	modified	+0	−1	View file
sound/soc/codecs/wm8903.c	modified	+0	−1	View file
sound/soc/codecs/wm8904.c	modified	+3	−2	View file
sound/soc/codecs/wm8940.c	modified	+0	−1	View file
sound/soc/codecs/wm8955.c	modified	+0	−1	View file
sound/soc/codecs/wm8960.c	modified	+179	−42	View file
sound/soc/codecs/wm8960.h	modified	+1	−0	View file
sound/soc/codecs/wm8961.c	modified	+3	−5	View file
sound/soc/codecs/wm8962.c	modified	+9	−12	View file
sound/soc/codecs/wm8971.c	modified	+0	−1	View file
sound/soc/codecs/wm8974.c	modified	+0	−1	View file
sound/soc/codecs/wm8978.c	modified	+0	−1	View file
sound/soc/codecs/wm8983.c	modified	+14	−67	View file
sound/soc/codecs/wm8985.c	modified	+0	−1	View file
sound/soc/codecs/wm8988.c	modified	+0	−1	View file
sound/soc/codecs/wm8990.c	modified	+1	−5	View file
sound/soc/codecs/wm8991.c	modified	+9	−44	View file
sound/soc/codecs/wm8993.c	modified	+5	−7	View file
sound/soc/codecs/wm8994.c	modified	+10	−8	View file
sound/soc/codecs/wm8995.c	modified	+0	−1	View file
sound/soc/codecs/wm8996.c	modified	+4	−7	View file
sound/soc/codecs/wm8997.c	modified	+8	−12	View file
sound/soc/codecs/wm9081.c	modified	+4	−6	View file
sound/soc/codecs/wm9090.c	modified	+9	−13	View file
sound/soc/codecs/wm9705.c	modified	+8	−32	View file
sound/soc/codecs/wm9712.c	modified	+8	−37	View file
sound/soc/codecs/wm9713.c	modified	+11	−44	View file
sound/soc/codecs/wm9713.h	modified	+0	−2	View file
sound/soc/codecs/wm_hubs.c	modified	+3	−4	View file
sound/soc/davinci/davinci-i2s.c	modified	+6	−19	View file
sound/soc/davinci/davinci-mcasp.c	modified	+4	−14	View file
sound/soc/davinci/davinci-vcif.c	modified	+3	−11	View file
sound/soc/fsl/eukrea-tlv320.c	modified	+1	−1	View file
sound/soc/fsl/fsl-asoc-card.c	modified	+14	−2	View file
sound/soc/fsl/fsl_asrc.c	modified	+20	−5	View file
sound/soc/fsl/fsl_esai.c	modified	+1	−1	View file
sound/soc/fsl/fsl_sai.c	modified	+1	−1	View file
sound/soc/fsl/fsl_sai.h	modified	+8	−7	View file
sound/soc/fsl/fsl_spdif.c	modified	+17	−8	View file
sound/soc/fsl/fsl_ssi.c	modified	+60	−8	View file
sound/soc/fsl/imx-pcm-dma.c	modified	+21	−4	View file
sound/soc/fsl/imx-pcm.h	modified	+7	−2	View file
sound/soc/fsl/imx-ssi.c	modified	+1	−1	View file
sound/soc/generic/simple-card.c	modified	+9	−0	View file
sound/soc/intel/Kconfig	modified	+18	−11	View file
sound/soc/intel/Makefile	modified	+1	−0	View file
sound/soc/intel/atom/sst-atom-controls.c	modified	+3	−3	View file
sound/soc/intel/atom/sst-mfld-platform-pcm.c	modified	+0	−1	View file
sound/soc/intel/atom/sst-mfld-platform.h	modified	+1	−0	View file
sound/soc/intel/atom/sst/sst_drv_interface.c	modified	+7	−2	View file
sound/soc/intel/atom/sst/sst_ipc.c	modified	+1	−2	View file
sound/soc/intel/boards/byt-max98090.c	modified	+1	−0	View file
sound/soc/intel/boards/byt-rt5640.c	modified	+1	−0	View file
sound/soc/intel/boards/bytcr_rt5640.c	modified	+1	−0	View file
sound/soc/intel/boards/cht_bsw_max98090_ti.c	modified	+8	−11	View file
sound/soc/intel/boards/cht_bsw_rt5645.c	modified	+2	−0	View file
sound/soc/intel/boards/cht_bsw_rt5672.c	modified	+1	−0	View file
sound/soc/intel/common/sst-dsp-priv.h	modified	+19	−4	View file
sound/soc/intel/common/sst-dsp.c	modified	+71	−0	View file
sound/soc/intel/common/sst-dsp.h	modified	+6	−0	View file
sound/soc/intel/skylake/Makefile	added	+9	−0	View file
sound/soc/intel/skylake/skl-messages.c	added	+884	−0	View file
sound/soc/intel/skylake/skl-nhlt.c	added	+140	−0	View file
sound/soc/intel/skylake/skl-nhlt.h	added	+106	−0	View file
sound/soc/intel/skylake/skl-pcm.c	added	+916	−0	View file
sound/soc/intel/skylake/skl-sst-cldma.c	added	+327	−0	View file
sound/soc/intel/skylake/skl-sst-cldma.h	added	+251	−0	View file
sound/soc/intel/skylake/skl-sst-dsp.c	added	+342	−0	View file
sound/soc/intel/skylake/skl-sst-dsp.h	added	+145	−0	View file
sound/soc/intel/skylake/skl-sst-ipc.c	added	+771	−0	View file
sound/soc/intel/skylake/skl-sst-ipc.h	added	+125	−0	View file
sound/soc/intel/skylake/skl-sst.c	added	+280	−0	View file
sound/soc/intel/skylake/skl-topology.h	added	+286	−0	View file
sound/soc/intel/skylake/skl-tplg-interface.h	added	+88	−0	View file
sound/soc/intel/skylake/skl.c	added	+536	−0	View file
sound/soc/intel/skylake/skl.h	added	+84	−0	View file
sound/soc/kirkwood/kirkwood-dma.c	modified	+4	−0	View file
sound/soc/mediatek/mt8173-max98090.c	modified	+1	−1	View file
sound/soc/mediatek/mt8173-rt5650-rt5676.c	modified	+1	−1	View file
sound/soc/mediatek/mtk-afe-common.h	modified	+0	−8	View file
sound/soc/mediatek/mtk-afe-pcm.c	modified	+77	−12	View file
sound/soc/nuc900/nuc900-pcm.c	modified	+1	−8	View file
sound/soc/omap/mcbsp.c	modified	+5	−15	View file
sound/soc/omap/omap-hdmi-audio.c	modified	+9	−1	View file
sound/soc/omap/omap3pandora.c	modified	+2	−4	View file
sound/soc/pxa/mmp-pcm.c	modified	+1	−8	View file
sound/soc/pxa/pxa-ssp.c	modified	+2	−9	View file
sound/soc/pxa/pxa2xx-i2s.c	modified	+2	−9	View file
sound/soc/pxa/pxa2xx-pcm.c	modified	+1	−8	View file
sound/soc/qcom/Kconfig	modified	+3	−4	View file
sound/soc/qcom/lpass-cpu.c	modified	+1	−1	View file
sound/soc/qcom/lpass-ipq806x.c	modified	+1	−1	View file
sound/soc/qcom/lpass.h	modified	+1	−1	View file
sound/soc/rockchip/Kconfig	modified	+19	−0	View file
sound/soc/rockchip/Makefile	modified	+6	−0	View file
sound/soc/rockchip/rockchip_i2s.c	modified	+2	−6	View file
sound/soc/rockchip/rockchip_max98090.c	added	+236	−0	View file
sound/soc/rockchip/rockchip_rt5645.c	added	+225	−0	View file
sound/soc/samsung/arndale_rt5631.c	modified	+1	−10	View file
sound/soc/samsung/snow.c	modified	+1	−0	View file
sound/soc/sh/dma-sh7760.c	modified	+1	−8	View file
sound/soc/sh/fsi.c	modified	+0	−1	View file
sound/soc/sh/rcar/Makefile	modified	+1	−1	View file
sound/soc/sh/rcar/core.c	modified	+173	−22	View file
sound/soc/sh/rcar/ctu.c	added	+171	−0	View file
sound/soc/sh/rcar/dma.c	modified	+87	−41	View file
sound/soc/sh/rcar/dvc.c	modified	+31	−42	View file
sound/soc/sh/rcar/gen.c	modified	+31	−2	View file
sound/soc/sh/rcar/mix.c	added	+200	−0	View file
sound/soc/sh/rcar/rsnd.h	modified	+80	−31	View file
sound/soc/sh/rcar/rsrc-card.c	modified	+18	−4	View file
sound/soc/sh/rcar/src.c	modified	+65	−52	View file
sound/soc/sh/rcar/ssi.c	modified	+1	−3	View file
sound/soc/sh/ssi.c	modified	+3	−9	View file
sound/soc/soc-ac97.c	modified	+25	−5	View file
sound/soc/soc-core.c	modified	+61	−25	View file
sound/soc/soc-dapm.c	modified	+229	−274	View file
sound/soc/soc-pcm.c	modified	+7	−9	View file
sound/soc/soc-topology.c	modified	+77	−68	View file
sound/soc/spear/spdif_in.c	modified	+5	−15	View file
sound/soc/spear/spear_pcm.c	modified	+1	−1	View file
sound/soc/sti/Kconfig	added	+11	−0	View file
sound/soc/sti/Makefile	added	+4	−0	View file
sound/soc/sti/sti_uniperif.c	added	+254	−0	View file
sound/soc/sti/uniperif.h	added	+1229	−0	View file
sound/soc/sti/uniperif_player.c	added	+1110	−0	View file
sound/soc/sti/uniperif_reader.c	added	+362	−0	View file
sound/soc/tegra/tegra20_das.c	modified	+4	−19	View file
sound/soc/tegra/tegra20_i2s.c	modified	+4	−19	View file
sound/soc/tegra/tegra20_spdif.c	modified	+11	−36	View file
sound/soc/tegra/tegra30_ahub.c	modified	+17	−63	View file
sound/soc/tegra/tegra30_i2s.c	modified	+4	−19	View file
sound/soc/txx9/txx9aclc.c	modified	+2	−8	View file
sound/soc/ux500/ux500_msp_dai.c	modified	+10	−19	View file
sound/soc/xtensa/xtfpga-i2s.c	modified	+1	−7	View file
sound/soc/zte/zx296702-i2s.c	modified	+3	−3	View file
sound/usb/card.c	modified	+61	−47	View file
sound/usb/endpoint.c	modified	+6	−4	View file
sound/usb/mixer.c	modified	+66	−48	View file
sound/usb/mixer.h	modified	+2	−0	View file
sound/usb/mixer_quirks.c	modified	+54	−72	View file
sound/usb/pcm.c	modified	+45	−19	View file
sound/usb/proc.c	modified	+2	−2	View file
sound/usb/usbaudio.h	modified	+7	−4	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/DocBook/alsa-driver-api.tmpl

View file

diff --git a/Documentation/DocBook/alsa-driver-api.tmpl b/Documentation/DocBook/alsa-driver-api.tmpl
index 71f9246..e94a10b 100644
--- a/Documentation/DocBook/alsa-driver-api.tmpl
+++ b/Documentation/DocBook/alsa-driver-api.tmpl
@@ -108,7 +108,7 @@
      <sect1><title>ASoC Core API</title>
 !Iinclude/sound/soc.h
 !Esound/soc/soc-core.c
-!Esound/soc/soc-cache.c
+<!-- !Esound/soc/soc-cache.c no docbook comments here -->
 !Esound/soc/soc-devres.c
 !Esound/soc/soc-io.c
 !Esound/soc/soc-pcm.c

Documentation/devicetree/bindings/sound/cs4349.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/cs4349.txt b/Documentation/devicetree/bindings/sound/cs4349.txt
new file mode 100644
index 0000000..54c117b
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cs4349.txt
@@ -0,0 +1,19 @@
+CS4349 audio CODEC
+
+Required properties:
+
+  - compatible : "cirrus,cs4349"
+
+  - reg : the I2C address of the device for I2C
+
+Optional properties:
+
+  - reset-gpios : a GPIO spec for the reset pin.
+
+Example:
+
+codec: cs4349@48 {
+        compatible = "cirrus,cs4349";
+        reg = <0x48>;
+        reset-gpios = <&gpio 54 0>;
+};

Documentation/devicetree/bindings/sound/ics43432.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/ics43432.txt b/Documentation/devicetree/bindings/sound/ics43432.txt
new file mode 100644
index 0000000..b02e3a6
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/ics43432.txt
@@ -0,0 +1,17 @@
+Invensense ICS-43432 MEMS microphone with I2S output.
+
+There are no software configuration options for this device, indeed, the only
+host connection is the I2S interface. Apart from requirements on clock
+frequency (460 kHz to 3.379 MHz according to the data sheet) there must be
+64 clock cycles in each stereo output frame; 24 of the 32 available bits
+contain audio data. A hardware pin determines if the device outputs data
+on the left or right channel of the I2S frame.
+
+Required properties:
+  - compatible : Must be "invensense,ics43432"
+
+Example:
+
+	ics43432: ics43432 {
+		compatible = "invensense,ics43432";
+	};

Documentation/devicetree/bindings/sound/max98357a.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/max98357a.txt b/Documentation/devicetree/bindings/sound/max98357a.txt
index a7a149a..28645a2 100644
--- a/Documentation/devicetree/bindings/sound/max98357a.txt
+++ b/Documentation/devicetree/bindings/sound/max98357a.txt
@@ -4,7 +4,11 @@ This node models the Maxim MAX98357A DAC.
 
 Required properties:
 - compatible   : "maxim,max98357a"
-- sdmode-gpios : GPIO specifier for the GPIO -> DAC SDMODE pin
+
+Optional properties:
+- sdmode-gpios : GPIO specifier for the chip's SD_MODE pin.
+        If this option is not specified then driver does not manage
+        the pin state (e.g. chip is always on).
 
 Example:
 

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
index b6b3a78..1173395 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -18,6 +18,12 @@ Required properties:
 - rcar_sound,src		: Should contain SRC feature.
 				  The number of SRC subnode should be same as HW.
 				  see below for detail.
+- rcar_sound,ctu		: Should contain CTU feature.
+				  The number of CTU subnode should be same as HW.
+				  see below for detail.
+- rcar_sound,mix		: Should contain MIX feature.
+				  The number of MIX subnode should be same as HW.
+				  see below for detail.
 - rcar_sound,dvc		: Should contain DVC feature.
 				  The number of DVC subnode should be same as HW.
 				  see below for detail.
@@ -90,6 +96,22 @@ rcar_sound: sound@ec500000 {
 		};
 	};
 
+	rcar_sound,mix {
+		mix0: mix@0 { };
+		mix1: mix@1 { };
+	};
+
+	rcar_sound,ctu {
+		ctu00: ctu@0 { };
+		ctu01: ctu@1 { };
+		ctu02: ctu@2 { };
+		ctu03: ctu@3 { };
+		ctu10: ctu@4 { };
+		ctu11: ctu@5 { };
+		ctu12: ctu@6 { };
+		ctu13: ctu@7 { };
+	};
+
 	rcar_sound,src {
 		src0: src@0 {
 			interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt b/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
index c641550..962748a 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
@@ -6,6 +6,7 @@ Required properties:
 
 - compatible				: "renesas,rsrc-card,<board>"
 					  Examples with soctypes are:
+					    - "renesas,rsrc-card"
 					    - "renesas,rsrc-card,lager"
 					    - "renesas,rsrc-card,koelsch"
 Optional properties:
@@ -29,6 +30,12 @@ Optional subnode properties:
 - frame-inversion			: bool property. Add this if the
 					  dai-link uses frame clock inversion.
 - convert-rate				: platform specified sampling rate convert
+- audio-prefix				: see audio-routing
+- audio-routing				: A list of the connections between audio components.
+					  Each entry is a pair of strings, the first being the connection's sink,
+					  the second being the connection's source. Valid names for sources.
+					  use audio-prefix if some components is using same sink/sources naming.
+					  it can be used if compatible was "renesas,rsrc-card";
 
 Required CPU/CODEC subnodes properties:
 

Documentation/devicetree/bindings/sound/rockchip-max98090.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/rockchip-max98090.txt b/Documentation/devicetree/bindings/sound/rockchip-max98090.txt
new file mode 100644
index 0000000..a805aa9
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rockchip-max98090.txt
@@ -0,0 +1,19 @@
+ROCKCHIP with MAX98090 CODEC
+
+Required properties:
+- compatible: "rockchip,rockchip-audio-max98090"
+- rockchip,model: The user-visible name of this sound complex
+- rockchip,i2s-controller: The phandle of the Rockchip I2S controller that's
+  connected to the CODEC
+- rockchip,audio-codec: The phandle of the MAX98090 audio codec
+- rockchip,headset-codec: The phandle of Ext chip for jack detection
+
+Example:
+
+sound {
+	compatible = "rockchip,rockchip-audio-max98090";
+	rockchip,model = "ROCKCHIP-I2S";
+	rockchip,i2s-controller = <&i2s>;
+	rockchip,audio-codec = <&max98090>;
+	rockchip,headset-codec = <&headsetcodec>;
+};

Documentation/devicetree/bindings/sound/rockchip-rt5645.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/rockchip-rt5645.txt b/Documentation/devicetree/bindings/sound/rockchip-rt5645.txt
new file mode 100644
index 0000000..411a62b
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rockchip-rt5645.txt
@@ -0,0 +1,17 @@
+ROCKCHIP with RT5645/RT5650 CODECS
+
+Required properties:
+- compatible: "rockchip,rockchip-audio-rt5645"
+- rockchip,model: The user-visible name of this sound complex
+- rockchip,i2s-controller: The phandle of the Rockchip I2S controller that's
+  connected to the CODEC
+- rockchip,audio-codec: The phandle of the RT5645/RT5650 audio codec
+
+Example:
+
+sound {
+	compatible = "rockchip,rockchip-audio-rt5645";
+	rockchip,model = "ROCKCHIP-I2S";
+	rockchip,i2s-controller = <&i2s>;
+	rockchip,audio-codec = <&rt5645>;
+};

Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
new file mode 100644
index 0000000..028fa1c
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
@@ -0,0 +1,155 @@
+STMicroelectronics sti ASoC cards
+
+The sti ASoC Sound Card can be used, for all sti SoCs using internal sti-sas
+codec or external codecs.
+
+sti sound drivers allows to expose sti SoC audio interface through the
+generic ASoC simple card. For details about sound card declaration please refer to
+Documentation/devicetree/bindings/sound/simple-card.txt.
+
+1) sti-uniperiph-dai: audio dai device.
+---------------------------------------
+
+Required properties:
+  - compatible: "st,sti-uni-player" or "st,sti-uni-reader"
+
+  - st,syscfg: phandle to boot-device system configuration registers
+
+  - clock-names: name of the clocks listed in clocks property in the same order
+
+  - reg: CPU DAI IP Base address and size entries, listed  in same
+	 order than the CPU_DAI properties.
+
+  - reg-names: names of the mapped memory regions listed in regs property in
+	       the same order.
+
+  - interrupts: CPU_DAI interrupt line, listed in the same order than the
+		CPU_DAI properties.
+
+  - dma: CPU_DAI DMA controller phandle and DMA request line, listed in the same
+	 order than the CPU_DAI properties.
+
+  - dma-names: identifier string for each DMA request line in the dmas property.
+	"tx" for "st,sti-uni-player" compatibility
+	"rx" for "st,sti-uni-reader" compatibility
+
+  - version: IP version integrated in SOC.
+
+  - dai-name: DAI name that describes the IP.
+
+Required properties ("st,sti-uni-player" compatibility only):
+  - clocks: CPU_DAI IP clock source, listed in the same order than the
+	    CPU_DAI properties.
+
+  - uniperiph-id: internal SOC IP instance ID.
+
+  - IP mode: IP working mode depending on associated codec.
+	"HDMI" connected to HDMI codec IP and IEC HDMI formats.
+	"SPDIF"connected to SPDIF codec and support SPDIF formats.
+	"PCM"  PCM standard mode for I2S or TDM bus.
+
+Optional properties:
+  - pinctrl-0: defined for CPU_DAI@1 and CPU_DAI@4 to describe I2S PIOs for
+	       external codecs connection.
+
+  - pinctrl-names: should contain only one value - "default".
+
+Example:
+
+	sti_uni_player2: sti-uni-player@2 {
+		compatible = "st,sti-uni-player";
+		status = "okay";
+		#sound-dai-cells = <0>;
+		st,syscfg = <&syscfg_core>;
+		clocks = <&clk_s_d0_flexgen CLK_PCM_2>;
+		reg = <0x8D82000 0x158>;
+		interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
+		dmas = <&fdma0 4 0 1>;
+		dai-name = "Uni Player #1 (DAC)";
+		dma-names = "tx";
+		uniperiph-id = <2>;
+		version = <5>;
+		mode = "PCM";
+	};
+
+	sti_uni_player3: sti-uni-player@3 {
+		compatible = "st,sti-uni-player";
+		status = "okay";
+		#sound-dai-cells = <0>;
+		st,syscfg = <&syscfg_core>;
+		clocks = <&clk_s_d0_flexgen CLK_SPDIFF>;
+		reg = <0x8D85000 0x158>;
+		interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
+		dmas = <&fdma0 7 0 1>;
+		dma-names = "tx";
+		dai-name = "Uni Player #1 (PIO)";
+		uniperiph-id = <3>;
+		version = <5>;
+		mode = "SPDIF";
+	};
+
+	sti_uni_reader1: sti-uni-reader@1 {
+		compatible = "st,sti-uni-reader";
+		status = "disabled";
+		#sound-dai-cells = <0>;
+		st,syscfg = <&syscfg_core>;
+		reg = <0x8D84000 0x158>;
+		interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>;
+		dmas = <&fdma0 6 0 1>;
+		dma-names = "rx";
+		dai-name = "Uni Reader #1 (HDMI RX)";
+		version = <3>;
+	};
+
+2) sti-sas-codec: internal audio codec IPs driver
+-------------------------------------------------
+
+Required properties:
+  - compatible: "st,sti<chip>-sas-codec" .
+	Should be chip "st,stih416-sas-codec" or "st,stih407-sas-codec"
+
+  - st,syscfg: phandle to boot-device system configuration registers.
+
+  - pinctrl-0: SPDIF PIO description.
+
+  - pinctrl-names: should contain only one value - "default".
+
+Example:
+	sti_sas_codec: sti-sas-codec {
+		compatible = "st,stih407-sas-codec";
+		#sound-dai-cells = <1>;
+		st,reg_audio = <&syscfg_core>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_spdif_out >;
+	};
+
+Example of audio card declaration:
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "sti audio card";
+		status = "okay";
+
+		simple-audio-card,dai-link@0 {
+			/* DAC */
+			format = "i2s";
+			dai-tdm-slot-width = <32>;
+			cpu {
+				sound-dai = <&sti_uni_player2>;
+			};
+
+			codec {
+				sound-dai = <&sti_sasg_codec 1>;
+			};
+		};
+		simple-audio-card,dai-link@1 {
+			/* SPDIF */
+			format = "left_j";
+			cpu {
+				sound-dai = <&sti_uni_player3>;
+			};
+
+			codec {
+				sound-dai = <&sti_sasg_codec 0>;
+			};
+		};
+	};

Documentation/devicetree/bindings/vendor-prefixes.txt

View file

diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index 80a7209..2a85b15 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -111,6 +111,7 @@ ingenic	Ingenic Semiconductor
 innolux	Innolux Corporation
 intel	Intel Corporation
 intercontrol	Inter Control Group
+invensense	InvenSense Inc.
 isee	ISEE 2007 S.L.
 isil	Intersil
 jedec	JEDEC Solid State Technology Association
@@ -155,6 +156,7 @@ nvidia	NVIDIA
 nxp	NXP Semiconductors
 onnn	ON Semiconductor Corp.
 opencores	OpenCores.org
+option	Option NV
 ortustech	Ortus Technology Co., Ltd.
 ovti	OmniVision Technologies
 panasonic	Panasonic Corporation

drivers/base/regmap/internal.h

View file

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index b2b2849..873ddf9 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -136,7 +136,7 @@ struct regmap {
 	/* if set, the HW registers are known to match map->reg_defaults */
 	bool no_sync_defaults;
 
-	struct reg_default *patch;
+	struct reg_sequence *patch;
 	int patch_regs;
 
 	/* if set, converts bulk rw to single rw */

drivers/base/regmap/regmap.c

View file

diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 7111d04..0a849ee 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;
 
@@ -1624,6 +1624,18 @@ int regmap_fields_write(struct regmap_field *field, unsigned int id,
 }
 EXPORT_SYMBOL_GPL(regmap_fields_write);
 
+int regmap_fields_force_write(struct regmap_field *field, unsigned int id,
+			unsigned int val)
+{
+	if (id >= field->id_size)
+		return -EINVAL;
+
+	return regmap_write_bits(field->regmap,
+				  field->reg + (field->id_offset * id),
+				  field->mask, val << field->shift);
+}
+EXPORT_SYMBOL_GPL(regmap_fields_force_write);
+
 /**
  * regmap_fields_update_bits():	Perform a read/modify/write cycle
  *                              on the register field
@@ -1743,7 +1755,7 @@ EXPORT_SYMBOL_GPL(regmap_bulk_write);
  * relative. The page register has been written if that was neccessary.
  */
 static int _regmap_raw_multi_reg_write(struct regmap *map,
-				       const struct reg_default *regs,
+				       const struct reg_sequence *regs,
 				       size_t num_regs)
 {
 	int ret;
@@ -1800,12 +1812,12 @@ static unsigned int _regmap_register_page(struct regmap *map,
 }
 
 static int _regmap_range_multi_paged_reg_write(struct regmap *map,
-					       struct reg_default *regs,
+					       struct reg_sequence *regs,
 					       size_t num_regs)
 {
 	int ret;
 	int i, n;
-	struct reg_default *base;
+	struct reg_sequence *base;
 	unsigned int this_page = 0;
 	/*
 	 * the set of registers are not neccessarily in order, but
@@ -1843,7 +1855,7 @@ static int _regmap_range_multi_paged_reg_write(struct regmap *map,
 }
 
 static int _regmap_multi_reg_write(struct regmap *map,
-				   const struct reg_default *regs,
+				   const struct reg_sequence *regs,
 				   size_t num_regs)
 {
 	int i;
@@ -1895,8 +1907,8 @@ static int _regmap_multi_reg_write(struct regmap *map,
 		struct regmap_range_node *range;
 		range = _regmap_range_lookup(map, reg);
 		if (range) {
-			size_t len = sizeof(struct reg_default)*num_regs;
-			struct reg_default *base = kmemdup(regs, len,
+			size_t len = sizeof(struct reg_sequence)*num_regs;
+			struct reg_sequence *base = kmemdup(regs, len,
 							   GFP_KERNEL);
 			if (!base)
 				return -ENOMEM;
@@ -1929,7 +1941,7 @@ static int _regmap_multi_reg_write(struct regmap *map,
  * A value of zero will be returned on success, a negative errno will be
  * returned in error cases.
  */
-int regmap_multi_reg_write(struct regmap *map, const struct reg_default *regs,
+int regmap_multi_reg_write(struct regmap *map, const struct reg_sequence *regs,
 			   int num_regs)
 {
 	int ret;
@@ -1962,7 +1974,7 @@ EXPORT_SYMBOL_GPL(regmap_multi_reg_write);
  * be returned in error cases.
  */
 int regmap_multi_reg_write_bypassed(struct regmap *map,
-				    const struct reg_default *regs,
+				    const struct reg_sequence *regs,
 				    int num_regs)
 {
 	int ret;
@@ -2327,7 +2339,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 +2351,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 +2379,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;
@@ -2375,6 +2387,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
  *
@@ -2398,7 +2433,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 +2462,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 +2495,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;
 
@@ -2552,10 +2587,10 @@ EXPORT_SYMBOL_GPL(regmap_async_complete);
  * The caller must ensure that this function cannot be called
  * concurrently with either itself or regcache_sync().
  */
-int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
+int regmap_register_patch(struct regmap *map, const struct reg_sequence *regs,
 			  int num_regs)
 {
-	struct reg_default *p;
+	struct reg_sequence *p;
 	int ret;
 	bool bypass;
 
@@ -2564,7 +2599,7 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
 		return 0;
 
 	p = krealloc(map->patch,
-		     sizeof(struct reg_default) * (map->patch_regs + num_regs),
+		     sizeof(struct reg_sequence) * (map->patch_regs + num_regs),
 		     GFP_KERNEL);
 	if (p) {
 		memcpy(p + map->patch_regs, regs, num_regs * sizeof(*regs));

drivers/gpu/drm/i2c/adv7511.c

View file

diff --git a/drivers/gpu/drm/i2c/adv7511.c b/drivers/gpu/drm/i2c/adv7511.c
index 2aaa3c8..00416f2 100644
--- a/drivers/gpu/drm/i2c/adv7511.c
+++ b/drivers/gpu/drm/i2c/adv7511.c
@@ -54,7 +54,7 @@ static struct adv7511 *encoder_to_adv7511(struct drm_encoder *encoder)
 }

This diff is incomplete. Download the complete patch.