Commit f5402fff authored by Adam Ford's avatar Adam Ford Committed by Shawn Guo
Browse files

arm64: dts: imx8mn-beacon: Migrate sound card to simple-audio-card 



Instead of using a custom glue layer connecting the wm8962 CODEC
to the SAI3 sound-dai, migrate the sound card to simple-audio-card.

Signed-off-by: default avatarAdam Ford <aford173@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 69e2f37a

arch/arm64/boot/dts/freescale/imx8mn-beacon-baseboard.dtsi

+25 −12
Original line number Diff line number Diff line
@@ -74,18 +74,30 @@ reg_usb_otg_vbus: regulator-usb { 
		enable-active-high;

	};



	sound {

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

		model = "wm8962-audio";

		audio-cpu = <&sai3>;

		audio-codec = <&wm8962>;

		audio-routing =

			"Headphone Jack", "HPOUTL",

			"Headphone Jack", "HPOUTR",

			"Ext Spk", "SPKOUTL",

			"Ext Spk", "SPKOUTR",

			"AMIC", "MICBIAS",

			"IN3R", "AMIC";

	sound-wm8962 {

		compatible = "simple-audio-card";

		simple-audio-card,name = "wm8962";

		simple-audio-card,format = "i2s";

		simple-audio-card,widgets = "Headphone", "Headphones",

					    "Microphone", "Headset Mic",

					    "Speaker", "Speaker";

		simple-audio-card,routing = "Headphones", "HPOUTL",

					    "Headphones", "HPOUTR",

					    "Speaker", "SPKOUTL",

					    "Speaker", "SPKOUTR",

					    "Headset Mic", "MICBIAS",

					    "IN3R", "Headset Mic";



		simple-audio-card,cpu {

			sound-dai = <&sai3>;

		};



		simple-audio-card,codec {

			sound-dai = <&wm8962>;

			clocks = <&clk IMX8MN_CLK_SAI3_ROOT>;

			frame-master;

			bitclock-master;

		};

	};

};
@@ -183,6 +195,7 @@ wm8962: audio-codec@1a { 
			0x0000 /* 4:FN_DMICCDAT */

			0x0000 /* 5:Default */

		>;

		#sound-dai-cells = <0>;

	};

};