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

a016af2e · Linus Torvalds <[email protected]> · 2016-01-17 12:05:31 -08:00

Pull sound updates from Takashi Iwai:
 "We've had quite busy weeks in this cycle.  Looking at ALSA core, the
  significant changes are a few fixes wrt timer and sequencer ioctls
  that have been revealed by fuzzer recently.  Other than that, ASoC
  core got a few updates about DAI link handling, but these are rather
  straightforward refactoring.

  In drivers scene, ASoC received quite lots of new drivers in addition
  to bunch of updates for still ongoing Intel Skylake support and
  topology API.  HD-audio gained a new HDMI/DP hotplug notification via
  component.  FireWire got a pile of code refactoring/updates with
  SCS.1x driver integration.

  More highlights are shown below.

  [ NOTE: this contains also many commits for DRM.  This is due to the
    pull of drm stable branch into sound tree, as the base of i915 audio
    component work for HD-audio.  The highlights below don't contain
    these DRM changes, as these are supposed to be pulled via drm tree
    in anyway sooner or later.  ]

  Core:
   - Handful fixes to harden ALSA timer and sequencer ioctls against
     races reported by syzkaller fuzzer
   - Irq description string can be unique to each card; only for
     HD-audio for now

  ASoC:
   - Conversion of the array of DAI links to a list for supporting
     dynamically adding and removing DAI links
   - Topology API enhancements to make everything more component based
     and being able to specify PCM links via topology
   - Some more fixes for the topology code, though it is still not final
     and ready for enabling in production; we really need to get to the
     point where that can be done
   - A pile of changes for Intel SkyLake drivers which hopefully deliver
     some useful initial functionality for systems with this chipset,
     though there is more work still to come
   - Lots of new features and cleanups for the Renesas drivers
   - ANC support for WM5110
   - New drivers: Imagination Technologies IPs, Atmel class D speaker,
     Cirrus CS47L24 and WM1831, Dialog DA7128, Realtek RT5659 and
     RT56156, Rockchip RK3036, TI PC3168A, and AMD ACP
   - Rename PCM1792a driver to be generic pcm179x

  HD-Audio:
   - Use audio component for i915 HDMI/DP hotplug handling
   - On-demand binding with i915 driver
   - bdl_pos_adj parameter adjustment for Baytrail controllers
   - Enable power_save_node for CX20722; this shouldn't lead to
     regression, hopefully
   - Kabylake HDMI/DP codec support
   - Quirks for Lenovo E50-80, Dell Latitude E-series, and other Dell
     machines
   - A few code refactoring

  FireWire:
   - Lots of code cleanup and refactoring
   - Integrate the support of SCS.1x devices into snd-oxfw driver;
     snd-scs1x driver is obsoleted

  USB-audio:
   - Fix possible NULL dereference at disconnection
   - A regression fix for Native Instruments devices

  Misc:
   - A few code cleanups of fm801 driver"

* tag 'sound-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (722 commits)
  ALSA: timer: Code cleanup
  ALSA: timer: Harden slave timer list handling
  ALSA: hda - Add fixup for Dell Latitidue E6540
  ALSA: timer: Fix race among timer ioctls
  ALSA: hda - add codec support for Kabylake display audio codec
  ALSA: timer: Fix double unlink of active_list
  ALSA: usb-audio: Fix mixer ctl regression of Native Instrument devices
  ALSA: hda - fix the headset mic detection problem for a Dell laptop
  ALSA: hda - Fix white noise on Dell Latitude E5550
  ALSA: hda_intel: add card number to irq description
  ALSA: seq: Fix race at timer setup and close
  ALSA: seq: Fix missing NULL check at remove_events ioctl
  ALSA: usb-audio: Avoid calling usb_autopm_put_interface() at disconnect
  ASoC: hdac_hdmi: remove unused hdac_hdmi_query_pin_connlist
  ASoC: AMD: Add missing include file
  ALSA: hda - Fixup inverted internal mic for Lenovo E50-80
  ALSA: usb: Add native DSD support for Oppo HA-1
  ASoC: Make aux_dev more like a generic component
  ASoC: bcm2835: cleanup includes by ordering them alphabetically
  ASoC: AMD: Manage ACP 2.x SRAM banks power
  ...

Commit: a016af2e70bfca23f2f5de7d8708157b86ea374d
Parents: e535d74b · c3b16813

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

Changes

429 files changed · +45003 −10230

