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

28cbc335 · Linus Torvalds <[email protected]> · 2017-02-23 08:50:22 -08:00

Pull sound updates from Takashi Iwai:
 "Here is the update of sound bits for 4.11: again at this time, no big
  changes in ALSA and ASoC core but only cosmetic changes like
  consitifaction.

  Meanwhile, quite a lot of developments are seen in a few driver side.

  ALSA Core:
   - Clean up, consitification of some ops

  HD-audio:
   - A slight behavior change of single_cmd option
   - Quirks for AmigaOne X1000, Samsung Ativ Book 8, Dell AiO, ALC221
     HP, and fixes for Lewisburg controller
   - Realtek ALC299, ALC1220 codecs

  Others:
   - USB-audio: Tascam US-16x08 DSP mixer quirk
   - Intel HDMI LPE audio support for Baytrail / Cherrytrail; this
     contains some updates in drm/i915 for the new platform binding

  ASoC:
   - Lots of updates in Intel drivers, mostly for DisplayPort and HDMI
     on Skylake and onwards, as well as more Baytrail / Cherrytrail
     boards support
   - Channel mapping support for HDMI
   - Support for AllWinner A31 and A33, Everest Semiconductor ES8328,
     Nuvoton NAU8540.

* tag 'sound-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (323 commits)
  ALSA: usb-audio: Tidy up mixer_us16x08.c
  ALSA: usb-audio: Fix memory leak and corruption in mixer_us16x08.c
  ALSA: usb-audio: purge needless variable length array
  ALSA: x86: hdmi: select CONFIG_SND_PCM
  ALSA: x86: Don't enable runtime PM as default
  ALSA: x86: Use runtime PM autosuspend
  ALSA: usb-audio: localize function without external linkage
  ALSA: usb-audio: localize one-referrer variable
  ALSA: usb-audio: Tascam US-16x08 DSP mixer quirk
  ALSA: emu10k1: constify snd_emux_operators structure
  ASoC: sun4i-spdif: drop unnessary snd_soc_unregister_component()
  ASoC: Intel: bxt: Add jack port initialize in bxt_rt298 machine
  ASoC: nau8825: automatic BCLK and LRC divde in master mode
  ASoC: hdac_hdmi: Add device id for Geminilake
  ASoC: Intel: Skylake: Add Geminlake IDs
  ASoC: rt298: Add DMI match for Geminilake reference platform
  ASoC: Intel: Skylake: Check device type to get endpoint configuration
  ASoC: Intel: bxt: Add jack port initialize in da7219_max98357a machine
  ASoC: Intel: Skylake: Add jack port initialize in nau88l25_ssm4567 machine
  ASoC: Intel: Skylake: Add jack port initialize in nau88l25_max98357a machine
  ...

Commit: 28cbc335d272f293c4368abd4ac2e17e36805b79
Parents: 1ec5c186 · 7086b7b3

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

Changes

234 files changed · +10428 −1916

