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

Commit c9b95e59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "The majority of this update is about ASoC, including a few new
  drivers, and the rest are mostly minor changes.  The only substantial
  change in ALSA core is about the additional error handling in the
  compress-offload API.  Below are highlights:

   - Add the error propagating support in compress-offload API

   - HD-audio: a usual Dell headset fixup, an Intel HDMI/DP fix, and the
     default mixer setup change ot turn off the loopback

   - Lots of updates for ASoC Intel drivers, mostly board support and
     bug fixing, and to the NAU8825 driver

   - Work on generalizing bits of simple-card to allow more code sharing
     with the Renesas rsrc-card (which can't use simple-card due to DPCM)

   - Removal of the Odroid X2 driver due to replacement with simple-card

   - Support for several new Mediatek platforms and associated boards

   - New ASoC drivers for Allwinner A10, Analog Devices ADAU7002,
     Broadcom Cygnus, Cirrus Logic CS35L33 and CS53L30, Maxim MAX8960
     and MAX98504, Realtek RT5514 and Wolfson WM8758"

* tag 'sound-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (278 commits)
  sound: oss: Use kernel_read_file_from_path() for mod_firmware_load()
  ASoC: Intel: Skylake: Delete an unnecessary check before the function call "release_firmware"
  ASoC: Intel: Skylake: Fix NULL Pointer exception in dynamic_debug.
  ASoC: samsung: Specify DMA channels through struct snd_dmaengine_pcm_config
  ASoC: samsung: Fix error paths in the I2S driver's probe()
  ASoC: cs53l30: Fix bit shift issue of TDM mode
  ASoC: cs53l30: Fix a bug for TDM slot location validation
  ASoC: rockchip: correct the spdif clk
  ALSA: echoaudio: purge contradictions between dimension matrix members and total number of members
  ASoC: rsrc-card: use asoc_simple_card_parse_card_name()
  ASoC: rsrc-card: use asoc_simple_dai instead of rsrc_card_dai
  ASoC: rsrc-card: use asoc_simple_card_parse_dailink_name()
  ASoC: simple-card: use asoc_simple_card_parse_card_name()
  ASoC: simple-card-utils: add asoc_simple_card_parse_card_name()
  ASoC: simple-card: use asoc_simple_card_parse_dailink_name()
  ASoC: simple-card-utils: add asoc_simple_card_set_dailink_name()
  ASoC: nau8825: drop redundant idiom when converting integer to boolean
  ASoC: nau8825: jack connection decision with different insertion logic
  ASoC: mediatek: Add HDMI dai-links to the mt8173-rt5650 machine driver
  ASoC: mediatek: mt2701: fix non static symbol warning
  ...
parents bad60e6f 0984d159

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

+8 −0
Original line number Diff line number Diff line
@@ -13,6 +13,11 @@ Required properties: 
 - reg:			The i2c address. Value depends on the state of ADDR0

			and ADDR1, as wired in hardware.



Optional properties:

 - clock-names:		If provided must be "mclk".

 - clocks:		phandle + clock-specifiers for the clock that provides

			the audio master clock for the device.



Examples:

#include <dt-bindings/sound/adau17x1.h>
@@ -20,5 +25,8 @@ Examples: 
		adau1361@38 {

			compatible = "adi,adau1761";

			reg = <0x38>;



			clock-names = "mclk";

			clocks = <&audio_clock>;

		};

	};

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
Analog Devices ADAU7002 Stereo PDM-to-I2S/TDM Converter



Required properties:



 - compatible: Must be "adi,adau7002"



Optional properties:



 - IOVDD-supply: Phandle and specifier for the power supply providing the IOVDD

	supply as covered in Documentation/devicetree/bindings/regulator/regulator.txt



	If this property is not present it is assumed that the supply pin is

	hardwired to always on.



Example:

	adau7002: pdm-to-i2s {

		compatible = "adi,adau7002";

		IOVDD-supply = <&supply>;

	};

Documentation/devicetree/bindings/sound/brcm,cygnus-audio.txt

0 → 100644
+67 −0
Original line number Diff line number Diff line 
BROADCOM Cygnus Audio I2S/TDM/SPDIF controller



