Commit 57fa8a1e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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

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

ASoC: Further updates for v4.2

There's a bunch of additional updates and fixes that came in since my
orignal pull request here, including DT support for rt5645 and fairly
large serieses of cleanups and improvements to tas2552 and rcar.
parents f267f9df c99d49a8

Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt

+2 −2
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ Example: 
		touchscreen-fuzz-x = <4>;

		touchscreen-fuzz-y = <7>;

		touchscreen-fuzz-pressure = <2>;

		touchscreen-max-x = <4096>;

		touchscreen-max-y = <4096>;

		touchscreen-size-x = <4096>;

		touchscreen-size-y = <4096>;

		touchscreen-max-pressure = <2048>;



		ti,x-plate-ohms = <280>;

Documentation/devicetree/bindings/sound/mt8173-max98090.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
MT8173 with MAX98090 CODEC



Required properties:

- compatible : "mediatek,mt8173-max98090"

- mediatek,audio-codec: the phandle of the MAX98090 audio codec



Example:



	sound {

		compatible = "mediatek,mt8173-max98090";

		mediatek,audio-codec = <&max98090>;

	};

Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
MT8173 with RT5650 RT5676 CODECS



Required properties:

- compatible : "mediatek,mt8173-rt5650-rt5676"

- mediatek,audio-codec: the phandles of rt5650 and rt5676 codecs



Example:



	sound {

		compatible = "mediatek,mt8173-rt5650-rt5676";

		mediatek,audio-codec = <&rt5650 &rt5676>;

	};

Documentation/devicetree/bindings/sound/mtk-afe-pcm.txt

0 → 100644
+45 −0
Original line number Diff line number Diff line 
Mediatek AFE PCM controller



Required properties:

- compatible = "mediatek,mt8173-afe-pcm";

- reg: register location and size

- interrupts: Should contain AFE interrupt

- clock-names: should have these clock names:

		"infra_sys_audio_clk",

		"top_pdn_audio",

		"top_pdn_aud_intbus",

		"bck0",

		"bck1",

		"i2s0_m",

		"i2s1_m",

		"i2s2_m",

		"i2s3_m",

		"i2s3_b";



Example:



	afe: mt8173-afe-pcm@11220000  {

		compatible = "mediatek,mt8173-afe-pcm";

		reg = <0 0x11220000 0 0x1000>;

		interrupts = <GIC_SPI 134 IRQ_TYPE_EDGE_FALLING>;

		clocks = <&infracfg INFRA_AUDIO>,

			<&topckgen TOP_AUDIO_SEL>,

			<&topckgen TOP_AUD_INTBUS_SEL>,

			<&topckgen TOP_APLL1_DIV0>,

			<&topckgen TOP_APLL2_DIV0>,

			<&topckgen TOP_I2S0_M_CK_SEL>,

			<&topckgen TOP_I2S1_M_CK_SEL>,

			<&topckgen TOP_I2S2_M_CK_SEL>,

			<&topckgen TOP_I2S3_M_CK_SEL>,

			<&topckgen TOP_I2S3_B_CK_SEL>;

		clock-names = "infra_sys_audio_clk",

				"top_pdn_audio",

				"top_pdn_aud_intbus",

				"bck0",

				"bck1",

				"i2s0_m",

				"i2s1_m",

				"i2s2_m",

				"i2s3_m",

				"i2s3_b";

	};

Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt

0 → 100644
+60 −0
Original line number Diff line number Diff line 
* Qualcomm Technologies APQ8016 SBC ASoC machine driver



This node models the Qualcomm Technologies APQ8016 SBC ASoC machine driver



Required properties:



- compatible		: "qcom,apq8016-sbc-sndcard"



- 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:

				* "mic-iomux"

				* "spkr-iomux"

- qcom,model		: Name of the sound card.



Dai-link subnode properties and subnodes:



Required dai-link subnodes:



- cpu					: CPU   sub-node

- codec					: CODEC sub-node



Required CPU/CODEC subnodes properties:



-link-name		: Name of the dai link.

-sound-dai		: phandle and port of CPU/CODEC

-capture-dai		: phandle and port of CPU/CODEC



Example:



sound: sound {

	compatible = "qcom,apq8016-sbc-sndcard";

	reg = <0x07702000 0x4>, <0x07702004 0x4>;

	reg-names = "mic-iomux", "spkr-iomux";

	qcom,model = "DB410c";



	/* I2S - Internal codec */

	internal-dai-link@0 {

		cpu { /* PRIMARY */

			sound-dai = <&lpass MI2S_PRIMARY>;

		};

		codec {

			sound-dai = <&wcd_codec 0>;

		};

	};



	/* External Primary or External Secondary -ADV7533 HDMI */

	external-dai-link@0 {

		link-name = "ADV7533";

		cpu { /* QUAT */

			sound-dai = <&lpass MI2S_QUATERNARY>;

		};

		codec {

			sound-dai = <&adv_bridge 0>;

		};

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE