ASoC: sti: suppress inappropriate fields for sti sound card
Suppress fields that can be handled in driver using compatible string. Rename compatibility strings accordingly. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:

committed by
Mark Brown

parent
5a4326d1c2
commit
04adc0842f
@@ -11,7 +11,9 @@ Documentation/devicetree/bindings/sound/simple-card.txt.
|
|||||||
---------------------------------------
|
---------------------------------------
|
||||||
|
|
||||||
Required properties:
|
Required properties:
|
||||||
- compatible: "st,sti-uni-player" or "st,sti-uni-reader"
|
- compatible: "st,stih407-uni-player-hdmi", "st,stih407-uni-player-pcm-out",
|
||||||
|
"st,stih407-uni-player-dac", "st,stih407-uni-player-spdif",
|
||||||
|
"st,stih407-uni-reader-pcm_in", "st,stih407-uni-reader-hdmi",
|
||||||
|
|
||||||
- st,syscfg: phandle to boot-device system configuration registers
|
- st,syscfg: phandle to boot-device system configuration registers
|
||||||
|
|
||||||
@@ -33,32 +35,24 @@ Required properties:
|
|||||||
"tx" for "st,sti-uni-player" compatibility
|
"tx" for "st,sti-uni-player" compatibility
|
||||||
"rx" for "st,sti-uni-reader" compatibility
|
"rx" for "st,sti-uni-reader" compatibility
|
||||||
|
|
||||||
- st,version: IP version integrated in SOC.
|
|
||||||
|
|
||||||
- dai-name: DAI name that describes the IP.
|
|
||||||
|
|
||||||
- st,mode: IP working mode depending on associated codec.
|
|
||||||
"HDMI" connected to HDMI codec and support IEC HDMI formats (player only).
|
|
||||||
"SPDIF" connected to SPDIF codec and support SPDIF formats (player only).
|
|
||||||
"PCM" PCM standard mode for I2S or TDM bus.
|
|
||||||
"TDM" TDM mode for TDM bus.
|
|
||||||
|
|
||||||
Required properties ("st,sti-uni-player" compatibility only):
|
Required properties ("st,sti-uni-player" compatibility only):
|
||||||
- clocks: CPU_DAI IP clock source, listed in the same order than the
|
- clocks: CPU_DAI IP clock source, listed in the same order than the
|
||||||
CPU_DAI properties.
|
CPU_DAI properties.
|
||||||
|
|
||||||
- st,uniperiph-id: internal SOC IP instance ID.
|
|
||||||
|
|
||||||
Optional properties:
|
Optional properties:
|
||||||
- pinctrl-0: defined for CPU_DAI@1 and CPU_DAI@4 to describe I2S PIOs for
|
- pinctrl-0: defined for CPU_DAI@1 and CPU_DAI@4 to describe I2S PIOs for
|
||||||
external codecs connection.
|
external codecs connection.
|
||||||
|
|
||||||
- pinctrl-names: should contain only one value - "default".
|
- pinctrl-names: should contain only one value - "default".
|
||||||
|
|
||||||
|
- st,tdm-mode: to declare to set TDM mode for unireader and uniplayer IPs.
|
||||||
|
Only compartible with IPs in charge of the external I2S/TDM bus.
|
||||||
|
Should be declared depending on associated codec.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
sti_uni_player1: sti-uni-player@1 {
|
sti_uni_player1: sti-uni-player@0x8D81000 {
|
||||||
compatible = "st,sti-uni-player";
|
compatible = "st,stih407-uni-player-hdmi";
|
||||||
status = "okay";
|
status = "okay";
|
||||||
#sound-dai-cells = <0>;
|
#sound-dai-cells = <0>;
|
||||||
st,syscfg = <&syscfg_core>;
|
st,syscfg = <&syscfg_core>;
|
||||||
@@ -66,15 +60,12 @@ Example:
|
|||||||
reg = <0x8D81000 0x158>;
|
reg = <0x8D81000 0x158>;
|
||||||
interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
|
interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;
|
||||||
dmas = <&fdma0 3 0 1>;
|
dmas = <&fdma0 3 0 1>;
|
||||||
st,dai-name = "Uni Player #1 (I2S)";
|
|
||||||
dma-names = "tx";
|
dma-names = "tx";
|
||||||
st,uniperiph-id = <1>;
|
st,tdm-mode = <1>;
|
||||||
st,version = <5>;
|
|
||||||
st,mode = "TDM";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
sti_uni_player2: sti-uni-player@2 {
|
sti_uni_player2: sti-uni-player@0x8D82000 {
|
||||||
compatible = "st,sti-uni-player";
|
compatible = "st,stih407-uni-player-pcm-out";
|
||||||
status = "okay";
|
status = "okay";
|
||||||
#sound-dai-cells = <0>;
|
#sound-dai-cells = <0>;
|
||||||
st,syscfg = <&syscfg_core>;
|
st,syscfg = <&syscfg_core>;
|
||||||
@@ -82,15 +73,11 @@ Example:
|
|||||||
reg = <0x8D82000 0x158>;
|
reg = <0x8D82000 0x158>;
|
||||||
interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
|
interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;
|
||||||
dmas = <&fdma0 4 0 1>;
|
dmas = <&fdma0 4 0 1>;
|
||||||
dai-name = "Uni Player #2 (DAC)";
|
|
||||||
dma-names = "tx";
|
dma-names = "tx";
|
||||||
st,uniperiph-id = <2>;
|
|
||||||
st,version = <5>;
|
|
||||||
st,mode = "PCM";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
sti_uni_player3: sti-uni-player@3 {
|
sti_uni_player3: sti-uni-player@0x8D85000 {
|
||||||
compatible = "st,sti-uni-player";
|
compatible = "st,stih407-uni-player-spdif";
|
||||||
status = "okay";
|
status = "okay";
|
||||||
#sound-dai-cells = <0>;
|
#sound-dai-cells = <0>;
|
||||||
st,syscfg = <&syscfg_core>;
|
st,syscfg = <&syscfg_core>;
|
||||||
@@ -99,14 +86,10 @@ Example:
|
|||||||
interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
|
interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;
|
||||||
dmas = <&fdma0 7 0 1>;
|
dmas = <&fdma0 7 0 1>;
|
||||||
dma-names = "tx";
|
dma-names = "tx";
|
||||||
dai-name = "Uni Player #3 (SPDIF)";
|
|
||||||
st,uniperiph-id = <3>;
|
|
||||||
st,version = <5>;
|
|
||||||
st,mode = "SPDIF";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
sti_uni_reader1: sti-uni-reader@1 {
|
sti_uni_reader1: sti-uni-reader@0x8D84000 {
|
||||||
compatible = "st,sti-uni-reader";
|
compatible = "st,stih407-uni-reader-hdmi";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
#sound-dai-cells = <0>;
|
#sound-dai-cells = <0>;
|
||||||
st,syscfg = <&syscfg_core>;
|
st,syscfg = <&syscfg_core>;
|
||||||
@@ -114,9 +97,6 @@ Example:
|
|||||||
interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>;
|
interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>;
|
||||||
dmas = <&fdma0 6 0 1>;
|
dmas = <&fdma0 6 0 1>;
|
||||||
dma-names = "rx";
|
dma-names = "rx";
|
||||||
dai-name = "Uni Reader #1 (HDMI RX)";
|
|
||||||
st,version = <3>;
|
|
||||||
st,mode = "PCM";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
2) sti-sas-codec: internal audio codec IPs driver
|
2) sti-sas-codec: internal audio codec IPs driver
|
||||||
|
Reference in New Issue
Block a user