Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e4510fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "There are no big surprising changes in this cycle, yet not too boring,
  either. The biggest change from diffstat POV is the removal of the
  legacy OSS driver codes that have been already disabled for a long
  time. This will bring a few trivial merge conflicts.

  As new features in ASoC side, there are two things: a new AC97 bus
  implementation and AMD Stony platform support. Both include the
  relevant changes shared with other subsystems, e.g. AC97 MFD changes
  and DRM AMD changes.

  Some other highlighted topics are:

   - A bunch of USB-audio drivers got the hardening against the
     malicious device accesses with a new helper code for endpoint
     sanity check

   - Lots of cleanups for ASoC Intel platform code, including support
     for their open source audio firmware

   - Continued ASoC core componentization works

   - Support for scaling MCLK with sample rate in ASoC simple-card

   - Stabler PCM hot-unplug capability, especially for ASoC usages"

* tag 'sound-4.15-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (302 commits)
  Documentation: sound: hd-audio: notes.rst
  ASoC: bcm2835: Support left/right justified and DSP modes
  ASoC: bcm2835: Enforce full symmetry
  ASoC: bcm2835: Support additional samplerates up to 384kHz
  ASoC: bcm2835: Add support for TDM modes
  ASoC: add mclk-fs support to audio graph card
  ASoC: add mclk-fs to audio graph card binding
  ASoC: rt5514: work around link error
  ASoC: rt5514: mark PM functions as __maybe_unused
  ASoC: rt5663: Check the JD status in the button pushing
  ASoC: amd: Modified DMA transfer Mechanism for Playback
  ASoC: rt5645: Wait for 400msec before concluding on value of RT5645_VENDOR_ID2
  ASoC: sun4i-codec: fixed 32bit audio capture support for H3/H2+
  ASoC: da7213: add support for DSP modes
  ASoC: sun8i-codec: Add a comment on the LRCK inversion
  ASoC: sun8i-codec: Set the BCLK divider
  ASoC: rt5663: Delay and retry reading rt5663 ID register
  ASoC: amd: use do_div rather than 64 bit division to fix 32 bit builds
  ASoC: cs42l56: Fix reset GPIO name in example DT binding
  ASoC: rt5514-spi: check irq status to schedule data copy in resume function
  ...
parents 4008e6a9 7087cb8f

Documentation/devicetree/bindings/mfd/arizona.txt

+1 −39
Original line number Diff line number Diff line
@@ -65,45 +65,6 @@ Optional properties: 
    a value that is out of range for a 16 bit register then the chip default

    will be used. If present exactly five values must be specified.



  - wlf,inmode : A list of INn_MODE register values, where n is the number

    of input signals. Valid values are 0 (Differential), 1 (Single-ended) and

    2 (Digital Microphone). If absent, INn_MODE registers set to 0 by default.

    If present, values must be specified less than or equal to the number of

    input signals. If values less than the number of input signals, elements

    that have not been specified are set to 0 by default. Entries are:

    <IN1, IN2, IN3, IN4> (wm5102, wm5110, wm8280, wm8997)

    <IN1A, IN2A, IN1B, IN2B> (wm8998, wm1814)

  - wlf,out-mono : A list of boolean values indicating whether each output is

    mono or stereo. Position within the list indicates the output affected

    (eg. First entry in the list corresponds to output 1). A non-zero value

    indicates a mono output. If present, the number of values should be less

    than or equal to the number of outputs, if less values are supplied the

    additional outputs will be treated as stereo.



  - wlf,dmic-ref : DMIC reference voltage source for each input, can be

    selected from either MICVDD or one of the MICBIAS's, defines

    (ARIZONA_DMIC_xxxx) are provided in <dt-bindings/mfd/arizona.txt>. If

    present, the number of values should be less than or equal to the

    number of inputs, unspecified inputs will use the chip default.



  - wlf,max-channels-clocked : The maximum number of channels to be clocked on

    each AIF, useful for I2S systems with multiple data lines being mastered.

    Specify one cell for each AIF to be configured, specify zero for AIFs that

    should be handled normally.

    If present, number of cells must be less than or equal to the number of

    AIFs. If less than the number of AIFs, for cells that have not been

    specified the corresponding AIFs will be treated as default setting.



  - wlf,spk-fmt : PDM speaker data format, must contain 2 cells (OUT5 and OUT6).

    See the datasheet for values.

    The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,

      wm8998, wm1814)



  - wlf,spk-mute : PDM speaker mute setting, must contain 2 cells (OUT5 and OUT6).

    See the datasheet for values.

    The second cell is ignored for codecs that do not have OUT6 (wm5102, wm8997,

    wm8998, wm1814)



  - DCVDD-supply, MICVDD-supply : Power supplies, only need to be specified if

    they are being externally supplied. As covered in

    Documentation/devicetree/bindings/regulator/regulator.txt
@@ -112,6 +73,7 @@ Optional properties: 
Also see child specific device properties:

  Regulator - ../regulator/arizona-regulator.txt

  Extcon    - ../extcon/extcon-arizona.txt

  Sound     - ../sound/arizona.txt



Example:

Documentation/devicetree/bindings/sound/audio-graph-card.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Below are same as Simple-Card. 
- bitclock-master

- bitclock-inversion

- frame-inversion

- mclk-fs

- dai-tdm-slot-num

- dai-tdm-slot-width

- clocks / system-clock-frequency

Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Example 1. Sampling Rate Conversion 
		label = "sound-card";

		prefix = "codec";

		routing = "codec Playback", "DAI0 Playback",

			"codec Playback", "DAI1 Playback";

			  "DAI0 Capture",   "codec Capture";

		convert-rate = <48000>;



		dais = <&cpu_port>;
@@ -79,7 +79,8 @@ Example 2. 2 CPU 1 Codec (Mixing) 
		label = "sound-card";

		prefix = "codec";

		routing = "codec Playback", "DAI0 Playback",

			"codec Playback", "DAI1 Playback";

			  "codec Playback", "DAI1 Playback",

			  "DAI0 Capture",   "codec Capture";

		convert-rate = <48000>;



		dais = <&cpu_port0

Documentation/devicetree/bindings/sound/cs42l56.txt

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ Example: 
codec: codec@4b {

	compatible = "cirrus,cs42l56";

	reg = <0x4b>;

	gpio-reset = <&gpio 10 0>;

	cirrus,gpio-nreset = <&gpio 10 0>;

	cirrus,chgfreq-divisor = <0x05>;

	cirrus.ain1_ref_cfg;

	cirrus,micbias-lvl = <5>;

Documentation/devicetree/bindings/sound/rt5514.txt

+9 −4
Original line number Diff line number Diff line 
RT5514 audio CODEC



This device supports I2C only.

This device supports both I2C and SPI.



Required properties:



- compatible : "realtek,rt5514".



- reg : The I2C address of the device.

- reg : the I2C address of the device for I2C, the chip select

        number for SPI.



Optional properties:



- clocks: The phandle of the master clock to the CODEC

- clock-names: Should be "mclk"



- interrupt-parent: The phandle for the interrupt controller.

- interrupts: The interrupt number to the cpu. The interrupt specifier format

	      depends on the interrupt controller.



- realtek,dmic-init-delay-ms

  Set the DMIC initial delay (ms) to wait it ready.

  Set the DMIC initial delay (ms) to wait it ready for I2C.



Pins on the device (for linking into audio routes) for RT5514:

Pins on the device (for linking into audio routes) for I2C:



  * DMIC1L

  * DMIC1R