File	Status	Add	Del	Content
Documentation/DocBook/gpu.tmpl	modified	+20	−40	View file
Documentation/devicetree/bindings/sound/ak4613.txt	modified	+10	−0	View file
Documentation/devicetree/bindings/sound/atmel-pdmic.txt	added	+55	−0	View file
Documentation/devicetree/bindings/sound/da7218.txt	added	+104	−0	View file
Documentation/devicetree/bindings/sound/da7219.txt	modified	+5	−3	View file
Documentation/devicetree/bindings/sound/fsl,asrc.txt	modified	+5	−0	View file
Documentation/devicetree/bindings/sound/fsl,esai.txt	modified	+5	−0	View file
Documentation/devicetree/bindings/sound/fsl,spdif.txt	modified	+5	−0	View file
Documentation/devicetree/bindings/sound/img,i2s-in.txt	added	+47	−0	View file
Documentation/devicetree/bindings/sound/img,i2s-out.txt	added	+51	−0	View file
Documentation/devicetree/bindings/sound/img,parallel-out.txt	added	+44	−0	View file
Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt	added	+18	−0	View file
Documentation/devicetree/bindings/sound/img,spdif-in.txt	added	+41	−0	View file
Documentation/devicetree/bindings/sound/img,spdif-out.txt	added	+44	−0	View file
Documentation/devicetree/bindings/sound/inno-rk3036.txt	added	+20	−0	View file
Documentation/devicetree/bindings/sound/pcm1792a.txt → Documentation/devicetree/bindings/sound/pcm179x.txt	renamed	+1	−1	View file
Documentation/devicetree/bindings/sound/renesas,rsnd.txt	modified	+82	−0	View file
Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt	modified	+2	−2	View file
Documentation/devicetree/bindings/sound/rockchip-i2s.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/sound/rt5616.txt	added	+26	−0	View file
Documentation/devicetree/bindings/sound/rt5651.txt	added	+41	−0	View file
Documentation/devicetree/bindings/sound/rt5659.txt	added	+75	−0	View file
Documentation/devicetree/bindings/sound/rt5677.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/sound/sun4i-codec.txt	modified	+3	−0	View file
Documentation/devicetree/bindings/sound/ti,pcm3168a.txt	added	+48	−0	View file
Documentation/devicetree/bindings/sound/wlf,wm8974.txt	added	+15	−0	View file
Documentation/sound/alsa/img,spdif-in.txt	added	+49	−0	View file
arch/arm/mach-s3c64xx/dev-audio.c	modified	+29	−18	View file
arch/arm/mach-s3c64xx/include/mach/dma.h	modified	+26	−26	View file
arch/arm/plat-samsung/devs.c	modified	+20	−3	View file
arch/x86/include/asm/platform_sst_audio.h	modified	+1	−0	View file
arch/x86/kernel/early-quirks.c	modified	+1	−0	View file
drivers/dma/Kconfig	modified	+1	−1	View file
drivers/gpu/drm/amd/amdgpu/amdgpu_display.c	modified	+2	−2	View file
drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c	modified	+0	−1	View file
drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h	modified	+1	−1	View file
drivers/gpu/drm/armada/armada_fb.c	modified	+2	−2	View file
drivers/gpu/drm/armada/armada_fb.h	modified	+1	−1	View file
drivers/gpu/drm/ast/ast_drv.h	modified	+1	−2	View file
drivers/gpu/drm/ast/ast_fb.c	modified	+1	−1	View file
drivers/gpu/drm/ast/ast_main.c	modified	+2	−2	View file
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c	modified	+1	−1	View file
drivers/gpu/drm/bochs/bochs.h	modified	+1	−1	View file
drivers/gpu/drm/bochs/bochs_fbdev.c	modified	+1	−1	View file
drivers/gpu/drm/bochs/bochs_mm.c	modified	+2	−2	View file
drivers/gpu/drm/cirrus/cirrus_drv.h	modified	+1	−2	View file
drivers/gpu/drm/cirrus/cirrus_fbdev.c	modified	+1	−1	View file
drivers/gpu/drm/cirrus/cirrus_main.c	modified	+2	−2	View file
drivers/gpu/drm/drm_atomic.c	modified	+5	−13	View file
drivers/gpu/drm/drm_atomic_helper.c	modified	+241	−11	View file
drivers/gpu/drm/drm_crtc.c	modified	+2	−2	View file
drivers/gpu/drm/drm_crtc_helper.c	modified	+7	−1	View file
drivers/gpu/drm/drm_edid.c	modified	+60	−2	View file
drivers/gpu/drm/drm_fb_cma_helper.c	modified	+2	−2	View file
drivers/gpu/drm/drm_fops.c	modified	+37	−21	View file
drivers/gpu/drm/drm_gem.c	modified	+32	−3	View file
drivers/gpu/drm/drm_modes.c	modified	+29	−6	View file
drivers/gpu/drm/drm_modeset_lock.c	modified	+60	−29	View file
drivers/gpu/drm/drm_plane_helper.c	modified	+4	−0	View file
drivers/gpu/drm/drm_probe_helper.c	modified	+24	−23	View file
drivers/gpu/drm/drm_rect.c	modified	+4	−3	View file
drivers/gpu/drm/drm_sysfs.c	modified	+25	−29	View file
drivers/gpu/drm/exynos/exynos_drm_fb.c	modified	+2	−2	View file
drivers/gpu/drm/exynos/exynos_drm_fb.h	modified	+1	−1	View file
drivers/gpu/drm/gma500/framebuffer.c	modified	+5	−13	View file
drivers/gpu/drm/gma500/gem.c	modified	+6	−13	View file
drivers/gpu/drm/gma500/gma_display.c	modified	+3	−10	View file
drivers/gpu/drm/gma500/gtt.c	modified	+1	−0	View file
drivers/gpu/drm/gma500/psb_drv.h	modified	+2	−0	View file
drivers/gpu/drm/i915/Kconfig	modified	+1	−0	View file
drivers/gpu/drm/i915/Makefile	modified	+1	−0	View file
drivers/gpu/drm/i915/dvo.h	modified	+2	−1	View file
drivers/gpu/drm/i915/i915_cmd_parser.c	modified	+21	−16	View file
drivers/gpu/drm/i915/i915_debugfs.c	modified	+201	−43	View file
drivers/gpu/drm/i915/i915_dma.c	modified	+11	−15	View file
drivers/gpu/drm/i915/i915_drv.c	modified	+82	−88	View file
drivers/gpu/drm/i915/i915_drv.h	modified	+108	−80	View file
drivers/gpu/drm/i915/i915_gem.c	modified	+37	−36	View file
drivers/gpu/drm/i915/i915_gem_context.c	modified	+10	−2	View file
drivers/gpu/drm/i915/i915_gem_execbuffer.c	modified	+2	−2	View file
drivers/gpu/drm/i915/i915_gem_fence.c	modified	+1	−1	View file
drivers/gpu/drm/i915/i915_gem_gtt.c	modified	+42	−16	View file
drivers/gpu/drm/i915/i915_gem_gtt.h	modified	+2	−5	View file
drivers/gpu/drm/i915/i915_gem_stolen.c	modified	+2	−1	View file
drivers/gpu/drm/i915/i915_gem_tiling.c	modified	+4	−0	View file
drivers/gpu/drm/i915/i915_gpu_error.c	modified	+35	−5	View file
drivers/gpu/drm/i915/i915_guc_reg.h	modified	+27	−26	View file
drivers/gpu/drm/i915/i915_guc_submission.c	modified	+8	−8	View file
drivers/gpu/drm/i915/i915_irq.c	modified	+59	−58	View file
drivers/gpu/drm/i915/i915_params.c	modified	+8	−2	View file
drivers/gpu/drm/i915/i915_reg.h	modified	+1370	−1372	View file
drivers/gpu/drm/i915/i915_sysfs.c	modified	+2	−1	View file
drivers/gpu/drm/i915/i915_trace.h	modified	+2	−2	View file
drivers/gpu/drm/i915/i915_vgpu.c	modified	+3	−3	View file
drivers/gpu/drm/i915/i915_vgpu.h	modified	+5	−9	View file
drivers/gpu/drm/i915/intel_atomic.c	modified	+1	−2	View file
drivers/gpu/drm/i915/intel_atomic_plane.c	modified	+2	−0	View file
drivers/gpu/drm/i915/intel_audio.c	modified	+65	−37	View file
drivers/gpu/drm/i915/intel_crt.c	modified	+5	−9	View file
drivers/gpu/drm/i915/intel_csr.c	modified	+123	−161	View file
drivers/gpu/drm/i915/intel_ddi.c	modified	+83	−59	View file
drivers/gpu/drm/i915/intel_display.c	modified	+511	−287	View file
drivers/gpu/drm/i915/intel_dp.c	modified	+431	−609	View file
drivers/gpu/drm/i915/intel_dp_link_training.c	added	+323	−0	View file
drivers/gpu/drm/i915/intel_dp_mst.c	modified	+9	−9	View file
drivers/gpu/drm/i915/intel_drv.h	modified	+98	−61	View file
drivers/gpu/drm/i915/intel_dsi.c	modified	+23	−22	View file
drivers/gpu/drm/i915/intel_dsi.h	modified	+1	−1	View file
drivers/gpu/drm/i915/intel_dvo.c	modified	+11	−16	View file
drivers/gpu/drm/i915/intel_fbc.c	modified	+73	−123	View file
drivers/gpu/drm/i915/intel_fbdev.c	modified	+32	−18	View file
drivers/gpu/drm/i915/intel_fifo_underrun.c	modified	+99	−28	View file
drivers/gpu/drm/i915/intel_guc.h	modified	+7	−1	View file
drivers/gpu/drm/i915/intel_guc_fwif.h	modified	+72	−0	View file
drivers/gpu/drm/i915/intel_guc_loader.c	modified	+67	−38	View file
drivers/gpu/drm/i915/intel_hdmi.c	modified	+47	−30	View file
drivers/gpu/drm/i915/intel_i2c.c	modified	+16	−15	View file
drivers/gpu/drm/i915/intel_lrc.c	modified	+67	−81	View file
drivers/gpu/drm/i915/intel_lrc.h	modified	+12	−7	View file
drivers/gpu/drm/i915/intel_lvds.c	modified	+5	−6	View file
drivers/gpu/drm/i915/intel_mocs.c	modified	+35	−26	View file
drivers/gpu/drm/i915/intel_opregion.c	modified	+1	−1	View file
drivers/gpu/drm/i915/intel_overlay.c	modified	+1	−1	View file
drivers/gpu/drm/i915/intel_pm.c	modified	+256	−374	View file
drivers/gpu/drm/i915/intel_psr.c	modified	+52	−25	View file
drivers/gpu/drm/i915/intel_ringbuffer.c	modified	+100	−56	View file
drivers/gpu/drm/i915/intel_ringbuffer.h	modified	+8	−1	View file
drivers/gpu/drm/i915/intel_runtime_pm.c	modified	+283	−209	View file
drivers/gpu/drm/i915/intel_sdvo.c	modified	+41	−20	View file
drivers/gpu/drm/i915/intel_sprite.c	modified	+5	−23	View file
drivers/gpu/drm/i915/intel_uncore.c	modified	+147	−114	View file
drivers/gpu/drm/imx/Kconfig	modified	+0	−9	View file
drivers/gpu/drm/imx/imx-drm-core.c	modified	+3	−9	View file
drivers/gpu/drm/mgag200/mgag200_drv.h	modified	+1	−1	View file
drivers/gpu/drm/mgag200/mgag200_fb.c	modified	+1	−1	View file
drivers/gpu/drm/mgag200/mgag200_main.c	modified	+2	−2	View file
drivers/gpu/drm/msm/msm_drv.h	modified	+2	−2	View file
drivers/gpu/drm/msm/msm_fb.c	modified	+2	−2	View file
drivers/gpu/drm/nouveau/nouveau_display.c	modified	+2	−2	View file
drivers/gpu/drm/nouveau/nouveau_display.h	modified	+1	−1	View file
drivers/gpu/drm/nouveau/nouveau_fbcon.h	modified	+0	−1	View file
drivers/gpu/drm/omapdrm/omap_drv.h	modified	+3	−3	View file
drivers/gpu/drm/omapdrm/omap_fb.c	modified	+2	−2	View file
drivers/gpu/drm/qxl/qxl_display.c	modified	+2	−2	View file
drivers/gpu/drm/qxl/qxl_drv.h	modified	+1	−1	View file
drivers/gpu/drm/qxl/qxl_fb.c	modified	+1	−2	View file
drivers/gpu/drm/radeon/radeon_display.c	modified	+2	−2	View file
drivers/gpu/drm/radeon/radeon_fb.c	modified	+0	−1	View file
drivers/gpu/drm/radeon/radeon_mode.h	modified	+1	−1	View file
drivers/gpu/drm/rcar-du/rcar_du_kms.c	modified	+1	−1	View file
drivers/gpu/drm/rockchip/rockchip_drm_fb.c	modified	+3	−3	View file
drivers/gpu/drm/rockchip/rockchip_drm_fb.h	modified	+1	−1	View file
drivers/gpu/drm/shmobile/shmob_drm_kms.c	modified	+1	−1	View file
drivers/gpu/drm/tegra/Kconfig	modified	+0	−12	View file
drivers/gpu/drm/tegra/drm.c	modified	+2	−2	View file
drivers/gpu/drm/tegra/drm.h	modified	+4	−4	View file
drivers/gpu/drm/tegra/fb.c	modified	+8	−8	View file
drivers/gpu/drm/tilcdc/tilcdc_drv.c	modified	+1	−1	View file
drivers/gpu/drm/udl/udl_drv.h	modified	+1	−1	View file
drivers/gpu/drm/udl/udl_fb.c	modified	+2	−3	View file
drivers/gpu/drm/virtio/virtgpu_display.c	modified	+2	−2	View file
drivers/gpu/drm/virtio/virtgpu_drv.h	modified	+1	−1	View file
drivers/gpu/drm/virtio/virtgpu_fb.c	modified	+0	−1	View file
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c	modified	+1	−1	View file
drivers/pci/quirks.c	modified	+3	−1	View file
include/drm/drmP.h	modified	+5	−0	View file
include/drm/drm_atomic.h	modified	+3	−3	View file
include/drm/drm_atomic_helper.h	modified	+8	−0	View file
include/drm/drm_crtc.h	modified	+8	−4	View file
include/drm/drm_crtc_helper.h	modified	+1	−1	View file
include/drm/drm_dp_helper.h	modified	+36	−0	View file
include/drm/drm_fb_cma_helper.h	modified	+1	−1	View file
include/drm/drm_gem.h	modified	+92	−14	View file
include/drm/drm_mm.h	modified	+10	−16	View file
include/drm/drm_modes.h	modified	+2	−0	View file
include/drm/drm_modeset_lock.h	modified	+2	−2	View file
include/drm/drm_rect.h	modified	+2	−1	View file
include/drm/i915_component.h	modified	+65	−18	View file
include/drm/i915_pciids.h	modified	+36	−0	View file
include/linux/platform_data/asoc-s3c.h	modified	+8	−0	View file
include/sound/ac97_codec.h	modified	+3	−0	View file
include/sound/compress_driver.h	modified	+6	−1	View file
include/sound/core.h	modified	+1	−0	View file
include/sound/da7218.h	added	+109	−0	View file
include/sound/da7219.h	modified	+2	−12	View file
include/sound/designware_i2s.h	modified	+6	−0	View file
include/sound/hda_i915.h	modified	+14	−0	View file
include/sound/hda_register.h	modified	+9	−0	View file
include/sound/hdaudio_ext.h	modified	+21	−0	View file
include/sound/i2c.h	modified	+1	−1	View file
include/sound/rawmidi.h	modified	+1	−1	View file
include/sound/rt5659.h	added	+49	−0	View file
include/sound/soc-dai.h	modified	+1	−0	View file
include/sound/soc-dapm.h	modified	+4	−0	View file
include/sound/soc-topology.h	modified	+4	−2	View file
include/sound/soc.h	modified	+46	−7	View file
include/uapi/drm/i915_drm.h	modified	+9	−2	View file
include/uapi/sound/asoc.h	modified	+1	−1	View file
include/uapi/sound/compress_params.h	modified	+3	−2	View file
kernel/async.c	modified	+1	−0	View file
sound/core/compress_offload.c	modified	+97	−2	View file
sound/core/init.c	modified	+3	−0	View file
sound/core/oss/mixer_oss.c	modified	+7	−1	View file
sound/core/oss/pcm_oss.c	modified	+7	−3	View file
sound/core/pcm_native.c	modified	+13	−13	View file
sound/core/seq/oss/seq_oss.c	modified	+6	−1	View file
sound/core/seq/seq_clientmgr.c	modified	+1	−1	View file
sound/core/seq/seq_queue.c	modified	+2	−0	View file
sound/core/seq/seq_virmidi.c	modified	+1	−1	View file
sound/core/timer.c	modified	+43	−33	View file
sound/drivers/dummy.c	modified	+2	−2	View file
sound/firewire/Kconfig	modified	+1	−11	View file
sound/firewire/Makefile	modified	+0	−2	View file
sound/firewire/dice/dice-transaction.c	modified	+79	−44	View file
sound/firewire/dice/dice.c	modified	+120	−107	View file
sound/firewire/dice/dice.h	modified	+3	−0	View file
sound/firewire/fireworks/fireworks.h	modified	+2	−2	View file
sound/firewire/fireworks/fireworks_midi.c	modified	+12	−4	View file
sound/firewire/fireworks/fireworks_pcm.c	modified	+20	−8	View file
sound/firewire/fireworks/fireworks_stream.c	modified	+12	−20	View file
sound/firewire/oxfw/Makefile	modified	+2	−2	View file
sound/firewire/oxfw/oxfw-scs1x.c	added	+406	−0	View file
sound/firewire/oxfw/oxfw-control.c → sound/firewire/oxfw/oxfw-spkr.c	renamed	+89	−53	View file
sound/firewire/oxfw/oxfw.c	modified	+78	−32	View file
sound/firewire/oxfw/oxfw.h	modified	+7	−16	View file
sound/firewire/scs1x.c	deleted	+0	−530	View before deletion
sound/hda/ext/hdac_ext_controller.c	modified	+28	−1	View file
sound/hda/ext/hdac_ext_stream.c	modified	+72	−0	View file
sound/hda/hdac_i915.c	modified	+66	−0	View file
sound/i2c/i2c.c	modified	+1	−1	View file
sound/oss/Kconfig	modified	+1	−1	View file
sound/pci/atiixp.c	modified	+3	−3	View file
sound/pci/atiixp_modem.c	modified	+2	−2	View file
sound/pci/azt3328.c	modified	+0	−2	View file
sound/pci/cs5535audio/cs5535audio_pcm.c	modified	+2	−2	View file
sound/pci/fm801.c	modified	+95	−50	View file
sound/pci/hda/hda_controller.c	modified	+2	−8	View file
sound/pci/hda/hda_controller.h	modified	+9	−5	View file
sound/pci/hda/hda_eld.c	modified	+1	−0	View file
sound/pci/hda/hda_generic.c	modified	+70	−38	View file
sound/pci/hda/hda_generic.h	modified	+0	−5	View file
sound/pci/hda/hda_intel.c	modified	+49	−29	View file
sound/pci/hda/hda_tegra.c	modified	+3	−2	View file
sound/pci/hda/patch_conexant.c	modified	+3	−0	View file
sound/pci/hda/patch_hdmi.c	modified	+168	−77	View file
sound/pci/hda/patch_realtek.c	modified	+14	−0	View file
sound/pci/ice1712/delta.c	modified	+1	−1	View file
sound/soc/Kconfig	modified	+2	−0	View file
sound/soc/Makefile	modified	+2	−0	View file
sound/soc/amd/Kconfig	added	+4	−0	View file
sound/soc/amd/Makefile	added	+3	−0	View file
sound/soc/amd/acp-pcm-dma.c	added	+1043	−0	View file
sound/soc/amd/acp.h	added	+118	−0	View file
sound/soc/amd/include/acp_2_2_d.h	added	+609	−0	View file
sound/soc/amd/include/acp_2_2_enum.h	added	+1068	−0	View file
sound/soc/amd/include/acp_2_2_sh_mask.h	added	+2292	−0	View file
sound/soc/atmel/Kconfig	modified	+9	−0	View file
sound/soc/atmel/Makefile	modified	+2	−0	View file
sound/soc/atmel/atmel-classd.c	modified	+18	−8	View file
sound/soc/atmel/atmel-pdmic.c	added	+738	−0	View file
sound/soc/atmel/atmel-pdmic.h	added	+80	−0	View file
sound/soc/atmel/atmel_wm8904.c	modified	+1	−0	View file
sound/soc/bcm/bcm2835-i2s.c	modified	+6	−6	View file
sound/soc/codecs/Kconfig	modified	+58	−4	View file
sound/soc/codecs/Makefile	modified	+20	−2	View file
sound/soc/codecs/ak4613.c	modified	+83	−35	View file
sound/soc/codecs/arizona.c	modified	+134	−12	View file
sound/soc/codecs/arizona.h	modified	+12	−5	View file
sound/soc/codecs/cs47l24.c	added	+1148	−0	View file
sound/soc/codecs/cs47l24.h	added	+23	−0	View file
sound/soc/codecs/da7218.c	added	+3341	−0	View file
sound/soc/codecs/da7218.h	added	+1414	−0	View file
sound/soc/codecs/da7219.c	modified	+88	−75	View file
sound/soc/codecs/da7219.h	modified	+0	−9	View file
sound/soc/codecs/hdac_hdmi.c	added	+697	−0	View file
sound/soc/codecs/inno_rk3036.c	added	+490	−0	View file
sound/soc/codecs/inno_rk3036.h	added	+123	−0	View file
sound/soc/codecs/max98357a.c	modified	+10	−0	View file
sound/soc/codecs/pcm1792a.c → sound/soc/codecs/pcm179x.c	renamed	+79	−79	View file
sound/soc/codecs/pcm1792a.h → sound/soc/codecs/pcm179x.h	renamed	+3	−3	View file
sound/soc/codecs/pcm3168a-i2c.c	added	+66	−0	View file
sound/soc/codecs/pcm3168a-spi.c	added	+65	−0	View file
sound/soc/codecs/pcm3168a.c	added	+767	−0	View file
sound/soc/codecs/pcm3168a.h	added	+100	−0	View file
sound/soc/codecs/rt286.c	modified	+6	−0	View file
sound/soc/codecs/rt298.c	modified	+0	−2	View file
sound/soc/codecs/rt5616.c	added	+1381	−0	View file
sound/soc/codecs/rt5616.h	added	+1819	−0	View file
sound/soc/codecs/rt5640.c	modified	+103	−0	View file
sound/soc/codecs/rt5640.h	modified	+17	−0	View file
sound/soc/codecs/rt5645.c	modified	+245	−77	View file
sound/soc/codecs/rt5651.c	modified	+31	−0	View file
sound/soc/codecs/rt5659.c	added	+4223	−0	View file
sound/soc/codecs/rt5659.h	added	+1819	−0	View file
sound/soc/codecs/rt5677.c	modified	+7	−6	View file
sound/soc/codecs/ssm2518.c	modified	+1	−1	View file
sound/soc/codecs/twl6040.c	modified	+1	−2	View file
sound/soc/codecs/wm5110.c	modified	+240	−12	View file
sound/soc/codecs/wm8903.c	modified	+1	−1	View file
sound/soc/codecs/wm8904.c	modified	+1	−1	View file
sound/soc/codecs/wm8960.c	modified	+18	−6	View file
sound/soc/codecs/wm8962.c	modified	+1	−2	View file
sound/soc/codecs/wm8974.c	modified	+7	−0	View file
sound/soc/codecs/wm8998.c	modified	+23	−23	View file
sound/soc/codecs/wm9713.c	modified	+150	−146	View file
sound/soc/codecs/wm_adsp.c	modified	+1008	−87	View file
sound/soc/codecs/wm_adsp.h	modified	+25	−3	View file
sound/soc/dwc/designware_i2s.c	modified	+86	−31	View file
sound/soc/fsl/fsl-asoc-card.c	modified	+17	−4	View file
sound/soc/fsl/fsl_asrc.c	modified	+45	−17	View file
sound/soc/fsl/fsl_asrc.h	modified	+9	−0	View file
sound/soc/fsl/fsl_esai.c	modified	+40	−23	View file
sound/soc/fsl/fsl_sai.c	modified	+87	−11	View file
sound/soc/fsl/fsl_sai.h	modified	+3	−0	View file
sound/soc/fsl/fsl_spdif.c	modified	+27	−8	View file
sound/soc/fsl/fsl_ssi.c	modified	+35	−14	View file
sound/soc/fsl/imx-pcm-dma.c	modified	+2	−0	View file
sound/soc/fsl/imx-pcm-fiq.c	modified	+2	−2	View file
sound/soc/fsl/imx-wm8962.c	modified	+8	−2	View file
sound/soc/fsl/mpc8610_hpcd.c	modified	+1	−2	View file
sound/soc/fsl/p1022_ds.c	modified	+1	−2	View file
sound/soc/fsl/p1022_rdk.c	modified	+1	−2	View file
sound/soc/generic/simple-card.c	modified	+5	−7	View file
sound/soc/img/Kconfig	added	+52	−0	View file
sound/soc/img/Makefile	added	+7	−0	View file
sound/soc/img/img-i2s-in.c	added	+516	−0	View file
sound/soc/img/img-i2s-out.c	added	+565	−0	View file
sound/soc/img/img-parallel-out.c	added	+327	−0	View file
sound/soc/img/img-spdif-in.c	added	+806	−0	View file
sound/soc/img/img-spdif-out.c	added	+441	−0	View file
sound/soc/img/pistachio-internal-dac.c	added	+287	−0	View file
sound/soc/intel/Kconfig	modified	+50	−8	View file
sound/soc/intel/atom/sst-atom-controls.c	modified	+3	−2	View file
sound/soc/intel/atom/sst-atom-controls.h	modified	+1	−0	View file
sound/soc/intel/atom/sst-mfld-platform-pcm.c	modified	+20	−12	View file
sound/soc/intel/atom/sst/sst_acpi.c	modified	+33	−49	View file
sound/soc/intel/atom/sst/sst_stream.c	modified	+1	−1	View file
sound/soc/intel/baytrail/sst-baytrail-pcm.c	modified	+2	−0	View file
sound/soc/intel/boards/Makefile	modified	+6	−0	View file
sound/soc/intel/boards/bytcr_rt5640.c	modified	+213	−53	View file
sound/soc/intel/boards/bytcr_rt5651.c	added	+332	−0	View file
sound/soc/intel/boards/cht_bsw_max98090_ti.c	modified	+14	−5	View file
sound/soc/intel/boards/cht_bsw_rt5645.c	modified	+14	−5	View file
sound/soc/intel/boards/cht_bsw_rt5672.c	modified	+14	−5	View file
sound/soc/intel/boards/skl_nau88l25_max98357a.c	added	+485	−0	View file
sound/soc/intel/boards/skl_nau88l25_ssm4567.c	added	+536	−0	View file
sound/soc/intel/boards/skl_rt286.c	modified	+124	−4	View file
sound/soc/intel/common/Makefile	modified	+7	−5	View file
sound/soc/intel/common/sst-acpi.c	modified	+5	−36	View file
sound/soc/intel/common/sst-acpi.h	added	+33	−0	View file
sound/soc/intel/common/sst-dsp-priv.h	modified	+5	−3	View file
sound/soc/intel/common/sst-dsp.c	modified	+1	−1	View file
sound/soc/intel/common/sst-dsp.h	modified	+1	−1	View file
sound/soc/intel/common/sst-firmware.c	modified	+17	−3	View file
sound/soc/intel/common/sst-match-acpi.c	added	+43	−0	View file
sound/soc/intel/haswell/sst-haswell-dsp.c	modified	+1	−1	View file
sound/soc/intel/haswell/sst-haswell-ipc.c	modified	+13	−18	View file
sound/soc/intel/skylake/skl-messages.c	modified	+153	−127	View file
sound/soc/intel/skylake/skl-nhlt.c	modified	+13	−6	View file
sound/soc/intel/skylake/skl-pcm.c	modified	+200	−110	View file
sound/soc/intel/skylake/skl-sst-cldma.c	modified	+69	−28	View file
sound/soc/intel/skylake/skl-sst-dsp.h	modified	+18	−3	View file
sound/soc/intel/skylake/skl-sst-ipc.c	modified	+122	−1	View file
sound/soc/intel/skylake/skl-sst-ipc.h	modified	+14	−0	View file
sound/soc/intel/skylake/skl-sst.c	modified	+197	−20	View file
sound/soc/intel/skylake/skl-topology.c	modified	+463	−195	View file
sound/soc/intel/skylake/skl-topology.h	modified	+47	−16	View file
sound/soc/intel/skylake/skl-tplg-interface.h	modified	+82	−23	View file
sound/soc/intel/skylake/skl.c	modified	+172	−41	View file
sound/soc/intel/skylake/skl.h	modified	+7	−1	View file
sound/soc/mediatek/mtk-afe-common.h	modified	+0	−1	View file
sound/soc/mediatek/mtk-afe-pcm.c	modified	+23	−36	View file
sound/soc/omap/omap-hdmi-audio.c	modified	+2	−0	View file
sound/soc/pxa/brownstone.c	modified	+1	−2	View file
sound/soc/pxa/mioa701_wm9713.c	modified	+5	−1	View file
sound/soc/qcom/lpass-cpu.c	modified	+1	−0	View file
sound/soc/rockchip/rockchip_i2s.c	modified	+77	−62	View file
sound/soc/rockchip/rockchip_max98090.c	modified	+6	−0	View file
sound/soc/rockchip/rockchip_rt5645.c	modified	+6	−0	View file
sound/soc/samsung/Kconfig	modified	+0	−2	View file
sound/soc/samsung/ac97.c	modified	+6	−23	View file
sound/soc/samsung/bells.c	modified	+30	−10	View file
sound/soc/samsung/dma.h	modified	+4	−2	View file
sound/soc/samsung/dmaengine.c	modified	+7	−13	View file
sound/soc/samsung/i2s.c	modified	+10	−21	View file
sound/soc/samsung/littlemill.c	modified	+26	−6	View file
sound/soc/samsung/odroidx2_max98090.c	modified	+7	−2	View file
sound/soc/samsung/pcm.c	modified	+9	−16	View file
sound/soc/samsung/s3c2412-i2s.c	modified	+12	−4	View file
sound/soc/samsung/s3c24xx-i2s.c	modified	+12	−4	View file
sound/soc/samsung/snow.c	modified	+7	−2	View file
sound/soc/samsung/spdif.c	modified	+8	−9	View file
sound/soc/samsung/speyside.c	modified	+10	−2	View file
sound/soc/samsung/tobermory.c	modified	+17	−4	View file
sound/soc/sh/Kconfig	modified	+0	−1	View file
sound/soc/sh/fsi.c	modified	+7	−4	View file
sound/soc/sh/rcar/Makefile	modified	+1	−1	View file
sound/soc/sh/rcar/adg.c	modified	+31	−87	View file
sound/soc/sh/rcar/cmd.c	added	+171	−0	View file
sound/soc/sh/rcar/core.c	modified	+216	−370	View file
sound/soc/sh/rcar/ctu.c	modified	+42	−57	View file
sound/soc/sh/rcar/dma.c	modified	+149	−96	View file
sound/soc/sh/rcar/dvc.c	modified	+145	−128	View file
sound/soc/sh/rcar/gen.c	modified	+52	−81	View file
sound/soc/sh/rcar/mix.c	modified	+78	−80	View file
sound/soc/sh/rcar/rcar_snd.h	deleted	+0	−117	View before deletion
sound/soc/sh/rcar/rsnd.h	modified	+167	−168	View file
sound/soc/sh/rcar/rsrc-card.c	modified	+89	−40	View file
sound/soc/sh/rcar/src.c	modified	+223	−675	View file
sound/soc/sh/rcar/ssi.c	modified	+442	−313	View file
sound/soc/sh/rcar/ssiu.c	added	+225	−0	View file
sound/soc/soc-ac97.c	modified	+125	−0	View file
sound/soc/soc-compress.c	modified	+27	−4	View file
sound/soc/soc-core.c	modified	+559	−307	View file
sound/soc/soc-dapm.c	modified	+8	−6	View file
sound/soc/soc-ops.c	modified	+2	−2	View file
sound/soc/soc-pcm.c	modified	+89	−21	View file
sound/soc/sti/uniperif_player.c	modified	+1	−2	View file
sound/soc/sunxi/sun4i-codec.c	modified	+230	−49	View file
sound/soc/tegra/tegra_alc5632.c	modified	+8	−4	View file
sound/soc/tegra/tegra_wm8903.c	modified	+2	−1	View file
sound/synth/emux/emux_nrpn.c	modified	+5	−4	View file
sound/usb/card.c	modified	+2	−0	View file
sound/usb/midi.c	modified	+14	−13	View file
sound/usb/misc/ua101.c	modified	+2	−2	View file
sound/usb/mixer_quirks.c	modified	+1	−1	View file
sound/usb/quirks.c	modified	+1	−0	View file
sound/usb/stream.c	modified	+2	−4	View file
sound/usb/usx2y/usbusx2yaudio.c	modified	+1	−1	View file

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