File	Status	Add	Del	Content
Documentation/devicetree/bindings/misc/atmel-ssc.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt	modified	+8	−3	View file
Documentation/devicetree/bindings/sound/es8328.txt	modified	+1	−1	View file
Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt	modified	+2	−0	View file
Documentation/devicetree/bindings/sound/nau8540.txt	added	+16	−0	View file
Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt	added	+36	−0	View file
Documentation/devicetree/bindings/sound/sun4i-i2s.txt	modified	+5	−0	View file
Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt	added	+63	−0	View file
Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/sound/zte,zx-i2s.txt	modified	+8	−6	View file
Documentation/gpu/i915.rst	modified	+9	−0	View file
arch/arm/mach-s3c64xx/dev-audio.c	modified	+1	−3	View file
drivers/gpu/drm/i915/Makefile	modified	+3	−0	View file
drivers/gpu/drm/i915/i915_drv.c	modified	+2	−2	View file
drivers/gpu/drm/i915/i915_drv.h	modified	+14	−0	View file
drivers/gpu/drm/i915/i915_irq.c	modified	+16	−0	View file
drivers/gpu/drm/i915/i915_reg.h	modified	+16	−0	View file
drivers/gpu/drm/i915/intel_audio.c	modified	+53	−10	View file
drivers/gpu/drm/i915/intel_drv.h	modified	+2	−0	View file
drivers/gpu/drm/i915/intel_hdmi.c	modified	+1	−0	View file
drivers/gpu/drm/i915/intel_lpe_audio.c	added	+392	−0	View file
drivers/misc/atmel-ssc.c	modified	+50	−0	View file
include/drm/drm_edid.h	modified	+13	−0	View file
include/drm/intel_lpe_audio.h	added	+51	−0	View file
include/linux/atmel-ssc.h	modified	+1	−0	View file
include/linux/platform_data/asoc-s3c.h	modified	+2	−4	View file
include/sound/dmaengine_pcm.h	modified	+6	−0	View file
include/sound/pcm.h	modified	+9	−0	View file
include/sound/rawmidi.h	modified	+2	−2	View file
include/sound/simple_card_utils.h	modified	+6	−5	View file
include/sound/snd_wavefront.h	modified	+2	−2	View file
include/sound/soc-dai.h	modified	+3	−0	View file
include/sound/soc.h	modified	+17	−35	View file
sound/Kconfig	modified	+2	−0	View file
sound/Makefile	modified	+1	−1	View file
sound/core/rawmidi.c	modified	+1	−1	View file
sound/core/seq/seq_virmidi.c	modified	+2	−2	View file
sound/drivers/mpu401/mpu401_uart.c	modified	+2	−2	View file
sound/drivers/mtpav.c	modified	+2	−2	View file
sound/drivers/mts64.c	modified	+2	−2	View file
sound/drivers/portman2x4.c	modified	+2	−2	View file
sound/drivers/serial-u16550.c	modified	+2	−2	View file
sound/drivers/vx/vx_pcm.c	modified	+5	−3	View file
sound/firewire/Kconfig	modified	+1	−0	View file
sound/firewire/bebob/bebob_hwdep.c	modified	+8	−9	View file
sound/firewire/bebob/bebob_midi.c	modified	+12	−14	View file
sound/firewire/bebob/bebob_pcm.c	modified	+25	−26	View file
sound/firewire/dice/dice-interface.h	modified	+1	−0	View file
sound/firewire/dice/dice-midi.c	modified	+10	−12	View file
sound/firewire/dice/dice-stream.c	modified	+11	−1	View file
sound/firewire/digi00x/digi00x-hwdep.c	modified	+8	−9	View file
sound/firewire/digi00x/digi00x-midi.c	modified	+24	−28	View file
sound/firewire/digi00x/digi00x-pcm.c	modified	+25	−27	View file
sound/firewire/fireworks/fireworks_hwdep.c	modified	+9	−10	View file
sound/firewire/fireworks/fireworks_midi.c	modified	+12	−14	View file
sound/firewire/fireworks/fireworks_pcm.c	modified	+25	−27	View file
sound/firewire/oxfw/oxfw-midi.c	modified	+12	−14	View file
sound/firewire/oxfw/oxfw-scs1x.c	modified	+7	−7	View file
sound/firewire/oxfw/oxfw.c	modified	+1	−0	View file
sound/firewire/tascam/tascam-hwdep.c	modified	+8	−9	View file
sound/firewire/tascam/tascam-midi.c	modified	+12	−14	View file
sound/firewire/tascam/tascam-pcm.c	modified	+25	−27	View file
sound/hda/ext/hdac_ext_stream.c	modified	+9	−6	View file
sound/isa/gus/gus_uart.c	modified	+2	−2	View file
sound/isa/msnd/msnd_midi.c	modified	+1	−1	View file
sound/isa/sb/sb8_midi.c	modified	+2	−2	View file
sound/isa/wavefront/wavefront_midi.c	modified	+2	−2	View file
sound/mips/hal2.c	modified	+4	−0	View file
sound/oss/ad1848.c	modified	+1	−6	View file
sound/pci/ca0106/ca_midi.c	modified	+2	−2	View file
sound/pci/cs4281.c	modified	+2	−2	View file
sound/pci/cs46xx/cs46xx_lib.c	modified	+22	−22	View file
sound/pci/cs5535audio/cs5535audio_pm.c	modified	+2	−2	View file
sound/pci/echoaudio/midi.c	modified	+2	−2	View file
sound/pci/emu10k1/emu10k1_callback.c	modified	+1	−1	View file
sound/pci/emu10k1/emu10k1x.c	modified	+2	−2	View file
sound/pci/emu10k1/emumpu401.c	modified	+2	−2	View file
sound/pci/ens1370.c	modified	+2	−2	View file
sound/pci/hda/hda_controller.c	modified	+4	−0	View file
sound/pci/hda/hda_controller.h	modified	+1	−0	View file
sound/pci/hda/hda_intel.c	modified	+30	−5	View file
sound/pci/hda/patch_ca0132.c	modified	+3	−0	View file
sound/pci/hda/patch_realtek.c	modified	+42	−1	View file
sound/pci/hda/patch_sigmatel.c	modified	+30	−0	View file
sound/pci/ice1712/ice1724.c	modified	+2	−2	View file
sound/pci/mixart/mixart.h	modified	+1	−1	View file
sound/pci/rme9652/hdsp.c	modified	+2	−2	View file
sound/pci/rme9652/hdspm.c	modified	+2	−2	View file
sound/pci/vx222/vx222_ops.c	modified	+6	−6	View file
sound/pcmcia/vx/vxp_ops.c	modified	+6	−6	View file
sound/soc/amd/acp-pcm-dma.c	modified	+0	−3	View file
sound/soc/atmel/tse850-pcm5142.c	modified	+3	−20	View file
sound/soc/codecs/Kconfig	modified	+16	−9	View file
sound/soc/codecs/Makefile	modified	+4	−2	View file
sound/soc/codecs/adau17x1.c	modified	+1	−2	View file
sound/soc/codecs/ak4642.c	modified	+1	−1	View file
sound/soc/codecs/arizona.h	modified	+1	−0	View file
sound/soc/codecs/cs47l24.c	modified	+7	−1	View file
sound/soc/codecs/da7218.c	modified	+2	−1	View file
sound/soc/codecs/es8328-i2c.c	modified	+2	−0	View file
sound/soc/codecs/es8328.c	modified	+14	−6	View file
sound/soc/codecs/hdac_hdmi.c	modified	+818	−509	View file
sound/soc/codecs/hdac_hdmi.h	modified	+4	−1	View file
sound/soc/codecs/hdmi-codec.c	modified	+400	−3	View file
sound/soc/codecs/max98090.c	modified	+1	−1	View file
sound/soc/codecs/max9867.c	modified	+2	−3	View file
sound/soc/codecs/nau8540.c	added	+835	−0	View file
sound/soc/codecs/nau8540.h	added	+222	−0	View file
sound/soc/codecs/nau8825.c	modified	+19	−1	View file
sound/soc/codecs/pcm3168a.c	modified	+0	−2	View file
sound/soc/codecs/rt298.c	modified	+7	−0	View file
sound/soc/codecs/rt5514-spi.c	modified	+0	−1	View file
sound/soc/codecs/rt5640.c	modified	+7	−6	View file
sound/soc/codecs/rt5645.c	modified	+11	−3	View file
sound/soc/codecs/rt5659.c	modified	+45	−46	View file
sound/soc/codecs/rt5660.c	modified	+3	−3	View file
sound/soc/codecs/rt5670.c	modified	+1	−0	View file
sound/soc/codecs/rt5677-spi.c	modified	+0	−1	View file
sound/soc/codecs/tlv320aic3x.c	modified	+6	−0	View file
sound/soc/codecs/wm0010.c	modified	+0	−1	View file
sound/soc/codecs/wm5102.c	modified	+6	−1	View file
sound/soc/codecs/wm5110.c	modified	+9	−1	View file
sound/soc/codecs/wm8731.h	modified	+1	−1	View file
sound/soc/codecs/wm8741.c	modified	+0	−2	View file
sound/soc/codecs/wm8753.c	modified	+2	−1	View file
sound/soc/codecs/wm8997.c	modified	+5	−1	View file
sound/soc/codecs/wm8998.c	modified	+5	−1	View file
sound/soc/codecs/wm_adsp.c	modified	+64	−13	View file
sound/soc/codecs/wm_adsp.h	modified	+11	−0	View file
sound/soc/davinci/davinci-evm.c	modified	+10	−3	View file
sound/soc/dwc/designware_i2s.c	modified	+7	−2	View file
sound/soc/dwc/designware_pcm.c	modified	+79	−20	View file
sound/soc/dwc/local.h	modified	+8	−1	View file
sound/soc/fsl/efika-audio-fabric.c	modified	+0	−1	View file
sound/soc/fsl/fsl_sai.c	modified	+2	−2	View file
sound/soc/fsl/mpc5200_psc_ac97.c	modified	+0	−1	View file
sound/soc/fsl/mpc5200_psc_ac97.h	deleted	+0	−13	View before deletion
sound/soc/generic/simple-card-utils.c	modified	+4	−4	View file
sound/soc/generic/simple-card.c	modified	+2	−2	View file
sound/soc/generic/simple-scu-card.c	modified	+2	−2	View file
sound/soc/img/img-parallel-out.c	modified	+0	−2	View file
sound/soc/intel/Kconfig	modified	+20	−31	View file
sound/soc/intel/Makefile	modified	+1	−1	View file
sound/soc/intel/atom/Makefile	modified	+4	−3	View file
sound/soc/intel/atom/sst-atom-controls.c	modified	+4	−6	View file
sound/soc/intel/atom/sst-mfld-platform-pcm.c	modified	+3	−2	View file
sound/soc/intel/atom/sst/sst_acpi.c	modified	+50	−2	View file
sound/soc/intel/atom/sst/sst_ipc.c	modified	+0	−2	View file
sound/soc/intel/atom/sst/sst_stream.c	modified	+0	−2	View file
sound/soc/intel/boards/broadwell.c	modified	+2	−0	View file
sound/soc/intel/boards/bxt_da7219_max98357a.c	modified	+71	−5	View file
sound/soc/intel/boards/bxt_rt298.c	modified	+73	−5	View file
sound/soc/intel/boards/bytcr_rt5640.c	modified	+12	−3	View file
sound/soc/intel/boards/bytcr_rt5651.c	modified	+1	−2	View file
sound/soc/intel/boards/cht_bsw_rt5645.c	modified	+349	−48	View file
sound/soc/intel/boards/skl_nau88l25_max98357a.c	modified	+26	−8	View file
sound/soc/intel/boards/skl_nau88l25_ssm4567.c	modified	+26	−7	View file
sound/soc/intel/boards/skl_rt286.c	modified	+23	−7	View file
sound/soc/intel/common/sst-dsp.c	modified	+26	−26	View file
sound/soc/intel/skylake/bxt-sst.c	modified	+22	−42	View file
sound/soc/intel/skylake/skl-messages.c	modified	+7	−0	View file
sound/soc/intel/skylake/skl-nhlt.c	modified	+49	−9	View file
sound/soc/intel/skylake/skl-pcm.c	modified	+91	−83	View file
sound/soc/intel/skylake/skl-sst-dsp.h	modified	+1	−3	View file
sound/soc/intel/skylake/skl-sst-ipc.h	modified	+3	−2	View file
sound/soc/intel/skylake/skl-topology.c	modified	+71	−26	View file
sound/soc/intel/skylake/skl-topology.h	modified	+19	−0	View file
sound/soc/intel/skylake/skl-tplg-interface.h	modified	+0	−12	View file
sound/soc/intel/skylake/skl.c	modified	+12	−0	View file
sound/soc/intel/skylake/skl.h	modified	+4	−1	View file
sound/soc/mediatek/mt2701/mt2701-afe-pcm.c	modified	+2	−0	View file
sound/soc/mediatek/mt8173/mt8173-max98090.c	modified	+4	−10	View file
sound/soc/mxs/mxs-saif.c	modified	+27	−7	View file
sound/soc/omap/mcbsp.h	modified	+3	−0	View file
sound/soc/omap/omap-mcbsp.c	modified	+47	−1	View file
sound/soc/pxa/e740_wm9705.c	modified	+0	−3	View file
sound/soc/pxa/e750_wm9705.c	modified	+0	−2	View file
sound/soc/pxa/e800_wm9712.c	modified	+0	−2	View file
sound/soc/pxa/em-x270.c	modified	+0	−2	View file
sound/soc/pxa/mioa701_wm9713.c	modified	+0	−1	View file
sound/soc/pxa/palm27x.c	modified	+0	−2	View file
sound/soc/pxa/pxa2xx-ac97.c	modified	+0	−2	View file
sound/soc/pxa/pxa2xx-ac97.h	deleted	+0	−17	View before deletion
sound/soc/pxa/tosa.c	modified	+0	−2	View file
sound/soc/pxa/zylonite.c	modified	+0	−1	View file
sound/soc/qcom/lpass-apq8016.c	modified	+7	−8	View file
sound/soc/qcom/lpass-cpu.c	modified	+43	−64	View file
sound/soc/qcom/lpass-platform.c	modified	+52	−54	View file
sound/soc/qcom/storm.c	modified	+8	−14	View file
sound/soc/rockchip/Kconfig	modified	+9	−0	View file
sound/soc/rockchip/Makefile	modified	+2	−0	View file
sound/soc/rockchip/rk3288_hdmi_analog.c	added	+299	−0	View file
sound/soc/samsung/Kconfig	modified	+2	−0	View file
sound/soc/samsung/dmaengine.c	modified	+6	−2	View file
sound/soc/samsung/i2s.c	modified	+97	−109	View file
sound/soc/samsung/s3c2412-i2s.c	modified	+2	−0	View file
sound/soc/samsung/s3c24xx-i2s.c	modified	+2	−0	View file
sound/soc/samsung/smdk_wm8580.c	modified	+1	−4	View file
sound/soc/samsung/tm2_wm5110.c	modified	+1	−0	View file
sound/soc/sh/rcar/core.c	modified	+0	−2	View file
sound/soc/sh/rcar/rsnd.h	modified	+2	−2	View file
sound/soc/sh/rcar/src.c	modified	+3	−3	View file
sound/soc/soc-ac97.c	modified	+1	−1	View file
sound/soc/soc-core.c	modified	+198	−27	View file
sound/soc/soc-dapm.c	modified	+62	−0	View file
sound/soc/soc-generic-dmaengine-pcm.c	modified	+11	−1	View file
sound/soc/soc-ops.c	modified	+1	−1	View file
sound/soc/soc-pcm.c	modified	+23	−32	View file
sound/soc/soc-topology.c	modified	+14	−5	View file
sound/soc/sunxi/Kconfig	modified	+12	−1	View file
sound/soc/sunxi/Makefile	modified	+1	−0	View file
sound/soc/sunxi/sun4i-codec.c	modified	+1	−0	View file
sound/soc/sunxi/sun4i-i2s.c	modified	+57	−4	View file
sound/soc/sunxi/sun4i-spdif.c	modified	+41	−19	View file
sound/soc/sunxi/sun8i-codec-analog.c	modified	+28	−2	View file
sound/soc/sunxi/sun8i-codec.c	added	+498	−0	View file
sound/soc/zte/zx-i2s.c	modified	+30	−13	View file
sound/synth/emux/emux_seq.c	modified	+7	−7	View file
sound/usb/6fire/midi.c	modified	+2	−2	View file
sound/usb/Makefile	modified	+1	−0	View file
sound/usb/bcd2000/bcd2000.c	modified	+2	−2	View file
sound/usb/caiaq/midi.c	modified	+2	−2	View file
sound/usb/line6/driver.c	modified	+26	−22	View file
sound/usb/line6/midi.c	modified	+2	−2	View file
sound/usb/midi.c	modified	+2	−2	View file
sound/usb/mixer_quirks.c	modified	+5	−0	View file
sound/usb/mixer_us16x08.c	added	+1419	−0	View file
sound/usb/mixer_us16x08.h	added	+121	−0	View file
sound/usb/quirks.c	modified	+15	−0	View file
sound/x86/Kconfig	added	+16	−0	View file
sound/x86/Makefile	added	+4	−0	View file
sound/x86/intel_hdmi_audio.c	added	+1867	−0	View file
sound/x86/intel_hdmi_audio.h	added	+136	−0	View file
sound/x86/intel_hdmi_lpe_audio.h	added	+328	−0	View file

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