Required properties:

	- compatible : "brcm,cygnus-audio"

	- #address-cells: 32bit valued, 1 cell.

	- #size-cells:  32bit valued, 0 cell.

	- reg : Should contain audio registers location and length

	- reg-names: names of the registers listed in "reg" property

		Valid names are "aud" and "i2s_in". "aud" contains a

		set of DMA, I2S_OUT and SPDIF registers. "i2s_in" contains

		a set of I2S_IN registers.

	- clocks: PLL and leaf clocks used by audio ports

	- assigned-clocks: PLL and leaf clocks

	- assigned-clock-parents: parent clocks of the assigned clocks

		(usually the PLL)

	- assigned-clock-rates: List of clock frequencies of the

		assigned clocks

	- clock-names: names of 3 leaf clocks used by audio ports

		Valid names are "ch0_audio", "ch1_audio", "ch2_audio"

	- interrupts: audio DMA interrupt number



SSP Subnode properties:

- reg: The index of ssp port interface to use

	Valid value are 0, 1, 2, or 3 (for spdif)



Example:

	cygnus_audio: audio@180ae000 {

		compatible = "brcm,cygnus-audio";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x180ae000 0xafd>, <0x180aec00 0x1f8>;

		reg-names = "aud", "i2s_in";

		clocks = <&audiopll BCM_CYGNUS_AUDIOPLL_CH0>,

				<&audiopll BCM_CYGNUS_AUDIOPLL_CH1>,

				<&audiopll BCM_CYGNUS_AUDIOPLL_CH2>;

		assigned-clocks = <&audiopll BCM_CYGNUS_AUDIOPLL>,

							<&audiopll BCM_CYGNUS_AUDIOPLL_CH0>,

							<&audiopll BCM_CYGNUS_AUDIOPLL_CH1>,

							<&audiopll BCM_CYGNUS_AUDIOPLL_CH2>;

		assigned-clock-parents = <&audiopll BCM_CYGNUS_AUDIOPLL>;

		assigned-clock-rates = <1769470191>,

								<0>,

								<0>,

								<0>;

		clock-names = "ch0_audio", "ch1_audio", "ch2_audio";

		interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;



		ssp0: ssp_port@0 {

			reg = <0>;

			status = "okay";

		};



		ssp1: ssp_port@1 {

			reg = <1>;

			status = "disabled";

		};



		ssp2: ssp_port@2 {

			reg = <2>;

			status = "disabled";

		};



		spdif: spdif_port@3 {

			reg = <3>;

			status = "disabled";

		};

	};

Documentation/devicetree/bindings/sound/bt-sco.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ This device support generic Bluetooth SCO link. 


Required properties:



  - compatible : "delta,dfbmcs320"

  - compatible : "delta,dfbmcs320" or "linux,bt-sco"



Example:

Documentation/devicetree/bindings/sound/cs35l33.txt

0 → 100644
+126 −0
Original line number Diff line number Diff line 
CS35L33 Speaker Amplifier



Required properties:



  - compatible : "cirrus,cs35l33"



  - reg : the I2C address of the device for I2C



  - VA-supply, VP-supply : power supplies for the device,

    as covered in

    Documentation/devicetree/bindings/regulator/regulator.txt.



Optional properties:



  - reset-gpios : gpio used to reset the amplifier



  - interrupt-parent : Specifies the phandle of the interrupt controller to

    which the IRQs from CS35L33 are delivered to.

 -  interrupts : IRQ line info CS35L33.

    (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

    for further information relating to interrupt properties)



  - cirrus,boost-ctl : Booster voltage use to supply the amp. If the value is

    0, then VBST = VP. If greater than 0, the boost voltage will be 3300mV with

    a value of 1 and will increase at a step size of 100mV until a maximum of

    8000mV.



  - cirrus,ramp-rate : On power up, it affects the time from when the power

    up sequence begins to the time the audio reaches a full-scale output.

    On power down, it affects the time from when the power-down sequence

    begins to when the amplifier disables the PWM outputs. If this property

    is not set then soft ramping will be disabled and ramp time would be

    20ms. If this property is set to 0,1,2,3 then ramp times would be 40ms,

    60ms,100ms,175ms respectively for 48KHz sample rate.



  - cirrus,boost-ipk : The maximum current allowed for the boost converter.

    The range starts at 1850000uA and goes to a maximum of 3600000uA

    with a step size of 15625uA. The default is 2500000uA.



  - cirrus,imon-adc-scale : Configures the scaling of data bits from the IMON

    ADC data word. This property can be set as a value of 0 for bits 15 down

    to 0, 6 for 21 down to 6, 7, for 22 down to 7, 8 for 23 down to 8.





