Merge remote-tracking branch 'asoc/topic/inte' into asoc-next (b821d298) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/devicetree/bindings/sound/audio-graph-card.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@ see ${LINUX}/Documentation/devicetree/bindings/sound/simple-card.txt
		Below are same as Simple-Card.

		- label
		- widgets
		- routing
		- dai-format
		- frame-master
		- bitclock-master
		@@ -24,6 +26,9 @@ Required properties:
		- compatible : "audio-graph-card";
		- dais : list of CPU DAI port{s}

		Optional properties:
		- pa-gpios: GPIO used to control external amplifier.

		Example: Single DAI case

		sound_card {

+7 −2

Original line number	Diff line number	Diff line
		@@ -90,9 +90,12 @@ Example 2. 2 CPU 1 Codec (Mixing)
		...

		port {
		codec_endpoint: endpoint {
		codec_endpoint0: endpoint {
		remote-endpoint = <&cpu_endpoint0>;
		};
		codec_endpoint1: endpoint {
		remote-endpoint = <&cpu_endpoint1>;
		};
		};
		};

		@@ -101,7 +104,7 @@ Example 2. 2 CPU 1 Codec (Mixing)
		ports {
		cpu_port0: port {
		cpu_endpoint0: endpoint {
		remote-endpoint = <&codec_endpoint>;
		remote-endpoint = <&codec_endpoint0>;

		dai-format = "left_j";
		...
		@@ -109,6 +112,8 @@ Example 2. 2 CPU 1 Codec (Mixing)
		};
		cpu_port1: port {
		cpu_endpoint1: endpoint {
		remote-endpoint = <&codec_endpoint1>;

		dai-format = "left_j";
		...
		};

+3 −0

Original line number	Diff line number	Diff line
		@@ -69,6 +69,8 @@ Optional properties:
		- nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
		- nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms

		- nuvoton,crosstalk-bypass: make crosstalk function bypass if set.

		- clocks: list of phandle and clock specifier pairs according to common clock bindings for the
		clocks described in clock-names
		- clock-names: should include "mclk" for the MCLK master clock
		@@ -96,6 +98,7 @@ Example:
		nuvoton,short-key-debounce = <2>;
		nuvoton,jack-insert-debounce = <7>;
		nuvoton,jack-eject-debounce = <7>;
		nuvoton,crosstalk-bypass;

		clock-names = "mclk";
		clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		* Rockchip PDM controller

		Required properties:

		- compatible: "rockchip,pdm"
		- reg: physical base address of the controller and length of memory mapped
		region.
		- dmas: DMA specifiers for rx dma. See the DMA client binding,
		Documentation/devicetree/bindings/dma/dma.txt
		- dma-names: should include "rx".
		- clocks: a list of phandle + clock-specifer pairs, one for each entry in clock-names.
		- clock-names: should contain following:
		- "pdm_hclk": clock for PDM BUS
		- "pdm_clk" : clock for PDM controller
		- pinctrl-names: Must contain a "default" entry.
		- pinctrl-N: One property must exist for each entry in
		pinctrl-names. See ../pinctrl/pinctrl-bindings.txt
		for details of the property values.

		Example for rk3328 PDM controller:

		pdm: pdm@ff040000 {
		compatible = "rockchip,pdm";
		reg = <0x0 0xff040000 0x0 0x1000>;
		clocks = <&clk_pdm>, <&clk_gates28 0>;
		clock-names = "pdm_clk", "pdm_hclk";
		dmas = <&pdma 16>;
		#dma-cells = <1>;
		dma-names = "rx";
		pinctrl-names = "default", "sleep";
		pinctrl-0 = <&pdmm0_clk
		&pdmm0_fsync
		&pdmm0_sdi0
		&pdmm0_sdi1
		&pdmm0_sdi2
		&pdmm0_sdi3>;
		pinctrl-1 = <&pdmm0_sleep>;
		status = "disabled";
		};

+2 −0

Original line number	Diff line number	Diff line
		@@ -9,7 +9,9 @@ Required properties:
		- compatible: should be one of the following:
		- "rockchip,rk3066-spdif"
		- "rockchip,rk3188-spdif"
		- "rockchip,rk3228-spdif"
		- "rockchip,rk3288-spdif"
		- "rockchip,rk3328-spdif"
		- "rockchip,rk3366-spdif"
		- "rockchip,rk3368-spdif"
		- "rockchip,rk3399-spdif"