Commit ad2109d7 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next 

ASoC: Updates for v3.10

A bunch of changes here, the most interesting one subsystem wise being
Morimoto-san's work to create snd_soc_component which doesn't do much
for now but will be pretty important going forwards:

 - Add a new component object type which will form the basis of moving
   to a more generic handling of SoC and off-SoC components, contributed
   by Kuninori Morimoto.
 - A fairly large set of cleanups for the dmaengine integration from
   Lars-Peter Clausen, starting to move towards being able to have a
   generic driver based on the library.
 - Performance optimisations to DAPM from Ryo Tsutsui.
 - Support for mixer control sharing in DAPM from Stephen Warren.
 - Multiplatform ARM cleanups from Arnd Bergmann.
 - New CODEC drivers for AK5385 and TAS5086 from Daniel Mack.
parents cbc200bc 5cbad7d3

Documentation/devicetree/bindings/sound/ak5386.txt

0 → 100644
+19 −0
Original line number Original line Diff line number Diff line 
AK5386 Single-ended 24-Bit 192kHz delta-sigma ADC



This device has no control interface.



Required properties:



  - compatible : "asahi-kasei,ak5386"



Optional properties:



  - reset-gpio : a GPIO spec for the reset/power down pin.

		 If specified, it will be deasserted at probe time.



Example:



spdif: ak5386@0 {

	compatible = "asahi-kasei,ak5386";

	reset-gpio = <&gpio0 23>;

};

Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt

+21 −5
Original line number Original line Diff line number Diff line 
NVIDIA Tegra30 AHUB (Audio Hub)

NVIDIA Tegra30 AHUB (Audio Hub)





Required properties:

Required properties:

- compatible : "nvidia,tegra30-ahub"

- compatible : "nvidia,tegra30-ahub", "nvidia,tegra114-ahub", etc.

- reg : Should contain the register physical address and length for each of

- reg : Should contain the register physical address and length for each of

  the AHUB's APBIF registers and the AHUB's own registers.

  the AHUB's register blocks.

  - Tegra30 requires 2 entries, for the APBIF and AHUB/AUDIO register blocks.

  - Tegra114 requires an additional entry, for the APBIF2 register block.

- interrupts : Should contain AHUB interrupt

- interrupts : Should contain AHUB interrupt

- nvidia,dma-request-selector : The Tegra DMA controller's phandle and

- nvidia,dma-request-selector : A list of the DMA channel specifiers. Each

  request selector for the first APBIF channel.

  entry contains the Tegra DMA controller's phandle and request selector.

  If a single entry is present, the request selectors for the channels are

  assumed to be contiguous, and increment from this value.

  If multiple values are given, one value must be given per channel.

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

- clock-names : Must include the following entries:

  - Tegra30: Requires d_audio, apbif, i2s0, i2s1, i2s2, i2s3, i2s4, dam0,

    dam1, dam2, spdif_in.

  - Tegra114: Additionally requires amx, adx.

- ranges : The bus address mapping for the configlink register bus.

- ranges : The bus address mapping for the configlink register bus.

  Can be empty since the mapping is 1:1.

  Can be empty since the mapping is 1:1.

- #address-cells : For the configlink bus. Should be <1>;

- #address-cells : For the configlink bus. Should be <1>;
@@ -25,7 +35,13 @@ ahub@70080000 { 
	reg = <0x70080000 0x200 0x70080200 0x100>;

	reg = <0x70080000 0x200 0x70080200 0x100>;

	interrupts = < 0 103 0x04 >;

	interrupts = < 0 103 0x04 >;

	nvidia,dma-request-selector = <&apbdma 1>;

	nvidia,dma-request-selector = <&apbdma 1>;



	clocks = <&tegra_car 106>, <&tegra_car 107>, <&tegra_car 30>,

		<&tegra_car 11>, <&tegra_car 18>, <&tegra_car 101>,

		<&tegra_car 102>, <&tegra_car 108>, <&tegra_car 109>,

		<&tegra_car 110>, <&tegra_car 162>;

	clock-names = "d_audio", "apbif", "i2s0", "i2s1", "i2s2",

		"i2s3", "i2s4", "dam0", "dam1", "dam2",

		"spdif_in";

	ranges;

	ranges;

	#address-cells = <1>;

	#address-cells = <1>;

	#size-cells = <1>;

	#size-cells = <1>;

Documentation/devicetree/bindings/sound/ti,tas5086.txt

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
Texas Instruments TAS5086 6-channel PWM Processor



Required properties:



 - compatible:		Should contain "ti,tas5086".

 - reg:			The i2c address. Should contain <0x1b>.



Optional properties:



 - reset-gpio: 		A GPIO spec to define which pin is connected to the

			chip's !RESET pin. If specified, the driver will

			assert a hardware reset at probe time.



 - ti,charge-period:	This property should contain the time in microseconds

			that closely matches the external single-ended

			split-capacitor charge period. The hardware chip

			waits for this period of time before starting the

			PWM signals. This helps reduce pops and clicks.



			When not specified, the hardware default of 1300ms

			is retained.



Examples:



	i2c_bus {

		tas5086@1b {

			compatible = "ti,tas5086";

			reg = <0x1b>;

			reset-gpio = <&gpio 23 0>;

			ti,charge-period = <156000>;

		};

	};

Documentation/networking/ipvs-sysctl.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,13 @@ amemthresh - INTEGER 
        enabled and the variable is automatically set to 2, otherwise

        enabled and the variable is automatically set to 2, otherwise

        the strategy is disabled and the variable is  set  to 1.

        the strategy is disabled and the variable is  set  to 1.





backup_only - BOOLEAN

	0 - disabled (default)

	not 0 - enabled



	If set, disable the director function while the server is

	in backup mode to avoid packet loops for DR/TUN methods.



conntrack - BOOLEAN

conntrack - BOOLEAN

	0 - disabled (default)

	0 - disabled (default)

	not 0 - enabled

	not 0 - enabled

Documentation/sound/alsa/ALSA-Configuration.txt

+2 −3
Original line number Original line Diff line number Diff line
@@ -890,9 +890,8 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    enable_msi	- Enable Message Signaled Interrupt (MSI) (default = off)

    enable_msi	- Enable Message Signaled Interrupt (MSI) (default = off)

    power_save	- Automatic power-saving timeout (in second, 0 =

    power_save	- Automatic power-saving timeout (in second, 0 =

		disable)

		disable)

    power_save_controller - Support runtime D3 of HD-audio controller

    power_save_controller - Reset HD-audio controller in power-saving mode

		(-1 = on for supported chip (default), false = off,

		(default = on)

		 true = force to on even for unsupported hardware)

    align_buffer_size - Force rounding of buffer/period sizes to multiples

    align_buffer_size - Force rounding of buffer/period sizes to multiples

    		      of 128 bytes. This is more efficient in terms of memory

    		      of 128 bytes. This is more efficient in terms of memory

		      access but isn't required by the HDA spec and prevents

		      access but isn't required by the HDA spec and prevents

CRA Git | Maintained and supported by SUSTech CRA and CCSE