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

021f163d · Linus Torvalds <[email protected]> · 2016-03-18 10:05:46 -07:00

Pull sound updates from Takashi Iwai:
 "After a heavy storm by syzkaller in 4.5 cycle, we have relatively few
  changes in the core at this time while a lot of changes are found in
  the driver side, unsurprisingly.  Below are some highlights:

  ALSA core:
   - A few more hardening in ALSA timer codes
   - An extension of sequencer API for advertising the card / pid
   - Small fixes in compress-offload and jack layers

  HD-audio:
   - Dynamic PCM assignment in HDMI/DP codec; preparation for upcoming
     DP-MST support
   - Lots of code refactoring for sharing with ASoC SKL driver
   - Regression fixes for Intel HDMI/DP
   - Fixups for CX20724 codec, Lenovo AiO

  USB-audio:
   - Add quirk_alias option to make quirk debugging easier
   - Fixes for possible Oops by malformed firmware

  Firewire:
   - Add support for FW-1804 in tascam driver
   - Improvements / changes in card registration, multi stream handling,
     etc for DICE
   - Lots of code refactoring

  ASoC:
   - Enhancements of still ongoing topology API
   - Lots of commits for Intel Skylake support including HDMI support
   - A few Intel Atom driver updates for recent devices
   - Lots of improvements to the Renesas drivers
   - Capture support for Qualcomm drivers
   - Support for TI DaVinci DRA7xxx devices
   - New machine drivers for Freescale systems with Cirrus CODECs,
     Mediatek systems with RT5650 CODECs
   - New CPU drivers for Allwinner S/PDIF controllers
   - New CODEC drivers for Maxim MAX9867 and MAX98926 and Realtek RT5514"

* tag 'sound-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (291 commits)
  ALSA: hda - Fix mutex deadlock at HDMI/DP hotplug
  ALSA: ctl: change return value in compatibility layer so that it's the same value in core implementation
  ALSA: mixart: silence an uninitialized variable warning
  ALSA: usb-audio: Add sanity checks for endpoint accesses
  ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
  ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk()
  ALSA: hda - Limit i915 HDMI binding only for HSW and later
  ALSA: hda - Fix unconditional GPIO toggle via automute
  ALSA: mixart: silence unitialized variable warnings
  ALSA: hda - Fixes double fault in nvhdmi_chmap_cea_alloc_validate_get_type
  ALSA: intel8x0: Add clock quirk entry for AD1981B on IBM ThinkPad X41.
  ALSA: hda - Add new GPU codec ID 0x10de0082 to snd-hda
  ASoC: rsnd: add simplified module explanation
  ASoC: hdac_hdmi: Add broxton device ID
  ASoC: Intel: Bxtn: Add Broxton PCI ID
  ASoC: Intel: Skylake: Move Skylake dsp ops & loader ops
  ASoC: Intel: add dmabuffer to common sst_dsp
  ASoC: Intel: Skylake: Unstatify skl_dsp_enable_core
  ASoC: Intel: Skylake: Fix whitepsace issues
  ASoC: Intel: Skylake: Move module id defines
  ...

Commit: 021f163d696caed5a336fa1569efdd22216da340
Parents: 9ea44635 · 222bde03

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

Changes

202 files changed · +12770 −4360

File	Status	Add	Del	Content
Documentation/devicetree/bindings/sound/adi,adau17x1.txt	added	+24	−0	View file
Documentation/devicetree/bindings/sound/fsl-asoc-card.txt	modified	+9	−0	View file
Documentation/devicetree/bindings/sound/max9867.txt	added	+17	−0	View file
Documentation/devicetree/bindings/sound/max98926.txt	added	+32	−0	View file
Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt	added	+15	−0	View file
Documentation/devicetree/bindings/sound/mt8173-rt5650.txt	added	+15	−0	View file
Documentation/devicetree/bindings/sound/pcm179x.txt	modified	+10	−1	View file
Documentation/devicetree/bindings/sound/renesas,rsnd.txt	modified	+340	−0	View file
Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/sound/rockchip-i2s.txt	modified	+1	−0	View file
Documentation/devicetree/bindings/sound/rockchip-spdif.txt	modified	+6	−2	View file
Documentation/devicetree/bindings/sound/rt5514.txt	added	+25	−0	View file
Documentation/devicetree/bindings/sound/rt5616.txt	modified	+6	−0	View file
Documentation/devicetree/bindings/sound/rt5640.txt	modified	+3	−0	View file
Documentation/devicetree/bindings/sound/sunxi,sun4i-spdif.txt	added	+39	−0	View file
Documentation/devicetree/bindings/sound/ti,ads117x.txt	added	+11	−0	View file
Documentation/sound/alsa/ALSA-Configuration.txt	modified	+9	−0	View file
Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt	added	+74	−0	View file
drivers/misc/atmel-ssc.c	modified	+1	−0	View file
include/drm/drm_edid.h	modified	+12	−0	View file
include/linux/platform_data/adau17x1.h	modified	+1	−1	View file
include/sound/hda_chmap.h	added	+76	−0	View file
include/sound/hdaudio.h	modified	+2	−0	View file
include/sound/jack.h	modified	+14	−9	View file
include/sound/pcm.h	modified	+2	−0	View file
include/sound/soc-topology.h	modified	+10	−11	View file
include/sound/soc.h	modified	+1	−1	View file
include/uapi/sound/asequencer.h	modified	+4	−8	View file
include/uapi/sound/asound.h	modified	+4	−0	View file
sound/core/Kconfig	modified	+6	−3	View file
sound/core/compress_offload.c	modified	+8	−4	View file
sound/core/control_compat.c	modified	+1	−1	View file
sound/core/jack.c	modified	+20	−3	View file
sound/core/pcm_lib.c	modified	+1	−1	View file
sound/core/pcm_misc.c	modified	+30	−0	View file
sound/core/seq/seq_clientmgr.c	modified	+14	−0	View file
sound/core/seq/seq_clientmgr.h	modified	+2	−0	View file
sound/core/timer.c	modified	+123	−145	View file
sound/drivers/mts64.c	modified	+44	−52	View file
sound/drivers/portman2x4.c	modified	+43	−51	View file
sound/firewire/bebob/bebob.c	modified	+16	−5	View file
sound/firewire/bebob/bebob.h	modified	+1	−4	View file
sound/firewire/bebob/bebob_midi.c	modified	+12	−4	View file
sound/firewire/bebob/bebob_pcm.c	modified	+20	−8	View file
sound/firewire/bebob/bebob_stream.c	modified	+4	−54	View file
sound/firewire/dice/dice-midi.c	modified	+21	−10	View file
sound/firewire/dice/dice-pcm.c	modified	+113	−165	View file
sound/firewire/dice/dice-stream.c	modified	+285	−183	View file
sound/firewire/dice/dice-transaction.c	modified	+1	−55	View file
sound/firewire/dice/dice.c	modified	+44	−64	View file
sound/firewire/dice/dice.h	modified	+29	−12	View file
sound/firewire/fireworks/fireworks.c	modified	+3	−0	View file
sound/firewire/fireworks/fireworks_stream.c	modified	+2	−4	View file
sound/firewire/oxfw/oxfw-scs1x.c	modified	+25	−10	View file
sound/hda/Makefile	modified	+1	−1	View file
sound/hda/hdac_device.c	modified	+16	−0	View file
sound/hda/hdac_i915.c	modified	+12	−2	View file
sound/hda/hdac_regmap.c	modified	+46	−23	View file
sound/hda/hdmi_chmap.c	added	+791	−0	View file
sound/mips/Kconfig	modified	+0	−12	View file
sound/mips/Makefile	modified	+0	−2	View file
sound/mips/au1x00.c	deleted	+0	−734	View before deletion
sound/pci/Kconfig	modified	+1	−1	View file
sound/pci/hda/Kconfig	modified	+1	−1	View file
sound/pci/hda/hda_eld.c	modified	+3	−28	View file
sound/pci/hda/hda_intel.c	modified	+1	−1	View file
sound/pci/hda/patch_cirrus.c	modified	+6	−2	View file
sound/pci/hda/patch_conexant.c	modified	+6	−1	View file
sound/pci/hda/patch_hdmi.c	modified	+630	−821	View file
sound/pci/hda/patch_realtek.c	modified	+1	−0	View file
sound/pci/hda/thinkpad_helper.c	modified	+2	−15	View file
sound/pci/intel8x0.c	modified	+1	−0	View file
sound/pci/mixart/mixart.c	modified	+1	−1	View file
sound/pci/mixart/mixart_mixer.c	modified	+2	−2	View file
sound/soc/Kconfig	modified	+1	−1	View file
sound/soc/atmel/atmel_ssc_dai.c	modified	+18	−9	View file
sound/soc/bcm/bcm2835-i2s.c	modified	+64	−220	View file
sound/soc/codecs/Kconfig	modified	+35	−3	View file
sound/soc/codecs/Makefile	modified	+10	−0	View file
sound/soc/codecs/ab8500-codec.c	modified	+0	−1	View file
sound/soc/codecs/adau1761-i2c.c	modified	+13	−1	View file
sound/soc/codecs/adau1761-spi.c	modified	+13	−1	View file
sound/soc/codecs/adau1761.c	modified	+9	−1	View file
sound/soc/codecs/adau1781-i2c.c	modified	+10	−0	View file
sound/soc/codecs/adau1781-spi.c	modified	+10	−0	View file
sound/soc/codecs/adau1781.c	modified	+1	−1	View file
sound/soc/codecs/ads117x.c	modified	+12	−0	View file
sound/soc/codecs/arizona.c	modified	+21	−50	View file
sound/soc/codecs/arizona.h	modified	+3	−1	View file
sound/soc/codecs/cs42xx8.c	modified	+8	−2	View file
sound/soc/codecs/cs47l24.c	modified	+118	−5	View file
sound/soc/codecs/hdac_hdmi.c	modified	+1096	−123	View file
sound/soc/codecs/hdac_hdmi.h	added	+6	−0	View file
sound/soc/codecs/max9867.c	added	+546	−0	View file
sound/soc/codecs/max9867.h	added	+83	−0	View file
sound/soc/codecs/max98926.c	added	+606	−0	View file
sound/soc/codecs/max98926.h	added	+848	−0	View file
sound/soc/codecs/nau8825.c	modified	+126	−43	View file
sound/soc/codecs/nau8825.h	modified	+15	−1	View file
sound/soc/codecs/pcm179x-i2c.c	added	+73	−0	View file
sound/soc/codecs/pcm179x-spi.c	added	+72	−0	View file
sound/soc/codecs/pcm179x.c	modified	+14	−42	View file
sound/soc/codecs/pcm179x.h	modified	+5	−4	View file
sound/soc/codecs/pcm3168a.c	modified	+6	−2	View file
sound/soc/codecs/rt298.c	modified	+6	−1	View file
sound/soc/codecs/rt298.h	modified	+8	−0	View file
sound/soc/codecs/rt5514.c	added	+982	−0	View file
sound/soc/codecs/rt5514.h	added	+252	−0	View file
sound/soc/codecs/rt5616.c	modified	+228	−186	View file
sound/soc/codecs/rt5640.c	modified	+61	−30	View file
sound/soc/codecs/rt5640.h	modified	+2	−0	View file
sound/soc/codecs/rt5645.c	modified	+10	−5	View file
sound/soc/codecs/rt5659.c	modified	+1	−1	View file
sound/soc/codecs/ssm4567.c	modified	+5	−0	View file
sound/soc/codecs/wm5102.c	modified	+88	−5	View file
sound/soc/codecs/wm5110.c	modified	+64	−11	View file
sound/soc/codecs/wm8974.c	modified	+93	−0	View file
sound/soc/codecs/wm8997.c	modified	+1	−1	View file
sound/soc/codecs/wm8998.c	modified	+1	−1	View file
sound/soc/codecs/wm_adsp.c	modified	+71	−60	View file
sound/soc/codecs/wm_adsp.h	modified	+3	−5	View file
sound/soc/davinci/Kconfig	modified	+2	−1	View file
sound/soc/davinci/davinci-mcasp.c	modified	+12	−0	View file
sound/soc/fsl/Kconfig	modified	+2	−2	View file
sound/soc/fsl/fsl-asoc-card.c	modified	+22	−4	View file
sound/soc/fsl/fsl_sai.c	modified	+2	−1	View file
sound/soc/fsl/fsl_ssi.c	modified	+22	−20	View file
sound/soc/fsl/mpc5200_psc_ac97.c	modified	+2	−1	View file
sound/soc/intel/Kconfig	modified	+4	−0	View file
sound/soc/intel/atom/sst/sst_acpi.c	modified	+4	−0	View file
sound/soc/intel/atom/sst/sst_ipc.c	modified	+0	−2	View file
sound/soc/intel/boards/bytcr_rt5640.c	modified	+34	−16	View file
sound/soc/intel/boards/cht_bsw_max98090_ti.c	modified	+2	−15	View file
sound/soc/intel/boards/cht_bsw_rt5645.c	modified	+14	−14	View file
sound/soc/intel/boards/skl_nau88l25_max98357a.c	modified	+105	−17	View file
sound/soc/intel/boards/skl_nau88l25_ssm4567.c	modified	+112	−18	View file
sound/soc/intel/boards/skl_rt286.c	modified	+104	−9	View file
sound/soc/intel/common/sst-acpi.h	modified	+3	−0	View file
sound/soc/intel/common/sst-dsp-priv.h	modified	+1	−0	View file
sound/soc/intel/common/sst-match-acpi.c	modified	+40	−5	View file
sound/soc/intel/skylake/skl-messages.c	modified	+109	−15	View file
sound/soc/intel/skylake/skl-nhlt.c	modified	+34	−0	View file
sound/soc/intel/skylake/skl-pcm.c	modified	+98	−8	View file
sound/soc/intel/skylake/skl-sst-dsp.c	modified	+7	−7	View file
sound/soc/intel/skylake/skl-sst-dsp.h	modified	+6	−1	View file
sound/soc/intel/skylake/skl-sst.c	modified	+0	−3	View file
sound/soc/intel/skylake/skl-topology.c	modified	+203	−5	View file
sound/soc/intel/skylake/skl-topology.h	modified	+27	−0	View file
sound/soc/intel/skylake/skl-tplg-interface.h	modified	+2	−1	View file
sound/soc/intel/skylake/skl.c	modified	+88	−0	View file
sound/soc/intel/skylake/skl.h	modified	+14	−1	View file
sound/soc/mediatek/Kconfig	modified	+21	−1	View file
sound/soc/mediatek/Makefile	modified	+2	−0	View file
sound/soc/mediatek/mt8173-rt5650-rt5514.c	added	+258	−0	View file
sound/soc/mediatek/mt8173-rt5650-rt5676.c	modified	+13	−5	View file
sound/soc/mediatek/mt8173-rt5650.c	added	+236	−0	View file
sound/soc/mediatek/mtk-afe-common.h	modified	+1	−0	View file
sound/soc/mediatek/mtk-afe-pcm.c	modified	+38	−9	View file
sound/soc/mxs/mxs-saif.c	modified	+1	−1	View file
sound/soc/omap/omap-hdmi-audio.c	modified	+1	−0	View file
sound/soc/pxa/brownstone.c	modified	+0	−2	View file
sound/soc/qcom/Kconfig	modified	+5	−2	View file
sound/soc/qcom/apq8016_sbc.c	modified	+7	−3	View file
sound/soc/qcom/lpass-apq8016.c	modified	+24	−7	View file
sound/soc/qcom/lpass-cpu.c	modified	+114	−32	View file
sound/soc/qcom/lpass-ipq806x.c	modified	+9	−2	View file
sound/soc/qcom/lpass-lpaif-reg.h	modified	+83	−33	View file
sound/soc/qcom/lpass-platform.c	modified	+147	−97	View file
sound/soc/qcom/lpass.h	modified	+7	−3	View file
sound/soc/rockchip/rockchip_i2s.c	modified	+13	−0	View file
sound/soc/rockchip/rockchip_spdif.c	modified	+12	−5	View file
sound/soc/samsung/s3c-i2s-v2.c	modified	+1	−1	View file
sound/soc/samsung/s3c-i2s-v2.h	modified	+1	−1	View file
sound/soc/sh/rcar/adg.c	modified	+119	−99	View file
sound/soc/sh/rcar/cmd.c	modified	+12	−6	View file
sound/soc/sh/rcar/core.c	modified	+119	−41	View file
sound/soc/sh/rcar/ctu.c	modified	+272	−9	View file
sound/soc/sh/rcar/dma.c	modified	+29	−27	View file
sound/soc/sh/rcar/dvc.c	modified	+28	−5	View file
sound/soc/sh/rcar/gen.c	modified	+37	−19	View file
sound/soc/sh/rcar/mix.c	modified	+2	−2	View file
sound/soc/sh/rcar/rsnd.h	modified	+86	−29	View file
sound/soc/sh/rcar/rsrc-card.c	modified	+18	−9	View file
sound/soc/sh/rcar/src.c	modified	+70	−101	View file
sound/soc/sh/rcar/ssi.c	modified	+174	−160	View file
sound/soc/sh/rcar/ssiu.c	modified	+11	−9	View file
sound/soc/soc-core.c	modified	+4	−4	View file
sound/soc/soc-dapm.c	modified	+2	−2	View file
sound/soc/soc-pcm.c	modified	+12	−12	View file
sound/soc/soc-topology.c	modified	+154	−86	View file
sound/soc/sunxi/Kconfig	modified	+8	−0	View file
sound/soc/sunxi/Makefile	modified	+1	−0	View file
sound/soc/sunxi/sun4i-spdif.c	added	+550	−0	View file
sound/usb/card.c	modified	+53	−3	View file
sound/usb/clock.c	modified	+2	−0	View file
sound/usb/endpoint.c	modified	+3	−0	View file
sound/usb/midi.c	modified	+9	−6	View file
sound/usb/midi.h	modified	+12	−2	View file
sound/usb/mixer_quirks.c	modified	+4	−0	View file
sound/usb/pcm.c	modified	+2	−0	View file
sound/usb/quirks.c	modified	+35	−23	View file
sound/usb/quirks.h	modified	+2	−1	View file

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

Documentation/devicetree/bindings/sound/adi,adau17x1.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/adi,adau17x1.txt b/Documentation/devicetree/bindings/sound/adi,adau17x1.txt
new file mode 100644
index 0000000..8dbce0e
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/adi,adau17x1.txt
@@ -0,0 +1,24 @@
+Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781
+
+Required properties:
+
+ - compatible:		Should contain one of the following:
+			"adi,adau1361"
+			"adi,adau1461"
+			"adi,adau1761"
+			"adi,adau1961"
+			"adi,adau1381"
+			"adi,adau1781"
+
+ - reg:			The i2c address. Value depends on the state of ADDR0
+			and ADDR1, as wired in hardware.
+
+Examples:
+#include <dt-bindings/sound/adau17x1.h>
+
+	i2c_bus {
+		adau1361@38 {
+			compatible = "adi,adau1761";
+			reg = <0x38>;
+		};
+	};

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
index 4da41bf..ceaef51 100644
--- a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
@@ -24,6 +24,9 @@ The compatible list for this generic sound card currently:
 
  "fsl,imx-audio-cs42888"
 
+ "fsl,imx-audio-cs427x"
+ (compatible with CS4271 and CS4272)
+
  "fsl,imx-audio-wm8962"
  (compatible with Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt)
 
@@ -63,6 +66,12 @@ Optional properties:
   - audio-asrc		: The phandle of ASRC. It can be absent if there's no
 			  need to add ASRC support via DPCM.
 
+Optional unless SSI is selected as a CPU DAI:
+
+  - mux-int-port	: The internal port of the i.MX audio muxer (AUDMUX)
+
+  - mux-ext-port	: The external port of the i.MX audio muxer
+
 Example:
 sound-cs42888 {
 	compatible = "fsl,imx-audio-cs42888";

Documentation/devicetree/bindings/sound/max9867.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/max9867.txt b/Documentation/devicetree/bindings/sound/max9867.txt
new file mode 100644
index 0000000..394cd4e
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/max9867.txt
@@ -0,0 +1,17 @@
+max9867 codec
+
+This device supports I2C mode only.
+
+Required properties:
+
+- compatible : "maxim,max9867"
+- reg : The chip select number on the I2C bus
+
+Example:
+
+&i2c {
+	max9867: max9867@0x18 {
+		compatible = "maxim,max9867";
+		reg = <0x18>;
+	};
+};

Documentation/devicetree/bindings/sound/max98926.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/max98926.txt b/Documentation/devicetree/bindings/sound/max98926.txt
new file mode 100644
index 0000000..0b7f4e4
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/max98926.txt
@@ -0,0 +1,32 @@
+max98926 audio CODEC
+
+This device supports I2C.
+
+Required properties:
+
+  - compatible : "maxim,max98926"
+
+  - vmon-slot-no : slot number used to send voltage information
+                   or in inteleave mode this will be used as
+                   interleave slot.
+
+  - imon-slot-no : slot number used to send current information
+
+  - interleave-mode : When using two MAX98926 in a system it is
+                      possible to create ADC data that that will
+                      overflow the frame size. Digital Audio Interleave
+                      mode provides a means to output VMON and IMON data
+                      from two devices on a single DOUT line when running
+                      smaller frames sizes such as 32 BCLKS per LRCLK or
+                      48 BCLKS per LRCLK.
+
+  - reg : the I2C address of the device for I2C
+
+Example:
+
+codec: max98926@1a {
+   compatible = "maxim,max98926";
+   vmon-slot-no = <0>;
+   imon-slot-no = <2>;
+   reg = <0x1a>;
+};

Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt
new file mode 100644
index 0000000..e8b3c80
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt
@@ -0,0 +1,15 @@
+MT8173 with RT5650 RT5514 CODECS
+
+Required properties:
+- compatible : "mediatek,mt8173-rt5650-rt5514"
+- mediatek,audio-codec: the phandles of rt5650 and rt5514 codecs
+- mediatek,platform: the phandle of MT8173 ASoC platform
+
+Example:
+
+	sound {
+		compatible = "mediatek,mt8173-rt5650-rt5514";
+		mediatek,audio-codec = <&rt5650 &rt5514>;
+		mediatek,platform = <&afe>;
+	};
+

Documentation/devicetree/bindings/sound/mt8173-rt5650.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
new file mode 100644
index 0000000..fe5a5ef
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
@@ -0,0 +1,15 @@
+MT8173 with RT5650 CODECS
+
+Required properties:
+- compatible : "mediatek,mt8173-rt5650"
+- mediatek,audio-codec: the phandles of rt5650 codecs
+- mediatek,platform: the phandle of MT8173 ASoC platform
+
+Example:
+
+	sound {
+		compatible = "mediatek,mt8173-rt5650";
+		mediatek,audio-codec = <&rt5650>;
+		mediatek,platform = <&afe>;
+	};
+

Documentation/devicetree/bindings/sound/pcm179x.txt

View file

diff --git a/Documentation/devicetree/bindings/sound/pcm179x.txt b/Documentation/devicetree/bindings/sound/pcm179x.txt
index 4ae70d3..436c2b2 100644
--- a/Documentation/devicetree/bindings/sound/pcm179x.txt
+++ b/Documentation/devicetree/bindings/sound/pcm179x.txt
@@ -1,6 +1,6 @@
 Texas Instruments pcm179x DT bindings
 
-This driver supports the SPI bus.
+This driver supports both the I2C and SPI bus.
 
 Required properties:
 
@@ -9,6 +9,11 @@ Required properties:
 For required properties on SPI, please consult
 Documentation/devicetree/bindings/spi/spi-bus.txt
 
+Required properties on I2C:
+
+ - reg: the I2C address
+
+
 Examples:
 
 	codec_spi: 1792a@0 {
@@ -16,3 +21,7 @@ Examples:
 		spi-max-frequency = <600000>;
 	};
 
+	codec_i2c: 1792a@4c {
+		compatible = "ti,pcm1792a";
+		reg = <0x4c>;
+	};

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

View file

diff --git a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
index 8ee0fa9..c7b29df 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsnd.txt
@@ -1,6 +1,337 @@
 Renesas R-Car sound
 
+=============================================
+* Modules
+=============================================
+
+Renesas R-Car sound is constructed from below modules
+(for Gen2 or later)
+
+ SCU		: Sampling Rate Converter Unit
+  - SRC		: Sampling Rate Converter
+  - CMD
+   - CTU	: Channel Transfer Unit
+   - MIX	: Mixer
+   - DVC	: Digital Volume and Mute Function
+ SSIU		: Serial Sound Interface Unit
+ SSI		: Serial Sound Interface
+
+See detail of each module's channels, connection, limitation on datasheet
+
+=============================================
+* Multi channel
+=============================================
+
+Multi channel is supported by Multi-SSI, or TDM-SSI.
+
+ Multi-SSI	: 6ch case, you can use stereo x 3 SSI
+ TDM-SSI	: 6ch case, you can use TDM
+
+=============================================
+* Enable/Disable each modules
+=============================================
+
+See datasheet to check SRC/CTU/MIX/DVC connect-limitation.
+DT controls enabling/disabling module.
+${LINUX}/arch/arm/boot/dts/r8a7790-lager.dts can be good example.
+This is example of
+
+Playback: [MEM] -> [SRC2] -> [DVC0] -> [SSIU0/SSI0] -> [codec]
+Capture:  [MEM] <- [DVC1] <- [SRC3] <- [SSIU1/SSI1] <- [codec]
+
+	&rcar_sound {
+		...
+		rcar_sound,dai {
+			dai0 {
+				playback = <&ssi0 &src2 &dvc0>;
+				capture  = <&ssi1 &src3 &dvc1>;
+			};
+		};
+	};
+
+You can use below.
+${LINUX}/arch/arm/boot/dts/r8a7790.dts can be good example.
+
+	&src0	&ctu00	&mix0	&dvc0	&ssi0
+	&src1	&ctu01	&mix1	&dvc1	&ssi1
+	&src2	&ctu02			&ssi2
+	&src3	&ctu03			&ssi3
+	&src4				&ssi4
+	&src5	&ctu10			&ssi5
+	&src6	&ctu11			&ssi6
+	&src7	&ctu12			&ssi7
+	&src8	&ctu13			&ssi8
+	&src9				&ssi9
+
+=============================================
+* SRC (Sampling Rate Converter)
+=============================================
+
+ [xx]Hz        [yy]Hz
+ ------> [SRC] ------>
+
+SRC can convert [xx]Hz to [yy]Hz. Then, it has below 2 modes
+
+ Asynchronous mode:	input data / output data are based on different clocks.
+			you can use this mode on Playback / Capture
+ Synchronous mode:	input data / output data are based on same clocks.
+			This mode will be used if system doesn't have its input clock,
+			for example digital TV case.
+			you can use this mode on Playback
+
+------------------
+**     Asynchronous mode
+------------------
+
+You need to use "renesas,rsrc-card" sound card for it.
+example)
+
+	sound {
+		compatible = "renesas,rsrc-card";
+		...
+		/*
+		 * SRC Asynchronous mode setting
+		 * Playback:
+		 * All input data will be converted to 48kHz
+		 * Capture:
+		 * Inputed 48kHz data will be converted to
+		 * system specified Hz
+		 */
+		convert-rate = <48000>;
+		...
+		cpu {
+			sound-dai = <&rcar_sound>;
+		};
+		codec {
+			...
+		};
+	};
+
+------------------
+**     Synchronous mode
+------------------
+
+	> amixer set "SRC Out Rate" on
+	> aplay xxxx.wav
+	> amixer set "SRC Out Rate" 48000
+	> amixer set "SRC Out Rate" 44100
+
+=============================================
+* CTU (Channel Transfer Unit)
+=============================================
+
+ [xx]ch        [yy]ch
+ ------> [CTU] -------->
+
+CTU can convert [xx]ch to [yy]ch, or exchange outputed channel.
+CTU conversion needs matrix settings.
+For more detail information, see below
+
+	Renesas R-Car datasheet
+	 - Sampling Rate Converter Unit (SCU)
+	  - SCU Operation
+	   - CMD Block
+	    - Functional Blocks in CMD
+
+	Renesas R-Car datasheet
+	 - Sampling Rate Converter Unit (SCU)
+	  - Register Description
+	   - CTUn Scale Value exx Register (CTUn_SVxxR)
+
+	${LINUX}/sound/soc/sh/rcar/ctu.c
+	 - comment of header
+
+You need to use "renesas,rsrc-card" sound card for it.
+example)
+
+	sound {
+		compatible = "renesas,rsrc-card";
+		...
+		/*
+		 * CTU setting
+		 * All input data will be converted to 2ch
+		 * as output data
+		 */
+		convert-channels = <2>;
+		...
+		cpu {
+			sound-dai = <&rcar_sound>;
+		};
+		codec {
+			...
+		};
+	};
+
+Ex) Exchange output channel
+ Input -> Output
+  1ch  ->  0ch
+  0ch  ->  1ch
+
+  example of using matrix
+	output 0ch = (input 0ch x 0) + (input 1ch x 1)
+	output 1ch = (input 0ch x 1) + (input 1ch x 0)
+
+	amixer set "CTU Reset" on
+	amixer set "CTU Pass" 9,10
+	amixer set "CTU SV0" 0,4194304
+	amixer set "CTU SV1" 4194304,0
+
+ example of changing connection
+	amixer set "CTU Reset" on
+	amixer set "CTU Pass" 2,1
+
+=============================================
+* MIX (Mixer)
+=============================================
+
+MIX merges 2 sounds path. You can see 2 sound interface on system,
+and these sounds will be merged by MIX.
+
+	aplay -D plughw:0,0 xxxx.wav &
+	aplay -D plughw:0,1 yyyy.wav
+
+You need to use "renesas,rsrc-card" sound card for it.
+Ex)
+	[MEM] -> [SRC1] -> [CTU02] -+-> [MIX0] -> [DVC0] -> [SSI0]
+	                            |
+	[MEM] -> [SRC2] -> [CTU03] -+
+
+	sound {
+		compatible = "renesas,rsrc-card";
+		...
+		cpu@0 {
+			sound-dai = <&rcar_sound 0>;
+		};
+		cpu@1 {
+			sound-dai = <&rcar_sound 1>;
+		};
+		codec {
+			...
+		};
+	};
+
+	&rcar_sound {
+		...
+		rcar_sound,dai {
+			dai0 {
+				playback = <&src1 &ctu02 &mix0 &dvc0 &ssi0>;
+			};
+			dai1 {
+				playback = <&src2 &ctu03 &mix0 &dvc0 &ssi0>;
+			};
+		};
+	};
+
+=============================================
+* DVC (Digital Volume and Mute Function)
+=============================================
+
+DVC controls Playback/Capture volume.
+
+Playback Volume
+	amixer set "DVC Out" 100%
+
+Capture Volume
+	amixer set "DVC In" 100%
+
+Playback Mute
+	amixer set "DVC Out Mute" on
+
+Capture Mute
+	amixer set "DVC In Mute" on
+
+Volume Ramp
+	amixer set "DVC Out Ramp Up Rate"   "0.125 dB/64 steps"
+	amixer set "DVC Out Ramp Down Rate" "0.125 dB/512 steps"
+	amixer set "DVC Out Ramp" on
+	aplay xxx.wav &
+	amixer set "DVC Out"  80%  // Volume Down
+	amixer set "DVC Out" 100%  // Volume Up
+
+=============================================
+* SSIU (Serial Sound Interface Unit)
+=============================================
+
+There is no DT settings for SSIU, because SSIU will be automatically
+selected via SSI.
+SSIU can avoid some under/over run error, because it has some buffer.
+But you can't use it if SSI was PIO mode.
+In DMA mode, you can select not to use SSIU by using "no-busif" on DT.
+
+	&ssi0 {
+		no-busif;
+	};
+
+=============================================
+* SSI (Serial Sound Interface)
+=============================================
+
+**  PIO mode
+
+You can use PIO mode which is for connection check by using.
+Note: The system will drop non-SSI modules in PIO mode
+even though if DT is selecting other modules.
+
+	&ssi0 {
+		pio-transfer
+	};
+
+** DMA mode without SSIU
+
+You can use DMA without SSIU.
+Note: under/over run, or noise are likely to occur
+
+	&ssi0 {
+		no-busif;
+	};
+
+** PIN sharing
+
+Each SSI can share WS pin. It is based on platform.
+This is example if SSI1 want to share WS pin with SSI0
+
+	&ssi1 {
+		shared-pin;
+	};
+
+** Multi-SSI
+
+You can use Multi-SSI.
+This is example of SSI0/SSI1/SSI2 (= for 6ch)
+
+	&rcar_sound {
+		...
+		rcar_sound,dai {
+			dai0 {
+				playback = <&ssi0 &ssi1 &ssi2 &src0 &dvc0>;
+			};
+		};
+	};
+
+** TDM-SSI
+
+You can use TDM with SSI.
+This is example of TDM 6ch.
+Driver can automatically switches TDM <-> stereo mode in this case.
+
+	rsnd_tdm: sound {
+		compatible = "simple-audio-card";
+		...
+		simple-audio-card,cpu {
+			/* system can use TDM 6ch */
+			dai-tdm-slot-num = <6>;
+			sound-dai = <&rcar_sound>;
+		};
+		simple-audio-card,codec {
+			...
+		};
+	};
+
+
+=============================================
 Required properties:
