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

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

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

Pull sound updates from Takashi Iwai:
 "At this time, majority of changes come from ASoC world while we got a
  few new drivers in other places for FireWire and USB.  There have been
  lots of ASoC core cleanups / refactoring, but very little visible to
  external users.

  ASoC:
   - Support for specifying aux CODECs in DT
   - Removal of the deprecated mux and enum macros
   - More moves towards full componentisation
   - Removal of some unused I/O code
   - Lots of cleanups, fixes and enhancements to the davinci, Freescale,
     Haswell and Realtek drivers
   - Several drivers exposed directly in Kconfig for use with
     simple-card
   - GPIO descriptor support for jacks
   - More updates and fixes to the Freescale SSI, Intel and rsnd drivers
   - New drivers for Cirrus CS42L56, Realtek RT5639, RT5642 and RT5651
     and ST STA350, Analog Devices ADAU1361, ADAU1381, ADAU1761 and
     ADAU1781, and Realtek RT5677

  HD-audio:
   - Clean up Dell headset quirks
   - Noise fixes for Dell and Sony laptops
   - Thinkpad T440 dock fix
   - Realtek codec updates (ALC293,ALC233,ALC3235)
   - Tegra HD-audio HDMI support

  FireWire-audio:
   - FireWire audio stack enhancement (AMDTP, MIDI), support for
     incoming isochronous stream and duplex streams with timestamp
     synchronization
   - BeBoB-based devices support
   - Fireworks-based device support

  USB-audio:
   - Behringer BCD2000 USB device support

  Misc:
   - Clean up of a few old drivers, atmel, fm801, etc"

* tag 'sound-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (480 commits)
  ASoC: Fix wrong argument for card remove callbacks
  ASoC: free jack GPIOs before the sound card is freed
  ALSA: firewire-lib: Remove a comment about restriction of asynchronous operation
  ASoC: cache: Fix error code when not using ASoC level cache
  ALSA: hda/realtek - Fix COEF widget NID for ALC260 replacer fixup
  ALSA: hda/realtek - Correction of fixup codes for PB V7900 laptop
  ALSA: firewire-lib: Use IEC 61883-6 compliant labels for Raw Audio data
  ASoC: add RT5677 CODEC driver
  ASoC: intel: The Baytrail/MAX98090 driver depends on I2C
  ASoC: rt5640: Add the function "get_clk_info" to RL6231 shared support
  ASoC: rt5640: Add the function of the PLL clock calculation to RL6231 shared support
  ASoC: rt5640: Add RL6231 class device shared support for RT5640, RT5645 and RT5651
  ASoC: cache: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
  ASoC: Add helper functions to cast from DAPM context to CODEC/platform
  ALSA: bebob: sizeof() vs ARRAY_SIZE() typo
  ASoC: wm9713: correct mono out PGA sources
  ALSA: synth: emux: soundfont.c: Cleaning up memory leak
  ASoC: fsl: Remove dependencies of boards for SND_SOC_EUKREA_TLV320
  ASoC: fsl-ssi: Use regmap
  ASoC: fsl-ssi: reorder and document fsl_ssi_private
  ...
parents 15b58830 16088cb6

Documentation/devicetree/bindings/mfd/mc13xxx.txt

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ Optional properties: 
- fsl,mc13xxx-uses-touch : Indicate the touchscreen controller is being used



Sub-nodes:

- codec: Contain the Audio Codec node.

  - adc-port: Contain PMIC SSI port number used for ADC.

  - dac-port: Contain PMIC SSI port number used for DAC.

- leds : Contain the led nodes and initial register values in property

  "led-control". Number of register depends of used IC, for MC13783 is 6,

  for MC13892 is 4, for MC34708 is 1. See datasheet for bits definitions of

Documentation/devicetree/bindings/sound/ak4104.txt

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Required properties: 


  - reg : The chip select number on the SPI bus



  - vdd-supply : A regulator node, providing 2.7V - 3.6V



Optional properties:



  - reset-gpio : a GPIO spec for the reset pin. If specified, it will be
@@ -19,4 +21,5 @@ spdif: ak4104@0 { 
	compatible = "asahi-kasei,ak4104";

	reg = <0>;

	spi-max-frequency = <5000000>;

	vdd-supply = <&vdd_3v3_reg>;

};

Documentation/devicetree/bindings/sound/alc5623.txt

0 → 100644
+25 −0
Original line number Diff line number Diff line 
ALC5621/ALC5622/ALC5623 audio Codec



Required properties:



 - compatible:	"realtek,alc5623"

 - reg:		the I2C address of the device.



