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

Commit 937d9a01 authored by Valentin Raevsky's avatar Valentin Raevsky Committed by Shawn Guo
Browse files

ARM: dts: imx6q-cm-fx6: add analog audio support 



The cm-fx6 module has an onboard Wolfson wm8731 codec which is muxed
to the ssi2 controller. Unlike most (all?) supported i.MX6 board/codec
combinations the wm8731 is operated in slave mode and the clock setup
is static.

Add support for it.

Signed-off-by: default avatarValentin Raevsky <valentin@compulab.co.il>
[christopher.spinrath@rwth-aachen.de: enhanced commit message, ported
  to upstream and some cleanup]
Signed-off-by: default avatarChristopher Spinrath <christopher.spinrath@rwth-aachen.de>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent d0883915

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

+83 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 


/dts-v1/;

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

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

#include "imx6q.dtsi"



/ {
@@ -90,6 +91,34 @@ 
		enable-active-high;

	};



	sound-analog {

		compatible = "simple-audio-card";

		simple-audio-card,name = "On-board analog audio";

		simple-audio-card,widgets =

			"Headphone", "Headphone Jack",

			"Line", "Line Out",

			"Microphone", "Mic Jack",

			"Line", "Line In";

		simple-audio-card,routing =

			"Headphone Jack", "RHPOUT",

			"Headphone Jack", "LHPOUT",

			"MICIN", "Mic Bias",

			"Mic Bias", "Mic Jack";

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

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

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

		simple-audio-card,bitclock-inversion;



		sound_master: simple-audio-card,cpu {

			sound-dai = <&ssi2>;

			system-clock-frequency = <2822400>;

		};



		simple-audio-card,codec {

			sound-dai = <&wm8731>;

		};

	};



	sound-spdif {

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

		model = "imx-spdif";
@@ -99,6 +128,36 @@ 
	};

};



&audmux {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_audmux>;

	status = "okay";



	ssi2 {

		fsl,audmux-port = <1>;

		fsl,port-config = <

			(IMX_AUDMUX_V2_PTCR_RCLKDIR |

			IMX_AUDMUX_V2_PTCR_RCSEL(3 | 0x8) |

			IMX_AUDMUX_V2_PTCR_TCLKDIR |

			IMX_AUDMUX_V2_PTCR_TCSEL(3))

			IMX_AUDMUX_V2_PDCR_RXDSEL(3)

		>;

	};



	audmux4 {

		fsl,audmux-port = <3>;

		fsl,port-config = <

			(IMX_AUDMUX_V2_PTCR_TFSDIR |

			IMX_AUDMUX_V2_PTCR_TFSEL(1) |

			IMX_AUDMUX_V2_PTCR_RCLKDIR |

			IMX_AUDMUX_V2_PTCR_RCSEL(1 | 0x8) |

			IMX_AUDMUX_V2_PTCR_TCLKDIR |

			IMX_AUDMUX_V2_PTCR_TCSEL(1))

			IMX_AUDMUX_V2_PDCR_RXDSEL(1)

		>;

	};

};



&cpu0 {

	/*

	 * Although the imx6q fuse indicates that 1.2GHz operation is possible,
@@ -160,9 +219,25 @@ 
		reg = <0x50>;

		pagesize = <16>;

	};



	wm8731: codec@1a {

		#sound-dai-cells = <0>;

		compatible = "wlf,wm8731";

		reg = <0x1a>;

	};

};



&iomuxc {

	pinctrl_audmux: audmuxgrp {

		fsl,pins = <

			MX6QDL_PAD_SD2_CMD__AUD4_RXC   0x17059

			MX6QDL_PAD_SD2_DAT0__AUD4_RXD  0x17059

			MX6QDL_PAD_SD2_DAT3__AUD4_TXC  0x17059

			MX6QDL_PAD_SD2_DAT2__AUD4_TXD  0x17059

			MX6QDL_PAD_SD2_DAT1__AUD4_TXFS 0x17059

		>;

	};



	pinctrl_ecspi1: ecspi1grp {

		fsl,pins = <

			MX6QDL_PAD_EIM_D16__ECSPI1_SCLK	0x100b1
@@ -279,6 +354,14 @@ 
	status = "okay";

};



&ssi2 {

	assigned-clocks = <&clks IMX6QDL_CLK_SSI2_SEL>,

			<&clks IMX6QDL_CLK_PLL4_AUDIO_DIV>;

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

	assigned-clock-rates = <0>, <786432000>;

	status = "okay";

};



&uart4 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_uart4>;