+=============================================
+
 - compatible			: "renesas,rcar_sound-<soctype>", fallbacks
 				  "renesas,rcar_sound-gen1" if generation1, and
 				  "renesas,rcar_sound-gen2" if generation2
@@ -64,7 +395,10 @@ DAI subnode properties:
 - playback			: list of playback modules
 - capture			: list of capture  modules
 
+
+=============================================
 Example:
+=============================================
 
 rcar_sound: sound@ec500000 {
 	#sound-dai-cells = <1>;
@@ -250,7 +584,9 @@ rcar_sound: sound@ec500000 {
 	};
 };
 
+=============================================
 Example: simple sound card
+=============================================
 
 	rsnd_ak4643: sound {
 		compatible = "simple-audio-card";
@@ -290,7 +626,9 @@ Example: simple sound card
 	shared-pin;
 };
 
+=============================================
 Example: simple sound card for TDM
+=============================================
 
 	rsnd_tdm: sound {
 		compatible = "simple-audio-card";
@@ -309,7 +647,9 @@ Example: simple sound card for TDM
 		};
 	};
 
+=============================================
 Example: simple sound card for Multi channel
+=============================================
 
 &rcar_sound {
 	pinctrl-0 = <&sound_pins &sound_clk_pins>;

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

View file

diff --git a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt b/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
index 2b2caa2..255ece3 100644
--- a/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
+++ b/Documentation/devicetree/bindings/sound/renesas,rsrc-card.txt
@@ -30,6 +30,7 @@ Optional subnode properties:
 - frame-inversion			: bool property. Add this if the
 					  dai-link uses frame clock inversion.
 - convert-rate				: platform specified sampling rate convert
+- convert-channels			: platform specified converted channel size (2 - 8 ch)
 - audio-prefix				: see audio-routing
 - audio-routing				: A list of the connections between audio components.
 					  Each entry is a pair of strings, the first being the connection's sink,

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

View file

diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt
index b7f3a93..6e86d8a 100644
--- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt
+++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt
@@ -9,6 +9,7 @@ Required properties:
    - "rockchip,rk3066-i2s": for rk3066
    - "rockchip,rk3188-i2s", "rockchip,rk3066-i2s": for rk3188
    - "rockchip,rk3288-i2s", "rockchip,rk3066-i2s": for rk3288
+   - "rockchip,rk3399-i2s", "rockchip,rk3066-i2s": for rk3399
 - reg: physical base address of the controller and length of memory mapped
   region.
 - interrupts: should contain the I2S interrupt.