Documentation/devicetree/bindings/misc/atmel-ssc.txt

View file

diff --git a/Documentation/devicetree/bindings/misc/atmel-ssc.txt b/Documentation/devicetree/bindings/misc/atmel-ssc.txt
index efc98ea..f8629bb 100644
--- a/Documentation/devicetree/bindings/misc/atmel-ssc.txt
+++ b/Documentation/devicetree/bindings/misc/atmel-ssc.txt
@@ -24,6 +24,8 @@ Optional properties:
        this parameter to choose where the clock from.
      - By default the clock is from TK pin, if the clock from RK pin, this
        property is needed.
+  - #sound-dai-cells: Should contain <0>.
+     - This property makes the SSC into an automatically registered DAI.
 
 Examples:
 - PDC transfer:

Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt b/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
index 5b9b38f..fdb25b4 100644
--- a/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
+++ b/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt
@@ -2,8 +2,7 @@ Devicetree bindings for the Axentia TSE-850 audio complex
 
 Required properties:
   - compatible: "axentia,tse850-pcm5142"
-  - axentia,ssc-controller: The phandle of the atmel SSC controller used as
-    cpu dai.
+  - axentia,cpu-dai: The phandle of the cpu dai.
   - axentia,audio-codec: The phandle of the PCM5142 codec.
   - axentia,add-gpios: gpio specifier that controls the mixer.
   - axentia,loop1-gpios: gpio specifier that controls loop relays on channel 1.
