Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5307edb authored by Jagan Teki's avatar Jagan Teki Committed by Shawn Guo
Browse files

ARM: dts: imx6qdl-icore-rqs: Switch to use simple-audio-card 



This patch replace fsl,imx-audio-sgtl5000 and use simple-audio-card
for Engicam i.CoreM6 RQS QDL platform boards.

This patch also fix, pinctrl_adumux.

Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: default avatarJagan Teki <jagan@amarulasolutions.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 4f0c2c75

arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi

+48 −12
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 


#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/imx6qdl-clock.h>

#include <dt-bindings/sound/fsl-imx-audmux.h>



/ {

	memory {
@@ -120,28 +121,61 @@ 
	};



	sound {

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

		model = "imx-audio-sgtl5000";

		ssi-controller = <&ssi1>;

		audio-codec = <&sgtl5000>;

		audio-routing =

		compatible = "simple-audio-card";

		simple-audio-card,name = "imx6qdl-icore-rqs-sgtl5000";

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

		simple-audio-card,bitclock-master = <&dailink_master>;

		simple-audio-card,frame-master = <&dailink_master>;

		simple-audio-card,widgets =

			"Microphone", "Mic Jack",

			"Headphone", "Headphone Jack",

			"Line", "Line In Jack",

			"Speaker", "Line Out Jack",

			"Speaker", "Ext Spk";

		simple-audio-card,routing =

			"MIC_IN", "Mic Jack",

			"Mic Jack", "Mic Bias",

			"Headphone Jack", "HP_OUT";

		mux-int-port = <1>;

		mux-ext-port = <4>;

	};



		simple-audio-card,cpu {

			sound-dai = <&ssi1>;

		};



&clks {

	assigned-clocks = <&clks IMX6QDL_CLK_LVDS2_SEL>;

	assigned-clock-parents = <&clks IMX6QDL_CLK_OSC>;

		dailink_master: simple-audio-card,codec {

			sound-dai = <&sgtl5000>;

		};

	};

};



&audmux {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_audmux>;

	status = "okay";



	audmux_ssi1 {

		fsl,audmux-port = <MX51_AUDMUX_PORT1_SSI0>;

		fsl,port-config = <

			(IMX_AUDMUX_V2_PTCR_TFSDIR |

			IMX_AUDMUX_V2_PTCR_TFSEL(MX51_AUDMUX_PORT4) |

			IMX_AUDMUX_V2_PTCR_TCLKDIR |

			IMX_AUDMUX_V2_PTCR_TCSEL(MX51_AUDMUX_PORT4) |

			IMX_AUDMUX_V2_PTCR_SYN)

			IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT4)

		>;

	};



	audmux_aud4 {

		fsl,audmux-port = <MX51_AUDMUX_PORT4>;

		fsl,port-config = <

			IMX_AUDMUX_V2_PTCR_SYN

			IMX_AUDMUX_V2_PDCR_RXDSEL(MX51_AUDMUX_PORT1_SSI0)

		>;

	};

};



&clks {

	assigned-clocks = <&clks IMX6QDL_CLK_LVDS2_SEL>;

	assigned-clock-parents = <&clks IMX6QDL_CLK_OSC>;

};



&fec {
@@ -189,6 +223,7 @@ 
	status = "okay";



	sgtl5000: codec@a {

		#sound-dai-cells = <0>;

		compatible = "fsl,sgtl5000";

		reg = <0x0a>;

		clocks = <&clks IMX6QDL_CLK_CKO>;
@@ -206,6 +241,7 @@ 
};



&ssi1 {

	fsl,mode = "i2s-slave";

	status = "okay";

};

arch/arm/boot/dts/imx6qdl-icore.dtsi

+2 −2

File changed.

Contains only whitespace changes.