Documentation/DocBook/gpu.tmpl

View file

diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl
index 201dcd3..03f01e7 100644
--- a/Documentation/DocBook/gpu.tmpl
+++ b/Documentation/DocBook/gpu.tmpl
@@ -615,18 +615,6 @@ char *date;</synopsis>
           <function>drm_gem_object_init</function>. Storage for private GEM
           objects must be managed by drivers.
         </para>
-        <para>
-          Drivers that do not need to extend GEM objects with private information
-          can call the <function>drm_gem_object_alloc</function> function to
-          allocate and initialize a struct <structname>drm_gem_object</structname>
-          instance. The GEM core will call the optional driver
-          <methodname>gem_init_object</methodname> operation after initializing
-          the GEM object with <function>drm_gem_object_init</function>.
-          <synopsis>int (*gem_init_object) (struct drm_gem_object *obj);</synopsis>
-        </para>
-        <para>
-          No alloc-and-init function exists for private GEM objects.
-        </para>
       </sect3>
       <sect3>
         <title>GEM Objects Lifetime</title>
@@ -635,10 +623,10 @@ char *date;</synopsis>
           acquired and release by <function>calling drm_gem_object_reference</function>
           and <function>drm_gem_object_unreference</function> respectively. The
           caller must hold the <structname>drm_device</structname>
