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

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

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

Pull sound updates from Takashi Iwai:
 "It was holiday season, so no wonder that there are little changes in
  framework level, although diffstat shows quite many changes spreaded
  over sound/* directories.  Most of changes are cleanups, code
  refactoring and fixes.

  Some highlights:
   - Removal of OSS sleep_on usages by Arnd
   - Simplified memalloc helper codes, drop obsoleted features; now it's
     built into PCM driver instead of an individual module
   - Warn if PCM buffer preallocation fails, which will show page
     allocation issues more clearly
   - Compress offload API updates for sample rates by Vinod
   - PCM glitch workaround on ctxfi emu20k1 by Sarah
   - Drop cs46xx DSP blobs, using firmware loader now
   - USB-audio quitks for Plantronics Gamecom 780, Creative VF0420, and
     Focusrite Saffire 6

  HD-audio specifics:
   - Standardize Kconfigs of HD-audio codec drivers; now "make
     localmodconfig" recognizes configs properly (finally!)
   - Parallel PM implementation by Mengdong
   - BayleyBay/ValleyView2 board fixups
   - Broadwell audio support
   - Runtime PM improvement (PantherPoint, etc)
   - Quirks: Dell subwooer, Gigabyte mobo jack detection oddity, Dell
     AiO click noise fixes, Dell headset mic fixes, etc
   - Automatic bind with HDMI codec parser without generic parser
   - More AD codec fixes (since 3.12 regression) including the automatic
     stereo mix support
   - Common Thinkpad ACPI helper for Realtek and Conexant codecs

  ASoC specifics:
   - Update to the generic DMA code to support deferred probe and
     managed resources
   - New drivers for BCM2835 (used in Raspberry Pi), Tegra with MAX98090
     and Analog Devices AXI I2S and S/PDIF controller IPs
   - Device tree support for the simple card, max98090 and cs42l52
   - Conversion of the Samsung drivers to native dmaengine, making them
     multiplatform compatible and hopefully helping keep them more
     modern and up to date.
   - More regmap conversions, including a very welcome one for twl6040
     from Peter Ujfalusi
   - A big overhaul of the DaVinci drivers also from Peter Ujfalusi
   - Lots of DMA updates from Lars-Peter
   - Improvements to the constraints handling code from Lars-Peter
   - A very helpful conversion of the TWL4030 driver to regmap from Peter
   - A new driver for the Freescale ESAI controller from Nicolin Chen
   - Conversion of some of the drivers to use params_width()
   - Extensions to DPCM for use with compressed audio from Liam"

* tag 'sound-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (396 commits)
  ASoC: dapm: Fix double prefix addition
  ASoC: compress: Add suport for DPCM into compressed audio
  ASoC: DPCM: make some DPCM API calls non static for compressed usage
  ASoC: core: Fix possible NULL pointer dereference of pcm->config
  ALSA: hda - add headset mic detect quirks for some Dell machines
  ASoC: tlv320aic32x4: Fix regmap range_min
  ASoC: core: Return -ENOTSUPP from set_sysclk() if no operation provided
  ASoC: dapm: Change prototype of soc_widget_read
  ASoC: samsung: Remove SND_DMAENGINE_PCM_FLAG_NO_RESIDUE flag
  ASoC: axi-{spdif,i2s}: Remove SND_DMAENGINE_PCM_FLAG_NO_RESIDUE flag
  ASoC: generic-dmaengine-pcm: Check DMA residue granularity
  ASoC: generic-dmaengine-pcm: Check NO_RESIDUE flag at runtime
  dma: pl330: Set residue_granularity
  dma: Indicate residue granularity in dma_slave_caps
  ASoC: simple-card: fix one bug to writing to the platform data
  ASoC: pcm: Use snd_pcm_rate_mask_intersect() helper
  ALSA: Add helper function for intersecting two rate masks
  ASoC: s6000: Don't mix SNDRV_PCM_RATE_CONTINUOUS with specific rates
  ASoC: fsl: Don't mix SNDRV_PCM_RATE_CONTINUOUS with specific rates
  ASoC: pcm: Properly initialize hw->rate_max
  ...
parents a547df99 7552f34a

Documentation/devicetree/bindings/sound/adi,axi-i2s.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
ADI AXI-I2S controller



Required properties:

 - compatible : Must be "adi,axi-i2s-1.00.a"

 - reg : Must contain I2S core's registers location and length

 - clocks : Pairs of phandle and specifier referencing the controller's clocks.

   The controller expects two clocks, the clock used for the AXI interface and

   the clock used as the sampling rate reference clock sample.

 - clock-names : "axi" for the clock to the AXI interface, "ref" for the sample

   rate reference clock.

 - dmas: Pairs of phandle and specifier for the DMA channels that are used by

   the core. The core expects two dma channels, one for transmit and one for

   receive.

 - dma-names : "tx" for the transmit channel, "rx" for the receive channel.



For more details on the 'dma', 'dma-names', 'clock' and 'clock-names' properties

please check:

	* resource-names.txt

	* clock/clock-bindings.txt

	* dma/dma.txt



Example:



	i2s: i2s@0x77600000 {

		compatible = "adi,axi-i2s-1.00.a";

		reg = <0x77600000 0x1000>;

		clocks = <&clk 15>, <&audio_clock>;

		clock-names = "axi", "ref";

		dmas = <&ps7_dma 0>, <&ps7_dma 1>;

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

	};

Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
ADI AXI-SPDIF controller



Required properties:

 - compatible : Must be "adi,axi-spdif-1.00.a"

 - reg : Must contain SPDIF core's registers location and length

 - clocks : Pairs of phandle and specifier referencing the controller's clocks.

   The controller expects two clocks, the clock used for the AXI interface and

   the clock used as the sampling rate reference clock sample.

 - clock-names: "axi" for the clock to the AXI interface, "ref" for the sample

   rate reference clock.

 - dmas: Pairs of phandle and specifier for the DMA channel that is used by

   the core. The core expects one dma channel for transmit.

 - dma-names : Must be "tx"



For more details on the 'dma', 'dma-names', 'clock' and 'clock-names' properties

please check:

	* resource-names.txt

	* clock/clock-bindings.txt

	* dma/dma.txt



Example:



	spdif: spdif@0x77400000 {

		compatible = "adi,axi-spdif-tx-1.00.a";

		reg = <0x77600000 0x1000>;

		clocks = <&clk 15>, <&audio_clock>;

		clock-names = "axi", "ref";

		dmas = <&ps7_dma 0>;

		dma-names = "tx";

	};

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
* Broadcom BCM2835 SoC I2S/PCM module



Required properties:

- compatible: "brcm,bcm2835-i2s"

- reg: A list of base address and size entries:

	* The first entry should cover the PCM registers

	* The second entry should cover the PCM clock registers

- dmas: List of DMA controller phandle and DMA request line ordered pairs.

- dma-names: Identifier string for each DMA request line in the dmas property.

  These strings correspond 1:1 with the ordered pairs in dmas.



  One of the DMA channels will be responsible for transmission (should be

  named "tx") and one for reception (should be named "rx").



Example:



bcm2835_i2s: i2s@7e203000 {

	compatible = "brcm,bcm2835-i2s";

	reg = <0x7e203000 0x20>,

	      <0x7e101098 0x02>;



	dmas = <&dma 2>,

	       <&dma 3>;

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

};

Documentation/devicetree/bindings/sound/cs42l52.txt

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



Required properties:



  - compatible : "cirrus,cs42l52"



  - reg : the I2C address of the device for I2C



Optional properties:



  - cirrus,reset-gpio : 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 = (64xFs)/(N+2)

  N = chgfreq_val

  Fs = Sample Rate (variable)



  - cirrus,mica-differential-cfg : boolean, If present, then the MICA input is configured

  as a differential input. If not present then the MICA input is configured as

  Single-ended input. Single-ended mode allows for MIC1 or MIC2 muxing for input.



  - cirrus,micb-differential-cfg : boolean, If present, then the MICB input is configured

  as a differential input. If not present then the MICB input is configured as

  Single-ended input. Single-ended mode allows for MIC1 or MIC2 muxing for input.



  - 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



Example:



codec: codec@4a {

	compatible = "cirrus,cs42l52";

	reg = <0x4a>;

	reset-gpio = <&gpio 10 0>;

	cirrus,chgfreq-divisor = <0x05>;

	cirrus.mica-differential-cfg;

	cirrus,micbias-lvl = <5>;

};

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt

+4 −2
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Required properties: 
- compatible :

	"ti,dm646x-mcasp-audio"	: for DM646x platforms

	"ti,da830-mcasp-audio"	: for both DA830 & DA850 platforms

	"ti,am33xx-mcasp-audio"	: for AM33xx platforms (AM33xx, TI81xx)

	"ti,am33xx-mcasp-audio"	: for AM33xx platforms (AM33xx, AM43xx, TI81xx)

	"ti,dra7-mcasp-audio"	: for DRA7xx platforms



- reg : Should contain reg specifiers for the entries in the reg-names property.

- reg-names : Should contain:
@@ -36,7 +37,8 @@ Optional properties: 
- pinctrl-0: Should specify pin control group used for this controller.

- pinctrl-names: Should contain only one value - "default", for more details

  		 please refer to pinctrl-bindings.txt

  

- fck_parent : Should contain a valid clock name which will be used as parent

	       for the McASP fck



Example: