Commit c77c5b25 authored by Max Krummenacher's avatar Max Krummenacher Committed by Shawn Guo
Browse files

ARM: dts: imx6qdl-colibri: Mux mclk for sgtl5000 with the codec node 



Move the pin muxing for MCLK used by the codec to the codec node
instead of placing it inside the audmux pinctrl group.

While no negative effects have been observed this should make sure that
MCLK is provided when the codec driver is probed.

Follows commit fa51e1dc ("ARM: dts: imx6qdl-apalis: Fix sgtl5000
detection issue")

Reviewed-by: default avatarFabio Estevam <festevam@gmail.com>
Signed-off-by: default avatarMax Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent f2906aa8

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

+9 −2
Original line number Diff line number Diff line
@@ -520,6 +520,8 @@ codec: sgtl5000@a { 
		compatible = "fsl,sgtl5000";

		clocks = <&clks IMX6QDL_CLK_CKO>;

		lrclk-strength = <3>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_sgtl5000>;

		reg = <0x0a>;

		#sound-dai-cells = <0>;

		VDDA-supply = <&reg_module_3v3_audio>;
@@ -739,8 +741,6 @@ MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0xb0b1 /* SODIMM_106 */ 


	pinctrl_audmux: audmuxgrp {

		fsl,pins = <

			/* SGTL5000 sys_mclk */

			MX6QDL_PAD_GPIO_0__CCM_CLKO1	0x000b0

			MX6QDL_PAD_KEY_COL0__AUD5_TXC	0x130b0

			MX6QDL_PAD_KEY_ROW0__AUD5_TXD	0x130b0

			MX6QDL_PAD_KEY_COL1__AUD5_TXFS	0x130b0
@@ -991,6 +991,13 @@ MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x0f058 
		>;

	};



	pinctrl_sgtl5000: sgtl5000grp {

		fsl,pins = <

			/* SGTL5000 sys_mclk */

			MX6QDL_PAD_GPIO_0__CCM_CLKO1	0x000b0

		>;

	};



	pinctrl_spdif: spdifgrp {

		fsl,pins = <

			MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0