-          <structfield>struct_mutex</structfield> lock. As a convenience, GEM
-          provides the <function>drm_gem_object_reference_unlocked</function> and
-          <function>drm_gem_object_unreference_unlocked</function> functions that
-          can be called without holding the lock.
+	  <structfield>struct_mutex</structfield> lock when calling
+	  <function>drm_gem_object_reference</function>. As a convenience, GEM
+	  provides <function>drm_gem_object_unreference_unlocked</function>
+	  functions that can be called without holding the lock.
         </para>
         <para>
           When the last reference to a GEM object is released the GEM core calls
@@ -649,15 +637,9 @@ char *date;</synopsis>
         </para>
         <para>
           <synopsis>void (*gem_free_object) (struct drm_gem_object *obj);</synopsis>
-          Drivers are responsible for freeing all GEM object resources, including
-          the resources created by the GEM core. If an mmap offset has been
-          created for the object (in which case
-          <structname>drm_gem_object</structname>::<structfield>map_list</structfield>::<structfield>map</structfield>
-          is not NULL) it must be freed by a call to
-          <function>drm_gem_free_mmap_offset</function>. The shmfs backing store
-          must be released by calling <function>drm_gem_object_release</function>
-          (that function can safely be called if no shmfs backing store has been
-          created).
+          Drivers are responsible for freeing all GEM object resources. This includes
+          the resources created by the GEM core, which need to be released with
+          <function>drm_gem_object_release</function>.
         </para>
       </sect3>
       <sect3>