@@ -43,6 +42,12 @@ the PCM5142 codec.
 
 Example:
 
+	&ssc0 {
+		#sound-dai-cells = <0>;
+
+		status = "okay";
+	};
+
 	&i2c {
 		codec: pcm5142@4c {
 			compatible = "ti,pcm5142";
@@ -77,7 +82,7 @@ Example:
 	sound {
 		compatible = "axentia,tse850-pcm5142";
 
-		axentia,ssc-controller = <&ssc0>;
+		axentia,cpu-dai = <&ssc0>;
 		axentia,audio-codec = <&codec>;
 
 		axentia,add-gpios = <&pioA 8 GPIO_ACTIVE_LOW>;

Documentation/devicetree/bindings/sound/es8328.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/es8328.txt b/Documentation/devicetree/bindings/sound/es8328.txt
index 30ea8a3..33fbf05 100644
--- a/Documentation/devicetree/bindings/sound/es8328.txt
+++ b/Documentation/devicetree/bindings/sound/es8328.txt
@@ -4,7 +4,7 @@ This device supports both I2C and SPI.
 
 Required properties:
 
-  - compatible : "everest,es8328"
+  - compatible  : Should be "everest,es8328" or "everest,es8388"
   - DVDD-supply : Regulator providing digital core supply voltage 1.8 - 3.6V
   - AVDD-supply : Regulator providing analog supply voltage 3.3V
   - PVDD-supply : Regulator providing digital IO supply voltage 1.8 - 3.6V

Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt b/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
index 3e623a7..9800a56 100644
--- a/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
+++ b/Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
@@ -4,6 +4,7 @@ Required properties:
 - compatible = "mediatek,mt2701-audio";
 - reg: register location and size
 - interrupts: Should contain AFE interrupt
+- power-domains: should define the power domain
 - clock-names: should have these clock names:
 		"infra_sys_audio_clk",
 		"top_audio_mux1_sel",
@@ -58,6 +59,7 @@ Example:
 		      <0 0x112A0000 0 0x20000>;
 		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>,
 			     <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>;
+		power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
 		clocks = <&infracfg CLK_INFRA_AUDIO>,
 			 <&topckgen CLK_TOP_AUD_MUX1_SEL>,
 			 <&topckgen CLK_TOP_AUD_MUX2_SEL>,

Documentation/devicetree/bindings/sound/nau8540.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/nau8540.txt b/Documentation/devicetree/bindings/sound/nau8540.txt
new file mode 100644
index 0000000..307a765
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/nau8540.txt
@@ -0,0 +1,16 @@
+NAU85L40 audio CODEC
+
+This device supports I2C only.
+
+Required properties:
+
+  - compatible : "nuvoton,nau8540"
+
+  - reg : the I2C address of the device.
+
+Example:
+
+codec: nau8540@1c {
+       compatible = "nuvoton,nau8540";
+       reg = <0x1c>;
+};

Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt b/Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt
new file mode 100644
index 0000000..2539e1d
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/rockchip,rk3288-hdmi-analog.txt
@@ -0,0 +1,36 @@
+ROCKCHIP RK3288 with HDMI and analog audio
+
+Required properties:
+- compatible: "rockchip,rk3288-hdmi-analog"
+- 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 analog audio codec.
+- rockchip,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. For this driver the first string should always be
+		    "Analog".
+
+Optionnal properties:
+- rockchip,hp-en-gpios = The phandle of the GPIO that power up/down the
+  headphone (when the analog output is an headphone).
+- rockchip,hp-det-gpios = The phandle of the GPIO that detects the headphone
+  (when the analog output is an headphone).
+- pinctrl-names, pinctrl-0: Please refer to pinctrl-bindings.txt
+
+Example:
+
+sound {
+	compatible = "rockchip,rockchip-audio-es8388";
+	rockchip,model = "Analog audio output";
+	rockchip,i2s-controller = <&i2s>;
+	rockchip,audio-codec = <&es8388>;
+	rockchip,routing = "Analog", "LOUT2",
+			   "Analog", "ROUT2";
+	rockchip,hp-en-gpios = <&gpio8 0 GPIO_ACTIVE_HIGH>;
+	rockchip,hp-det-gpios = <&gpio7 7 GPIO_ACTIVE_HIGH>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&headphone>;
+};
+

Documentation/devicetree/bindings/sound/sun4i-i2s.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
index 7b526ec..f4adc58 100644
--- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt
@@ -7,6 +7,7 @@ Required properties:
 
 - compatible: should be one of the followings
    - "allwinner,sun4i-a10-i2s"
+   - "allwinner,sun6i-a31-i2s"
 - reg: physical base address of the controller and length of memory mapped
   region.
 - interrupts: should contain the I2S interrupt.
@@ -19,6 +20,10 @@ Required properties:
    - "mod" : module clock for the I2S controller
 - #sound-dai-cells : Must be equal to 0
 
+Required properties for the following compatibles:
+	- "allwinner,sun6i-a31-i2s"
+- resets: phandle to the reset line for this codec
+
 Example:
 
 i2s0: i2s@01c22400 {

Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt b/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt
new file mode 100644
index 0000000..399b1b4
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/sun8i-a33-codec.txt
@@ -0,0 +1,63 @@
+Allwinner SUN8I audio codec
+------------------------------------
+
+On Sun8i-A33 SoCs, the audio is separated in different parts:
+	  - A DAI driver. It uses the "sun4i-i2s" driver which is
+	  documented here:
+	  Documentation/devicetree/bindings/sound/sun4i-i2s.txt
+	  - An analog part of the codec which is handled as PRCM registers.
+	  See Documentation/devicetree/bindings/sound/sun8i-codec-analog.txt
+	  - An digital part of the codec which is documented in this current
+	  binding documentation.
+	  - And finally, an audio card which links all the above components.
+	  The simple-audio card will be used.
+	  See Documentation/devicetree/bindings/sound/simple-card.txt
+
+This bindings documentation exposes Sun8i codec (digital part).
+
+Required properties:
+- compatible: must be "allwinner,sun8i-a33-codec"
+- reg: must contain the registers location and length
+- interrupts: must contain the codec interrupt
+- clocks: a list of phandle + clock-specifer pairs, one for each entry
+  in clock-names.
+- clock-names: should contain followings:
+   - "bus": the parent APB clock for this controller
+   - "mod": the parent module clock
+
+Here is an example to add a sound card and the codec binding on sun8i SoCs that
+are similar to A33 using simple-card:
+
+	sound {
+		compatible = "simple-audio-card";
+		simple-audio-card,name = "sun8i-a33-audio";
+		simple-audio-card,format = "i2s";
+		simple-audio-card,frame-master = <&link_codec>;
+		simple-audio-card,bitclock-master = <&link_codec>;
+		simple-audio-card,mclk-fs = <512>;
+		simple-audio-card,aux-devs = <&codec_analog>;
+		simple-audio-card,routing =
+				"Left DAC", "Digital Left DAC",
+				"Right DAC", "Digital Right DAC";
+
+		simple-audio-card,cpu {
+			sound-dai = <&dai>;
+		};
+
+		link_codec: simple-audio-card,codec {
+			sound-dai = <&codec>;
+		};
+
+	soc@01c00000 {
+		[...]
+
+		audio-codec@1c22e00 {
+			#sound-dai-cells = <0>;
+			compatible = "allwinner,sun8i-a33-codec";
+			reg = <0x01c22e00 0x400>;
+			interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
+			clock-names = "bus", "mod";
+		};
+	};
+

Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt b/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt
index 0230c4d..fe0a65e 100644
--- a/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt
+++ b/Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt
@@ -10,6 +10,7 @@ Required properties:
   - compatible		: should be one of the following:
     - "allwinner,sun4i-a10-spdif": for the Allwinner A10 SoC
     - "allwinner,sun6i-a31-spdif": for the Allwinner A31 SoC
+    - "allwinner,sun8i-h3-spdif": for the Allwinner H3 SoC
 
   - reg			: Offset and length of the register set for the device.
 

Documentation/devicetree/bindings/sound/zte,zx-i2s.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt b/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt
index 7e5aa6f..292ad50 100644
--- a/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/zte,zx-i2s.txt
@@ -1,10 +1,12 @@
 ZTE ZX296702 I2S controller
 
 Required properties:
- - compatible : Must be "zte,zx296702-i2s"
+ - compatible : Must be one of:
+	"zte,zx296718-i2s", "zte,zx296702-i2s"
+	"zte,zx296702-i2s"
  - reg : Must contain I2S core's registers location and length
  - clocks : Pairs of phandle and specifier referencing the controller's clocks.
- - clock-names: "tx" for the clock to the I2S interface.
+ - clock-names: "wclk" for the wclk, "pclk" for the pclk to the I2S interface.
  - dmas: Pairs of phandle and specifier for the DMA channel that is used by
    the core. The core expects two dma channels for transmit.
  - dma-names : Must be "tx" and "rx"
@@ -16,12 +18,12 @@ please check:
 	* dma/dma.txt
 
 Example:
-	i2s0: i2s0@0b005000 {
+	i2s0: i2s@b005000 {
 		#sound-dai-cells = <0>;
-		compatible = "zte,zx296702-i2s";
+		compatible = "zte,zx296718-i2s", "zte,zx296702-i2s";
 		reg = <0x0b005000 0x1000>;
-		clocks = <&lsp0clk ZX296702_I2S0_DIV>;
-		clock-names = "tx";
+		clocks = <&audiocrm AUDIO_I2S0_WCLK>, <&audiocrm AUDIO_I2S0_PCLK>;
+		clock-names = "wclk", "pclk";
 		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
 		dmas = <&dma 5>, <&dma 6>;
 		dma-names = "tx", "rx";

Documentation/gpu/i915.rst

View file

diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index 117d2ab..7fb605a 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -144,6 +144,15 @@ High Definition Audio
 .. kernel-doc:: include/drm/i915_component.h
    :internal:
 
+Intel HDMI LPE Audio Support
+----------------------------
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
+   :doc: LPE Audio integration for HDMI or DP playback
+
+.. kernel-doc:: drivers/gpu/drm/i915/intel_lpe_audio.c
+   :internal:
+
 Panel Self Refresh PSR (PSR/SRD)
 --------------------------------
 

arch/arm/mach-s3c64xx/dev-audio.c

View file

diff --git a/arch/arm/mach-s3c64xx/dev-audio.c b/arch/arm/mach-s3c64xx/dev-audio.c
index b577833..247dcc0 100644
--- a/arch/arm/mach-s3c64xx/dev-audio.c
+++ b/arch/arm/mach-s3c64xx/dev-audio.c
@@ -106,9 +106,7 @@ static struct s3c_audio_pdata i2sv4_pdata = {
 	.dma_playback = DMACH_HSI_I2SV40_TX,
 	.dma_capture = DMACH_HSI_I2SV40_RX,
 	.type = {
-		.i2s = {
-			.quirks = QUIRK_PRI_6CHAN,
-		},
+		.quirks = QUIRK_PRI_6CHAN,
 	},
 };
 

drivers/gpu/drm/i915/Makefile

View file

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index 3dea46a..78711dd 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -122,6 +122,9 @@ i915-y += intel_gvt.o
 include $(src)/gvt/Makefile
 endif
 
+# LPE Audio for VLV and CHT
+i915-y += intel_lpe_audio.o
+
 obj-$(CONFIG_DRM_I915) += i915.o
 
 CFLAGS_i915_trace_points.o := -I$(src)

drivers/gpu/drm/i915/i915_drv.c

View file

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 728ca3e..188eb7f 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1139,7 +1139,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
 	if (IS_GEN5(dev_priv))
 		intel_gpu_ips_init(dev_priv);
 
-	i915_audio_component_init(dev_priv);
+	intel_audio_init(dev_priv);
 
 	/*
 	 * Some ports require correctly set-up hpd registers for detection to
@@ -1157,7 +1157,7 @@ static void i915_driver_register(struct drm_i915_private *dev_priv)
  */
 static void i915_driver_unregister(struct drm_i915_private *dev_priv)
 {
-	i915_audio_component_cleanup(dev_priv);
+	intel_audio_deinit(dev_priv);
 
 	intel_gpu_ips_teardown();
 	acpi_video_unregister();

drivers/gpu/drm/i915/i915_drv.h

View file

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 8493e19..029d5c3 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2140,6 +2140,12 @@ struct drm_i915_private {
 	/* Used to save the pipe-to-encoder mapping for audio */
 	struct intel_encoder *av_enc_map[I915_MAX_PIPES];
 
+	/* necessary resource sharing with HDMI LPE audio driver. */
+	struct {
+		struct platform_device *platdev;
+		int	irq;
+	} lpe_audio;
+
 	/*
 	 * NOTE: This is the dri1/ums dungeon, don't add stuff here. Your patch
 	 * will be rejected. Instead look for a better place.
@@ -3387,6 +3393,14 @@ extern int i915_restore_state(struct drm_device *dev);
 void i915_setup_sysfs(struct drm_i915_private *dev_priv);
 void i915_teardown_sysfs(struct drm_i915_private *dev_priv);
 
+/* intel_lpe_audio.c */
+int  intel_lpe_audio_init(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_teardown(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_irq_handler(struct drm_i915_private *dev_priv);
+void intel_lpe_audio_notify(struct drm_i915_private *dev_priv,
+			    void *eld, int port, int pipe, int tmds_clk_speed,
+			    bool dp_output, int link_rate);
+
 /* intel_i2c.c */
 extern int intel_setup_gmbus(struct drm_device *dev);
 extern void intel_teardown_gmbus(struct drm_device *dev);

drivers/gpu/drm/i915/i915_irq.c

View file

diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 07ca71c..f0880af 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1893,6 +1893,10 @@ static irqreturn_t valleyview_irq_handler(int irq, void *arg)
 		 * signalled in iir */
 		valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
+		if (iir & (I915_LPE_PIPE_A_INTERRUPT |
+			   I915_LPE_PIPE_B_INTERRUPT))
+			intel_lpe_audio_irq_handler(dev_priv);
+
 		/*
 		 * VLV_IIR is single buffered, and reflects the level
 		 * from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
@@ -1973,6 +1977,11 @@ static irqreturn_t cherryview_irq_handler(int irq, void *arg)
 		 * signalled in iir */
 		valleyview_pipestat_irq_ack(dev_priv, iir, pipe_stats);
 
+		if (iir & (I915_LPE_PIPE_A_INTERRUPT |
+			   I915_LPE_PIPE_B_INTERRUPT |
+			   I915_LPE_PIPE_C_INTERRUPT))
+			intel_lpe_audio_irq_handler(dev_priv);
+
 		/*
 		 * VLV_IIR is single buffered, and reflects the level
 		 * from PIPESTAT/PORT_HOTPLUG_STAT, hence clear it last.
@@ -2914,6 +2923,7 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
 	u32 pipestat_mask;
 	u32 enable_mask;
 	enum pipe pipe;
+	u32 val;
 
 	pipestat_mask = PLANE_FLIP_DONE_INT_STATUS_VLV |
 			PIPE_CRC_DONE_INTERRUPT_STATUS;
@@ -2930,6 +2940,12 @@ static void vlv_display_irq_postinstall(struct drm_i915_private *dev_priv)
 
 	WARN_ON(dev_priv->irq_mask != ~0);
 
+	val = (I915_LPE_PIPE_A_INTERRUPT |
+		I915_LPE_PIPE_B_INTERRUPT |
+		I915_LPE_PIPE_C_INTERRUPT);
+
+	enable_mask |= val;
+
 	dev_priv->irq_mask = ~enable_mask;
 
 	GEN5_IRQ_INIT(VLV_, dev_priv->irq_mask, enable_mask);

drivers/gpu/drm/i915/i915_reg.h

View file

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index c70c07a..4f15a3d 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -2058,6 +2058,22 @@ enum skl_disp_power_wells {
 #define I915_ASLE_INTERRUPT				(1<<0)
 #define I915_BSD_USER_INTERRUPT				(1<<25)
 
+#define I915_HDMI_LPE_AUDIO_BASE	(VLV_DISPLAY_BASE + 0x65000)
+#define I915_HDMI_LPE_AUDIO_SIZE	0x1000
+
+/* DisplayPort Audio w/ LPE */
+#define VLV_AUD_CHICKEN_BIT_REG		_MMIO(VLV_DISPLAY_BASE + 0x62F38)
+#define VLV_CHICKEN_BIT_DBG_ENABLE	(1 << 0)
+
+#define _VLV_AUD_PORT_EN_B_DBG		(VLV_DISPLAY_BASE + 0x62F20)
+#define _VLV_AUD_PORT_EN_C_DBG		(VLV_DISPLAY_BASE + 0x62F30)
+#define _VLV_AUD_PORT_EN_D_DBG		(VLV_DISPLAY_BASE + 0x62F34)
+#define VLV_AUD_PORT_EN_DBG(port)	_MMIO_PORT3((port) - PORT_B,	   \
+						    _VLV_AUD_PORT_EN_B_DBG, \
+						    _VLV_AUD_PORT_EN_C_DBG, \
+						    _VLV_AUD_PORT_EN_D_DBG)
+#define VLV_AMP_MUTE		        (1 << 1)
+
 #define GEN6_BSD_RNCID			_MMIO(0x12198)
 
 #define GEN7_FF_THREAD_MODE		_MMIO(0x20a0)

drivers/gpu/drm/i915/intel_audio.c

View file

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 49f1053..892169b 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/component.h>
 #include <drm/i915_component.h>
+#include <drm/intel_lpe_audio.h>
 #include "intel_drv.h"
 
 #include <drm/drmP.h>
@@ -623,13 +624,28 @@ void intel_audio_codec_enable(struct intel_encoder *intel_encoder,
 	dev_priv->av_enc_map[pipe] = intel_encoder;
 	mutex_unlock(&dev_priv->av_mutex);
 
-	/* audio drivers expect pipe = -1 to indicate Non-MST cases */
-	if (intel_encoder->type != INTEL_OUTPUT_DP_MST)
-		pipe = -1;
-
-	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
+	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) {
+		/* audio drivers expect pipe = -1 to indicate Non-MST cases */
+		if (intel_encoder->type != INTEL_OUTPUT_DP_MST)
+			pipe = -1;
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
 						 (int) port, (int) pipe);
+	}
+
+	switch (intel_encoder->type) {
+	case INTEL_OUTPUT_HDMI:
+		intel_lpe_audio_notify(dev_priv, connector->eld, port, pipe,
+				       crtc_state->port_clock,
+				       false, 0);
+		break;
+	case INTEL_OUTPUT_DP:
+		intel_lpe_audio_notify(dev_priv, connector->eld, port, pipe,
+				       adjusted_mode->crtc_clock,
+				       true, crtc_state->port_clock);
+		break;
+	default:
+		break;
+	}
 }
 
 /**
@@ -656,13 +672,15 @@ void intel_audio_codec_disable(struct intel_encoder *intel_encoder)
 	dev_priv->av_enc_map[pipe] = NULL;
 	mutex_unlock(&dev_priv->av_mutex);
 
-	/* audio drivers expect pipe = -1 to indicate Non-MST cases */
-	if (intel_encoder->type != INTEL_OUTPUT_DP_MST)
-		pipe = -1;
-
-	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify)
+	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) {
+		/* audio drivers expect pipe = -1 to indicate Non-MST cases */
+		if (intel_encoder->type != INTEL_OUTPUT_DP_MST)
+			pipe = -1;
 		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,
 						 (int) port, (int) pipe);
+	}
+
+	intel_lpe_audio_notify(dev_priv, NULL, port, pipe, 0, false, 0);
 }
 
 /**
@@ -931,3 +949,28 @@ void i915_audio_component_cleanup(struct drm_i915_private *dev_priv)
 	component_del(dev_priv->drm.dev, &i915_audio_component_bind_ops);
 	dev_priv->audio_component_registered = false;
 }
+
+/**
+ * intel_audio_init() - Initialize the audio driver either using
+ * component framework or using lpe audio bridge
+ * @dev_priv: the i915 drm device private data
+ *
+ */
+void intel_audio_init(struct drm_i915_private *dev_priv)
+{
+	if (intel_lpe_audio_init(dev_priv) < 0)
+		i915_audio_component_init(dev_priv);
+}
+
+/**
+ * intel_audio_deinit() - deinitialize the audio driver
+ * @dev_priv: the i915 drm device private data
+ *
+ */
+void intel_audio_deinit(struct drm_i915_private *dev_priv)
+{
+	if ((dev_priv)->lpe_audio.platdev != NULL)
+		intel_lpe_audio_teardown(dev_priv);
+	else
+		i915_audio_component_cleanup(dev_priv);
+}

drivers/gpu/drm/i915/intel_drv.h

View file

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 03a2112..ba2323f 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -1196,6 +1196,8 @@ void intel_audio_codec_enable(struct intel_encoder *encoder,
 void intel_audio_codec_disable(struct intel_encoder *encoder);
 void i915_audio_component_init(struct drm_i915_private *dev_priv);
 void i915_audio_component_cleanup(struct drm_i915_private *dev_priv);
+void intel_audio_init(struct drm_i915_private *dev_priv);
+void intel_audio_deinit(struct drm_i915_private *dev_priv);
 
 /* intel_display.c */
 enum transcoder intel_crtc_pch_transcoder(struct intel_crtc *crtc);

drivers/gpu/drm/i915/intel_hdmi.c

View file

diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index fb88e32..02d50e3 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -36,6 +36,7 @@
 #include <drm/drm_edid.h>
 #include "intel_drv.h"
 #include <drm/i915_drm.h>
+#include <drm/intel_lpe_audio.h>
 #include "i915_drv.h"
 
 static struct drm_device *intel_hdmi_to_dev(struct intel_hdmi *intel_hdmi)

drivers/gpu/drm/i915/intel_lpe_audio.c

View file

diff --git a/drivers/gpu/drm/i915/intel_lpe_audio.c b/drivers/gpu/drm/i915/intel_lpe_audio.c
new file mode 100644
index 0000000..7a5b41b
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_lpe_audio.c
@@ -0,0 +1,392 @@
+/*
+ * Copyright © 2016 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:

This diff is incomplete. Download the complete patch.