Optional properties:



 - add-ctrl:	  Default register value for Reg-40h, Additional Control

		  Register. If absent or has the value of 0, the

		  register is untouched.



 - jack-det-ctrl: Default register value for Reg-5Ah, Jack Detect

		  Control Register. If absent or has value 0, the

		  register is untouched.



Example:



	alc5621: alc5621@1a {

		compatible = "alc5621";

		reg = <0x1a>;

		add-ctrl = <0x3700>;

		jack-det-ctrl = <0x4810>;

	};

Documentation/devicetree/bindings/sound/cs42l56.txt

0 → 100644
+63 −0
Original line number Diff line number Diff line 
CS42L52 audio CODEC



Required properties:



  - compatible : "cirrus,cs42l56"



  - reg : the I2C address of the device for I2C



  - VA-supply, VCP-supply, VLDO-supply : power supplies for the device,

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



Optional properties:



  - cirrus,gpio-nreset : GPIO controller's phandle and the number

  of the GPIO used to reset the codec.



  - cirrus,chgfreq-divisor : Values used to set the Charge Pump Frequency.

  Allowable values of 0x00 through 0x0F. These are raw values written to the

  register, not the actual frequency. The frequency is determined by the following.

  Frequency = MCLK / 4 * (N+2)

  N = chgfreq_val

  MCLK = Where MCLK is the frequency of the mclk signal after the MCLKDIV2 circuit.



  - cirrus,ain1a-ref-cfg, ain1b-ref-cfg : boolean, If present, AIN1A or AIN1B are configured

  as a pseudo-differential input referenced to AIN1REF/AIN3A.



  - cirrus,ain2a-ref-cfg, ain2b-ref-cfg : boolean, If present, AIN2A or AIN2B are configured

  as a pseudo-differential input referenced to AIN2REF/AIN3B.



  - cirrus,micbias-lvl: Set the output voltage level on the MICBIAS Pin.

  0 = 0.5 x VA

  1 = 0.6 x VA

  2 = 0.7 x VA

  3 = 0.8 x VA

  4 = 0.83 x VA

  5 = 0.91 x VA



  - cirrus,adaptive-pwr-cfg : Configures how the power to the Headphone and Lineout

  Amplifiers adapt to the output signal levels.

  0 = Adapt to Volume Mode. Voltage level determined by the sum of the relevant volume settings.

  1 = Fixed - Headphone and Line Amp supply = + or - VCP/2.

  2 = Fixed - Headphone and Line Amp supply = + or - VCP.

  3 = Adapted to Signal; Voltage level is dynamically determined by the output signal.



  - cirrus,hpf-left-freq, hpf-right-freq : Sets the corner frequency (-3dB point) for the internal High-Pass

  Filter.

  0 = 1.8Hz

  1 = 119Hz

  2 = 236Hz

  3 = 464Hz





Example:



codec: codec@4b {

	compatible = "cirrus,cs42l56";

	reg = <0x4b>;

	gpio-reset = <&gpio 10 0>;

	cirrus,chgfreq-divisor = <0x05>;

	cirrus.ain1_ref_cfg;

	cirrus,micbias-lvl = <5>;

	VA-supply = <&reg_audio>;

};

Documentation/devicetree/bindings/sound/fsl-sai.txt

+7 −4
Original line number Diff line number Diff line
@@ -7,10 +7,11 @@ codec/DSP interfaces. 




Required properties:

- compatible: Compatible list, contains "fsl,vf610-sai".

- compatible: Compatible list, contains "fsl,vf610-sai" or "fsl,imx6sx-sai".

- reg: Offset and length of the register set for the device.

- clocks: Must contain an entry for each entry in clock-names.

- clock-names : Must include the "sai" entry.

- clock-names : Must include the "bus" for register access and "mclk1" "mclk2"

  "mclk3" for bit clock and frame clock providing.

- dmas : Generic dma devicetree binding as described in

  Documentation/devicetree/bindings/dma/dma.txt.

- dma-names : Two dmas have to be defined, "tx" and "rx".
@@ -30,8 +31,10 @@ sai2: sai@40031000 { 
	      reg = <0x40031000 0x1000>;

	      pinctrl-names = "default";

	      pinctrl-0 = <&pinctrl_sai2_1>;

	      clocks = <&clks VF610_CLK_SAI2>;

	      clock-names = "sai";

	      clocks = <&clks VF610_CLK_PLATFORM_BUS>,

		     <&clks VF610_CLK_SAI2>,

		     <&clks 0>, <&clks 0>;

	      clock-names = "bus", "mclk1", "mclk2", "mclk3";

	      dma-names = "tx", "rx";

	      dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>,

		   <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>;