@@ -740,17 +722,10 @@ char *date;</synopsis>
           DRM identifies the GEM object to be mapped by a fake offset passed
           through the mmap offset argument. Prior to being mapped, a GEM object
           must thus be associated with a fake offset. To do so, drivers must call
-          <function>drm_gem_create_mmap_offset</function> on the object. The
-          function allocates a fake offset range from a pool and stores the
-          offset divided by PAGE_SIZE in
-          <literal>obj-&gt;map_list.hash.key</literal>. Care must be taken not to
-          call <function>drm_gem_create_mmap_offset</function> if a fake offset
-          has already been allocated for the object. This can be tested by
-          <literal>obj-&gt;map_list.map</literal> being non-NULL.
+          <function>drm_gem_create_mmap_offset</function> on the object.
         </para>
         <para>
           Once allocated, the fake offset value
-          (<literal>obj-&gt;map_list.hash.key &lt;&lt; PAGE_SHIFT</literal>)
           must be passed to the application in a driver-specific way and can then
           be used as the mmap offset argument.
         </para>
@@ -836,10 +811,11 @@ char *date;</synopsis>
           abstracted from the client in libdrm.
         </para>
       </sect3>
-      <sect3>
-        <title>GEM Function Reference</title>
+    </sect2>
+    <sect2>
+      <title>GEM Function Reference</title>
 !Edrivers/gpu/drm/drm_gem.c
-      </sect3>
+!Iinclude/drm/drm_gem.h
     </sect2>
     <sect2>
       <title>VMA Offset Manager</title>
@@ -4201,17 +4177,21 @@ int num_ioctls;</synopsis>
       </sect2>
     </sect1>
     <sect1>
-      <title>GuC-based Command Submission</title>
+      <title>GuC</title>
       <sect2>
-        <title>GuC</title>
+        <title>GuC-specific firmware loader</title>
 !Pdrivers/gpu/drm/i915/intel_guc_loader.c GuC-specific firmware loader
 !Idrivers/gpu/drm/i915/intel_guc_loader.c
       </sect2>
       <sect2>
-        <title>GuC Client</title>
-!Pdrivers/gpu/drm/i915/i915_guc_submission.c GuC-based command submissison
+        <title>GuC-based command submission</title>
+!Pdrivers/gpu/drm/i915/i915_guc_submission.c GuC-based command submission
 !Idrivers/gpu/drm/i915/i915_guc_submission.c
       </sect2>
+      <sect2>
+        <title>GuC Firmware Layout</title>
+!Pdrivers/gpu/drm/i915/intel_guc_fwif.h GuC Firmware Layout
+      </sect2>
     </sect1>
 
     <sect1>

Documentation/devicetree/bindings/sound/ak4613.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/ak4613.txt b/Documentation/devicetree/bindings/sound/ak4613.txt
index 15a9195..1783f9e 100644
--- a/Documentation/devicetree/bindings/sound/ak4613.txt
+++ b/Documentation/devicetree/bindings/sound/ak4613.txt
@@ -7,6 +7,16 @@ Required properties:
 - compatible : "asahi-kasei,ak4613"
 - reg : The chip select number on the I2C bus
 
+Optional properties:
+- asahi-kasei,in1-single-end	: Boolean. Indicate input / output pins are single-ended.
+- asahi-kasei,in2-single-end	  rather than differential.
+- asahi-kasei,out1-single-end
+- asahi-kasei,out2-single-end
+- asahi-kasei,out3-single-end
+- asahi-kasei,out4-single-end
+- asahi-kasei,out5-single-end
+- asahi-kasei,out6-single-end
+
 Example:
 
 &i2c {

Documentation/devicetree/bindings/sound/atmel-pdmic.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/atmel-pdmic.txt b/Documentation/devicetree/bindings/sound/atmel-pdmic.txt
new file mode 100644
index 0000000..e0875f1
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/atmel-pdmic.txt
@@ -0,0 +1,55 @@
+* Atmel PDMIC driver under ALSA SoC architecture
+
+Required properties:
+- compatible
+	Should be "atmel,sama5d2-pdmic".
+- reg
+	Should contain PDMIC registers location and length.
+- interrupts
+	Should contain the IRQ line for the PDMIC.
+- dmas
+	One DMA specifiers as described in atmel-dma.txt and dma.txt files.
+- dma-names
+	Must be "rx".
+- clock-names
+	Required elements:
+	- "pclk"	peripheral clock
+	- "gclk"	generated clock
+- clocks
+	Must contain an entry for each required entry in clock-names.
+	Please refer to clock-bindings.txt.
+- atmel,mic-min-freq
+	The minimal frequency that the micphone supports.
+- atmel,mic-max-freq
+	The maximal frequency that the micphone supports.
+
+Optional properties:
+- pinctrl-names, pinctrl-0
+	Please refer to pinctrl-bindings.txt.
+- atmel,model
+	The user-visible name of this sound card.
+	The default value is "PDMIC".
+- atmel,mic-offset
+	The offset that should be added.
+	The range is from -32768 to 32767.
+	The default value is 0.
+
+Example:
+	pdmic@f8018000 {
+				compatible = "atmel,sama5d2-pdmic";
+				reg = <0xf8018000 0x124>;
+				interrupts = <48 IRQ_TYPE_LEVEL_HIGH 7>;
+				dmas = <&dma0
+					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)
+					| AT91_XDMAC_DT_PERID(50))>;
+				dma-names = "rx";
+				clocks = <&pdmic_clk>, <&pdmic_gclk>;
+				clock-names = "pclk", "gclk";
+
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_pdmic_default>;
+				atmel,model = "PDMIC @ sama5d2_xplained";
+				atmel,mic-min-freq = <1000000>;
+				atmel,mic-max-freq = <3246000>;
+				atmel,mic-offset = <0x0>;
+	};

Documentation/devicetree/bindings/sound/da7218.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/da7218.txt b/Documentation/devicetree/bindings/sound/da7218.txt
new file mode 100644
index 0000000..5ca5a70
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/da7218.txt
@@ -0,0 +1,104 @@
+Dialog Semiconductor DA7218 Audio Codec bindings
+
+DA7218 is an audio codec with HP detect feature.
+
+======
+
+Required properties:
+- compatible : Should be "dlg,da7217" or "dlg,da7218"
+- reg: Specifies the I2C slave address
+
+- VDD-supply: VDD power supply for the device
+- VDDMIC-supply: VDDMIC power supply for the device
+- VDDIO-supply: VDDIO power supply for the device
+  (See Documentation/devicetree/bindings/regulator/regulator.txt for further
+   information relating to regulators)
+
+Optional properties:
+- interrupt-parent: Specifies the phandle of the interrupt controller to which
+  the IRQs from DA7218 are delivered to.
+- interrupts: IRQ line info for DA7218 chip.
+  (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for
+   further information relating to interrupt properties)
+- interrupt-names : Name associated with interrupt line. Should be "wakeup" if
+  interrupt is to be used to wake system, otherwise "irq" should be used.
+- wakeup-source: Flag to indicate this device can wake system (suspend/resume).
+
+- clocks : phandle and clock specifier for codec MCLK.
+- clock-names : Clock name string for 'clocks' attribute, should be "mclk".
+
+- dlg,micbias1-lvl-millivolt : Voltage (mV) for Mic Bias 1
+	[<1200>, <1600>, <1800>, <2000>, <2200>, <2400>, <2600>, <2800>, <3000>]
+- dlg,micbias2-lvl-millivolt : Voltage (mV) for Mic Bias 2
+	[<1200>, <1600>, <1800>, <2000>, <2200>, <2400>, <2600>, <2800>, <3000>]
+- dlg,mic1-amp-in-sel : Mic1 input source type
+	["diff", "se_p", "se_n"]
+- dlg,mic2-amp-in-sel : Mic2 input source type
+	["diff", "se_p", "se_n"]
+- dlg,dmic1-data-sel : DMIC1 channel select based on clock edge.
+	["lrise_rfall", "lfall_rrise"]
+- dlg,dmic1-samplephase : When to sample audio from DMIC1.
+	["on_clkedge", "between_clkedge"]
+- dlg,dmic1-clkrate-hz : DMic1 clock frequency (Hz).
+	[<1500000>, <3000000>]
+- dlg,dmic2-data-sel : DMic2 channel select based on clock edge.
+	["lrise_rfall", "lfall_rrise"]
+- dlg,dmic2-samplephase : When to sample audio from DMic2.
+	["on_clkedge", "between_clkedge"]
+- dlg,dmic2-clkrate-hz : DMic2 clock frequency (Hz).
+	[<1500000>, <3000000>]
+- dlg,hp-diff-single-supply : Boolean flag, use single supply for HP
+			      (DA7217 only)
+
+======
+
+Optional Child node - 'da7218_hpldet' (DA7218 only):
+
+Optional properties:
+- dlg,jack-rate-us : Time between jack detect measurements (us)
+	[<5>, <10>, <20>, <40>, <80>, <160>, <320>, <640>]
+- dlg,jack-debounce : Number of debounce measurements taken for jack detect
+	[<0>, <2>, <3>, <4>]
+- dlg,jack-threshold-pct : Threshold level for jack detection (% of VDD)
+	[<84>, <88>, <92>, <96>]
+- dlg,comp-inv : Boolean flag, invert comparator output
+- dlg,hyst : Boolean flag, enable hysteresis
+- dlg,discharge : Boolean flag, auto discharge of Mic Bias on jack removal
+
+======
+
+Example:
+
+	codec: da7218@1a {
+		compatible = "dlg,da7218";
+		reg = <0x1a>;
+		interrupt-parent = <&gpio6>;
+		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
+		wakeup-source;
+
+		VDD-supply = <&reg_audio>;
+		VDDMIC-supply = <&reg_audio>;
+		VDDIO-supply = <&reg_audio>;
+
+		clocks = <&clks 201>;
+		clock-names = "mclk";
+
+		dlg,micbias1-lvl-millivolt = <2600>;
+		dlg,micbias2-lvl-millivolt = <2600>;
+		dlg,mic1-amp-in-sel = "diff";
+		dlg,mic2-amp-in-sel = "diff";
+
+		dlg,dmic1-data-sel = "lrise_rfall";
+		dlg,dmic1-samplephase = "on_clkedge";
+		dlg,dmic1-clkrate-hz = <3000000>;
+		dlg,dmic2-data-sel = "lrise_rfall";
+		dlg,dmic2-samplephase = "on_clkedge";
+		dlg,dmic2-clkrate-hz = <3000000>;
+
+		da7218_hpldet {
+			dlg,jack-rate-us = <40>;
+			dlg,jack-debounce = <2>;
+			dlg,jack-threshold-pct = <84>;
+			dlg,hyst;
+		};
+	};

Documentation/devicetree/bindings/sound/da7219.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/da7219.txt b/Documentation/devicetree/bindings/sound/da7219.txt
index 1b70309..cf61681 100644
--- a/Documentation/devicetree/bindings/sound/da7219.txt
+++ b/Documentation/devicetree/bindings/sound/da7219.txt
@@ -28,13 +28,15 @@ Optional properties:
 - clocks : phandle and clock specifier for codec MCLK.
 - clock-names : Clock name string for 'clocks' attribute, should be "mclk".
 
-- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine
-	[<1050>, <1100>, <1200>, <1400>]
 - dlg,micbias-lvl : Voltage (mV) for Mic Bias
-	[<1800>, <2000>, <2200>, <2400>, <2600>]
+	[<1600>, <1800>, <2000>, <2200>, <2400>, <2600>]
 - dlg,mic-amp-in-sel : Mic input source type
 	["diff", "se_p", "se_n"]
 
+Deprecated properties:
+- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine
+  (LDO unavailable in production HW so property no longer required).
+
 ======
 
 Child node - 'da7219_aad':

Documentation/devicetree/bindings/sound/fsl,asrc.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/fsl,asrc.txt b/Documentation/devicetree/bindings/sound/fsl,asrc.txt
index b93362a..3e26a94 100644
--- a/Documentation/devicetree/bindings/sound/fsl,asrc.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,asrc.txt
@@ -25,6 +25,11 @@ Required properties:
 	"mem"		  Peripheral access clock to access registers.
 	"ipg"		  Peripheral clock to driver module.
 	"asrck_<0-f>"	  Clock sources for input and output clock.
+	"spba"		  The spba clock is required when ASRC is placed as a
+			  bus slave of the Shared Peripheral Bus and when two
+			  or more bus masters (CPU, DMA or DSP) try to access
+			  it. This property is optional depending on the SoC
+			  design.
 
    - big-endian		: If this property is absent, the little endian mode
 			  will be in use as default. Otherwise, the big endian

Documentation/devicetree/bindings/sound/fsl,esai.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/fsl,esai.txt b/Documentation/devicetree/bindings/sound/fsl,esai.txt
index d3b6b5f..cd3ee5d 100644
--- a/Documentation/devicetree/bindings/sound/fsl,esai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,esai.txt
@@ -27,6 +27,11 @@ Required properties:
 			  derive HCK, SCK and FS.
 	"fsys"		  The system clock derived from ahb clock used to
 			  derive HCK, SCK and FS.
+	"spba"		  The spba clock is required when ESAI is placed as a
+			  bus slave of the Shared Peripheral Bus and when two
+			  or more bus masters (CPU, DMA or DSP) try to access
+			  it. This property is optional depending on the SoC
+			  design.
 
   - fsl,fifo-depth	: The number of elements in the transmit and receive
 			  FIFOs. This number is the maximum allowed value for

Documentation/devicetree/bindings/sound/fsl,spdif.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/fsl,spdif.txt b/Documentation/devicetree/bindings/sound/fsl,spdif.txt
index b5ee32e..4ca39dd 100644
--- a/Documentation/devicetree/bindings/sound/fsl,spdif.txt
+++ b/Documentation/devicetree/bindings/sound/fsl,spdif.txt
@@ -27,6 +27,11 @@ Required properties:
 			  Transceiver Clock Diagram" of SoC reference manual.
 			  It can also be referred to TxClk_Source bit of
 			  register SPDIF_STC.