Optional H/G Algorithm sub-node:



The cs35l33 node can have a single "cirrus,hg-algo" sub-node that will enable

the internal H/G Algorithm.



  - cirrus,hg-algo : Sub-node for internal Class H/G algorithm that

    controls the amplifier supplies.



Optional properties for the "cirrus,hg-algo" sub-node:



  - cirrus,mem-depth : Memory depth for the Class H/G algorithm measured in

    LRCLK cycles. If this property is set to 0, 1, 2, or 3 then the memory

    depths will be 1, 4, 8, 16 LRCLK cycles.  The default is 16 LRCLK cycles.



    cirrus,release-rate : The number of consecutive LRCLK periods before

    allowing release condition tracking updates. The number of LRCLK periods

    start at 3 to a maximum of 255.



  - cirrus,ldo-thld : Configures the signal threshold at which the PWM output

    stage enters LDO operation. Starts as a default value of 50mV for a value

    of 1 and increases with a step size of 50mV to a maximum of 750mV (value of

    0xF).



  - cirrus,ldo-path-disable : This is a boolean property. If present, the H/G

    algorithm uses the max detection path.  If not present, the LDO

    detection path is used.



  - cirrus,ldo-entry-delay : The LDO entry delay in milliseconds before the H/G

    algorithm switches to the LDO voltage.  This property can be set to values

    from 0 to 7 for delays of 5ms, 10ms, 50ms, 100ms, 200ms, 500ms, 1000ms.

    The default is 100ms.



  - cirrus,vp-hg-auto : This is a boolean property.  When set, class H/G VPhg

    automatic updating is enabled.



  - cirrus,vp-hg :  Class H/G algorithm VPhg.  Controls the H/G algorithm's

    reference to the VP voltage for when to start generating a boosted VBST.

    The reference voltage starts at 3000mV with a value of 0x3 and is increased

    by 100mV per step to a maximum of 5500mV.



  - cirrus,vp-hg-rate : The rate (number of LRCLK periods) at which the VPhg is

    allowed to increase to a higher voltage when using VPhg automatic

    tracking. This property can be set to values from 0 to 3 with rates of 128

    periods, 2048 periods, 32768 periods, and 524288 periods.

    The default is 32768 periods.



  - cirrus,vp-hg-va : VA calculation reference for automatic VPhg tracking

    using VPMON. This property can be set to values from 0 to 6 starting at

    1800mV with a step size of 50mV up to a maximum value of 1750mV.

    Default is 1800mV.



Example:



cs35l33: cs35l33@40 {

	compatible = "cirrus,cs35l33";

	reg = <0x40>;



	VA-supply = <&ldo5_reg>;

	VP-supply = <&ldo5_reg>;



	interrupt-parent = <&gpio8>;

	interrupts = <3 IRQ_TYPE_LEVEL_LOW>;



	reset-gpios = <&cs47l91 34 0>;



	cirrus,ramp-rate = <0x0>;

	cirrus,boost-ctl = <0x30>;  /* VBST = 8000mV */

	cirrus,boost-ipk = <0xE0>; /* 3600mA */

	cirrus,imon-adc-scale = <0> /* Bits 15 down to 0 */



	cirrus,hg-algo {

		cirrus,mem-depth = <0x3>;

		cirrus,release-rate = <0x3>;

		cirrus,ldo-thld = <0x1>;

		cirrus,ldo-path-disable = <0x0>;

		cirrus,ldo-entry-delay=<0x4>;

		cirrus,vp-hg-auto;

		cirrus,vp-hg=<0xF>;

		cirrus,vp-hg-rate=<0x2>;

		cirrus,vp-hg-va=<0x0>;

	};

};