Commit d469b771 authored by Elinor Montmasson's avatar Elinor Montmasson Committed by Shawn Guo
Browse files

ARM: dts: imx6: update spdif sound card node properties 



The merge of imx-spdif driver into fsl-asoc-card brought
new DT properties that can be used with the "fsl,imx-audio-spdif"
compatible:
* The "spdif-controller" property from imx-spdif is named "audio-cpu"
  in fsl-asoc-card.
* fsl-asoc-card uses codecs explicitly declared in DT
  with "audio-codec".
  With an S/PDIF, codec drivers spdif_transmitter and
  spdif_receiver should be used.
  Driver imx-spdif used instead the dummy codec and a pair of
  boolean properties, "spdif-in" and "spdif-out".

While backward compatibility is kept to support properties
"spdif-controller", "spdif-in" and "spdif-out", using new properties has
several benefits:
* "audio-cpu" and "audio-codec" are more generic names reflecting
  that the fsl-asoc-card driver supports multiple hardware.
  They are properties already used by devices using the
  fsl-asoc-card driver.
  They are also similar to properties of simple-card: "cpu" and "codec".
* "spdif-in" and "spdif-out" imply the use of the dummy codec in the
  driver. However, there are already two codec drivers for the S/PDIF,
  spdif_transmitter and spdif_receiver.
  It is better to declare S/PDIF Tx and Rx devices in a DT, and then
  reference them with "audio-codec" than using the dummy codec.

For those reasons, this commit updates in-tree DTs to use the new
properties:
* Rename "spdif-controller" property to "audio-cpu".
* Declare S/PDIF transmitter and/or receiver devices, and use them with
  the "audio-codec" property instead of "spdif-out" and/or "spdif-in".

These modifications were tested only on an imx8mn-evk board.

Note that out-of-tree and old DTs are still supported.

Signed-off-by: default avatarElinor Montmasson <elinor.montmasson@savoirfairelinux.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 0353e980

arch/arm/boot/dts/nxp/imx/imx6q-cm-fx6.dts

+12 −3
Original line number Diff line number Diff line
@@ -127,12 +127,21 @@ simple-audio-card,codec { 
		};

	};



	spdif_out: spdif-out {

		compatible = "linux,spdif-dit";

		#sound-dai-cells = <0>;

	};



	spdif_in: spdif-in {

		compatible = "linux,spdif-dir";

		#sound-dai-cells = <0>;

	};



	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";

		spdif-controller = <&spdif>;

		spdif-out;

		spdif-in;

		audio-cpu = <&spdif>;

		audio-codec = <&spdif_out>, <&spdif_in>;

	};

};

arch/arm/boot/dts/nxp/imx/imx6q-prti6q.dts

+12 −3
Original line number Diff line number Diff line
@@ -111,12 +111,21 @@ simple-audio-card,codec { 
		};

	};



	spdif_out: spdif-out {

		compatible = "linux,spdif-dit";

		#sound-dai-cells = <0>;

	};



	spdif_in: spdif-in {

		compatible = "linux,spdif-dir";

		#sound-dai-cells = <0>;

	};



	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";

		spdif-controller = <&spdif>;

		spdif-in;

		spdif-out;

		audio-cpu = <&spdif>;

		audio-codec = <&spdif_out>, <&spdif_in>;

	};

};

arch/arm/boot/dts/nxp/imx/imx6q-tbs2910.dts

+7 −2
Original line number Diff line number Diff line
@@ -90,11 +90,16 @@ sound-sgtl5000 { 
		ssi-controller = <&ssi1>;

	};



	spdif_out: spdif-out {

		compatible = "linux,spdif-dit";

		#sound-dai-cells = <0>;

	};



	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "On-board SPDIF";

		spdif-controller = <&spdif>;

		spdif-out;

		audio-cpu = <&spdif>;

		audio-codec = <&spdif_out>;

	};

};

arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi

+12 −3
Original line number Diff line number Diff line
@@ -197,11 +197,20 @@ sound { 
		ssi-controller = <&ssi1>;

	};



	spdif_out: spdif-out {

		compatible = "linux,spdif-dit";

		#sound-dai-cells = <0>;

	};



	spdif_in: spdif-in {

		compatible = "linux,spdif-dir";

		#sound-dai-cells = <0>;

	};



	sound_spdif: sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		spdif-controller = <&spdif>;

		spdif-in;

		spdif-out;

		audio-cpu = <&spdif>;

		audio-codec = <&spdif_out>, <&spdif_in>;

		model = "imx-spdif";

		status = "disabled";

	};

arch/arm/boot/dts/nxp/imx/imx6qdl-apf6dev.dtsi

+7 −2
Original line number Diff line number Diff line
@@ -121,11 +121,16 @@ sound { 
		mux-ext-port = <3>;

	};



	spdif_out: spdif-out {

		compatible = "linux,spdif-dit";

		#sound-dai-cells = <0>;

	};



	sound-spdif {

		compatible = "fsl,imx-audio-spdif";

		model = "imx-spdif";

		spdif-controller = <&spdif>;

		spdif-out;

		audio-cpu = <&spdif>;

		audio-codec = <&spdif_out>;

	};

};