+	"spba"		  The spba clock is required when SPDIF is placed as a
+			  bus slave of the Shared Peripheral Bus and when two
+			  or more bus masters (CPU, DMA or DSP) try to access
+			  it. This property is optional depending on the SoC
+			  design.
 
    - big-endian		: If this property is absent, the native endian mode
 			  will be in use as default, or the big endian mode

Documentation/devicetree/bindings/sound/img,i2s-in.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/img,i2s-in.txt b/Documentation/devicetree/bindings/sound/img,i2s-in.txt
new file mode 100644
index 0000000..423265c
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/img,i2s-in.txt
@@ -0,0 +1,47 @@
+Imagination Technologies I2S Input Controller
+
+Required Properties:
+
+  - compatible : Compatible list, must contain "img,i2s-in"
+
+  - #sound-dai-cells : Must be equal to 0
+
+  - reg : Offset and length of the register set for the device
+
+  - clocks : Contains an entry for each entry in clock-names
+
+  - clock-names : Must include the following entry:
+	"sys"	The system clock
+
+  - dmas: Contains an entry for each entry in dma-names.
+
+  - dma-names: Must include the following entry:
+	"rx"	Single DMA channel used by all active I2S channels
+
+  - img,i2s-channels : Number of I2S channels instantiated in the I2S in block
+
+Optional Properties:
+
+  - interrupts : Contains the I2S in interrupts. Depending on
+	the configuration, there may be no interrupts, one interrupt,
+	or an interrupt per I2S channel. For the case where there is
+	one interrupt per channel, the interrupts should be listed
+	in ascending channel order
+
+  - resets: Contains a phandle to the I2S in reset signal
+
+  - reset-names: Contains the reset signal name "rst"
+
+Example:
+
+i2s_in: i2s-in@18100800 {
+	compatible = "img,i2s-in";
+	reg = <0x18100800 0x200>;
+	interrupts = <GIC_SHARED 7 IRQ_TYPE_LEVEL_HIGH>;
+	dmas = <&mdc 30 0xffffffff 0>;
+	dma-names = "rx";
+	clocks = <&cr_periph SYS_CLK_I2S_IN>;
+	clock-names = "sys";
+	img,i2s-channels = <6>;
+	#sound-dai-cells = <0>;
+};

Documentation/devicetree/bindings/sound/img,i2s-out.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/img,i2s-out.txt b/Documentation/devicetree/bindings/sound/img,i2s-out.txt
new file mode 100644
index 0000000..0159415
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/img,i2s-out.txt
@@ -0,0 +1,51 @@
+Imagination Technologies I2S Output Controller
+
+Required Properties:
+
+  - compatible : Compatible list, must contain "img,i2s-out"
+
+  - #sound-dai-cells : Must be equal to 0
+
+  - reg : Offset and length of the register set for the device
+
+  - clocks : Contains an entry for each entry in clock-names
+
+  - clock-names : Must include the following entries:
+	"sys"	The system clock
+	"ref"	The reference clock
+
+  - dmas: Contains an entry for each entry in dma-names.
+
+  - dma-names: Must include the following entry:
+	"tx"	Single DMA channel used by all active I2S channels
+
+  - img,i2s-channels : Number of I2S channels instantiated in the I2S out block
+
+  - resets: Contains a phandle to the I2S out reset signal
+
+  - reset-names: Contains the reset signal name "rst"
+
+Optional Properties:
+
+  - interrupts : Contains the I2S out interrupts. Depending on
+	the configuration, there may be no interrupts, one interrupt,
+	or an interrupt per I2S channel. For the case where there is
+	one interrupt per channel, the interrupts should be listed
+	in ascending channel order
+
+Example:
+
+i2s_out: i2s-out@18100A00 {
+	compatible = "img,i2s-out";
+	reg = <0x18100A00 0x200>;
+	interrupts = <GIC_SHARED 13 IRQ_TYPE_LEVEL_HIGH>;
+	dmas = <&mdc 23 0xffffffff 0>;
+	dma-names = "tx";
+	clocks = <&cr_periph SYS_CLK_I2S_OUT>,
+		 <&clk_core CLK_I2S>;
+	clock-names = "sys", "ref";
+	img,i2s-channels = <6>;
+	resets = <&pistachio_reset PISTACHIO_RESET_I2S_OUT>;
+	reset-names = "rst";
+	#sound-dai-cells = <0>;
+};

Documentation/devicetree/bindings/sound/img,parallel-out.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/img,parallel-out.txt b/Documentation/devicetree/bindings/sound/img,parallel-out.txt
new file mode 100644
index 0000000..a3015d2
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/img,parallel-out.txt
@@ -0,0 +1,44 @@
+Imagination Technologies Parallel Output Controller
+
+Required Properties:
+
+  - compatible : Compatible list, must contain "img,parallel-out".
+
+  - #sound-dai-cells : Must be equal to 0
+
+  - reg : Offset and length of the register set for the device.
+
+  - dmas: Contains an entry for each entry in dma-names.
+
+  - dma-names: Must include the following entry:
+	"tx"
+
+  - clocks : Contains an entry for each entry in clock-names.
+
+  - clock-names : Includes the following entries:
+	"sys"	The system clock
+	"ref"	The reference clock
+
+  - resets: Contains a phandle to the parallel out reset signal
+
+  - reset-names: Contains the reset signal name "rst"
+
+Optional Properties:
+
+  - interrupts : Contains the parallel out interrupt, if present
+
+Example:
+
+parallel_out: parallel-out@18100C00 {
+	compatible = "img,parallel-out";
+	reg = <0x18100C00 0x100>;
+	interrupts = <GIC_SHARED 19 IRQ_TYPE_LEVEL_HIGH>;
+	dmas = <&mdc 16 0xffffffff 0>;
+	dma-names = "tx";
+	clocks = <&cr_periph SYS_CLK_PAUD_OUT>,
+		 <&clk_core CLK_AUDIO_DAC>;
+	clock-names = "sys", "ref";
+	resets = <&pistachio_reset PISTACHIO_RESET_PRL_OUT>;
+	reset-names = "rst";
+	#sound-dai-cells = <0>;
+};

Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt b/Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt
new file mode 100644
index 0000000..4cc18fc
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt
@@ -0,0 +1,18 @@
+Pistachio internal DAC DT bindings
+
+Required properties:
+
+  - compatible: "img,pistachio-internal-dac"
+
+  - img,cr-top : Must contain a phandle to the top level control syscon
+		 node which contains the internal dac control registers
+
+  - VDD-supply : Digital power supply regulator (+1.8V or +3.3V)
+
+Examples:
+
+internal_dac: internal-dac {
+	compatible = "img,pistachio-internal-dac";
+	img,cr-top = <&cr_top>;
+	VDD-supply = <&supply3v3>;
+};

Documentation/devicetree/bindings/sound/img,spdif-in.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/img,spdif-in.txt b/Documentation/devicetree/bindings/sound/img,spdif-in.txt
new file mode 100644
index 0000000..aab9a81
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/img,spdif-in.txt
@@ -0,0 +1,41 @@
+Imagination Technologies SPDIF Input Controller
+
+Required Properties:
+
+  - compatible : Compatible list, must contain "img,spdif-in"
+
+  - #sound-dai-cells : Must be equal to 0
+
+  - reg : Offset and length of the register set for the device
+
+  - dmas: Contains an entry for each entry in dma-names.
+
+  - dma-names: Must include the following entry:
+	"rx"
+
+  - clocks : Contains an entry for each entry in clock-names
+
+  - clock-names : Includes the following entries:
+	"sys"	The system clock
+
+Optional Properties:
+
+  - resets: Should contain a phandle to the spdif in reset signal, if any
+
+  - reset-names: Should contain the reset signal name "rst", if a
+	reset phandle is given
+
+  - interrupts : Contains the spdif in interrupt, if present
+
+Example: