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

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

Merge tag 'asoc-v4.1-2' of... 

Merge tag 'asoc-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Updates for v4.1

More updates for v4.1, pretty much all drivers:

 - Lots of cleanups from Lars, mainly moving things from the CODEC level
   to the card level.
 - Continuing improvements to rcar from Morimoto-san, pcm512x from
   Howard and Peter, the Intel platforms from Vinod, Jie, Jin and Han,
   and to rt5670 from Bard.
 - Support for some non-DSP Qualcomm platforms, Google's Storm
   platform, Maxmim MAX98925 CODECs and the Ingenic JZ4780 SoC.
parents f2aa1110 7667428f

Documentation/devicetree/bindings/net/dsa/dsa.txt

+3 −1
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ the parent DSA node. The maximum number of allowed child nodes is 4 
(DSA_MAX_SWITCHES).

Each of these switch child nodes should have the following required properties:



- reg			: Describes the switch address on the MII bus

- reg			: Contains two fields. The first one describes the

			  address on the MII bus. The second is the switch

			  number that must be unique in cascaded configurations

- #address-cells	: Must be 1

- #size-cells		: Must be 0

Documentation/devicetree/bindings/sound/ingenic,jz4740-i2s.txt

+1 −1
Original line number Diff line number Diff line 
Ingenic JZ4740 I2S controller



Required properties:

- compatible : "ingenic,jz4740-i2s"

- compatible : "ingenic,jz4740-i2s" or "ingenic,jz4780-i2s"

- reg : I2S registers location and length

- clocks : AIC and I2S PLL clock specifiers.

- clock-names: "aic" and "i2s"

Documentation/devicetree/bindings/sound/max98925.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
max98925 audio CODEC



This device supports I2C.



Required properties:



  - compatible : "maxim,max98925"



  - vmon-slot-no : slot number used to send voltage information



  - imon-slot-no : slot number used to send current information



  - reg : the I2C address of the device for I2C



Example:



codec: max98925@1a {

	compatible = "maxim,max98925";

	vmon-slot-no = <0>;

	imon-slot-no = <2>;

	reg = <0x1a>;

};

Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt

0 → 100644
+43 −0
Original line number Diff line number Diff line 
* Qualcomm Technologies LPASS CPU DAI



This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS).



Required properties:



- compatible		: "qcom,lpass-cpu"

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

- clock-names		: A list which must include the following entries:

				* "ahbix-clk"

				* "mi2s-osr-clk"

				* "mi2s-bit-clk"

- interrupts		: Must contain an entry for each entry in

			  interrupt-names.

- interrupt-names	: A list which must include the following entries:

				* "lpass-irq-lpaif"

- pinctrl-N		: One property must exist for each entry in

			  pinctrl-names.  See ../pinctrl/pinctrl-bindings.txt

			  for details of the property values.

- pinctrl-names		: Must contain a "default" entry.

- reg			: Must contain an address for each entry in reg-names.

- reg-names		: A list which must include the following entries:

				* "lpass-lpaif"



Optional properties:



- qcom,adsp		: Phandle for the audio DSP node



Example:



lpass@28100000 {

	compatible = "qcom,lpass-cpu";

	clocks = <&lcc AHBIX_CLK>, <&lcc MI2S_OSR_CLK>, <&lcc MI2S_BIT_CLK>;

	clock-names = "ahbix-clk", "mi2s-osr-clk", "mi2s-bit-clk";

	interrupts = <0 85 1>;

	interrupt-names = "lpass-irq-lpaif";

	pinctrl-names = "default", "idle";

	pinctrl-0 = <&mi2s_default>;

	pinctrl-1 = <&mi2s_idle>;

	reg = <0x28100000 0x10000>;

	reg-names = "lpass-lpaif";

	qcom,adsp = <&adsp>;

};

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

+111 −14
Original line number Diff line number Diff line
@@ -29,9 +29,17 @@ SSI subnode properties: 
- shared-pin			: if shared clock pin

- pio-transfer			: use PIO transfer mode

- no-busif			: BUSIF is not ussed when [mem -> SSI] via DMA case

- dma				: Should contain Audio DMAC entry

- dma-names			: SSI  case "rx"  (=playback), "tx"  (=capture)

				  SSIU case "rxu" (=playback), "txu" (=capture)



SRC subnode properties:

no properties at this point

- dma				: Should contain Audio DMAC entry

- dma-names			: "rx" (=playback), "tx" (=capture)



DVC subnode properties:

- dma				: Should contain Audio DMAC entry

- dma-names			: "tx" (=playback/capture)



DAI subnode properties:

- playback			: list of playback modules
@@ -45,56 +53,145 @@ rcar_sound: rcar_sound@ec500000 { 
	reg =	<0 0xec500000 0 0x1000>, /* SCU */

		<0 0xec5a0000 0 0x100>,  /* ADG */

		<0 0xec540000 0 0x1000>, /* SSIU */

		<0 0xec541000 0 0x1280>; /* SSI */

		<0 0xec541000 0 0x1280>, /* SSI */

		<0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/

	reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";



	clocks = <&mstp10_clks R8A7790_CLK_SSI_ALL>,

		<&mstp10_clks R8A7790_CLK_SSI9>, <&mstp10_clks R8A7790_CLK_SSI8>,

		<&mstp10_clks R8A7790_CLK_SSI7>, <&mstp10_clks R8A7790_CLK_SSI6>,

		<&mstp10_clks R8A7790_CLK_SSI5>, <&mstp10_clks R8A7790_CLK_SSI4>,

		<&mstp10_clks R8A7790_CLK_SSI3>, <&mstp10_clks R8A7790_CLK_SSI2>,

		<&mstp10_clks R8A7790_CLK_SSI1>, <&mstp10_clks R8A7790_CLK_SSI0>,

		<&mstp10_clks R8A7790_CLK_SCU_SRC9>, <&mstp10_clks R8A7790_CLK_SCU_SRC8>,

		<&mstp10_clks R8A7790_CLK_SCU_SRC7>, <&mstp10_clks R8A7790_CLK_SCU_SRC6>,

		<&mstp10_clks R8A7790_CLK_SCU_SRC5>, <&mstp10_clks R8A7790_CLK_SCU_SRC4>,

		<&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>,

		<&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>,

		<&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>,

		<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;

	clock-names = "ssi-all",

			"ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",

			"ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",

			"src.9", "src.8", "src.7", "src.6", "src.5",

			"src.4", "src.3", "src.2", "src.1", "src.0",

			"dvc.0", "dvc.1",

			"clk_a", "clk_b", "clk_c", "clk_i";



	rcar_sound,dvc {

		dvc0: dvc@0 { };

		dvc1: dvc@1 { };

		dvc0: dvc@0 {

			dmas = <&audma0 0xbc>;

			dma-names = "tx";

		};

		dvc1: dvc@1 {

			dmas = <&audma0 0xbe>;

			dma-names = "tx";

		};

	};



	rcar_sound,src {

		src0: src@0 { };

		src1: src@1 { };

		src2: src@2 { };

		src3: src@3 { };

		src4: src@4 { };

		src5: src@5 { };

		src6: src@6 { };

		src7: src@7 { };

		src8: src@8 { };

		src9: src@9 { };

		src0: src@0 {

			interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x85>, <&audma1 0x9a>;

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

		};

		src1: src@1 {

			interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x87>, <&audma1 0x9c>;

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

		};

		src2: src@2 {

			interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x89>, <&audma1 0x9e>;

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

		};

		src3: src@3 {

			interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x8b>, <&audma1 0xa0>;

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

		};

		src4: src@4 {

			interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x8d>, <&audma1 0xb0>;

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

		};

		src5: src@5 {

			interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x8f>, <&audma1 0xb2>;

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

		};

		src6: src@6 {

			interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x91>, <&audma1 0xb4>;

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

		};

		src7: src@7 {

			interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x93>, <&audma1 0xb6>;

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

		};

		src8: src@8 {

			interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x95>, <&audma1 0xb8>;

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

		};

		src9: src@9 {

			interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x97>, <&audma1 0xba>;

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

		};

	};



	rcar_sound,ssi {

		ssi0: ssi@0 {

			interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;

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

		};

		ssi1: ssi@1 {

			interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;

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

		};

		ssi2: ssi@2 {

			interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;

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

		};

		ssi3: ssi@3 {

			interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;

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

		};

		ssi4: ssi@4 {

			interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;

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

		};

		ssi5: ssi@5 {

			interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;

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

		};

		ssi6: ssi@6 {

			interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;

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

		};

		ssi7: ssi@7 {

			interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;

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

		};

		ssi8: ssi@8 {

			interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;

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

		};

		ssi9: ssi@9 {

			interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>;

			dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;

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

		};

	};