Merge branch 'vf610-ac97-sai' into toradex_vf_3.18-next

5 files changed, 109 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi
index d7e3771b70ed..104c6c47ebf8 100644
--- a/arch/arm/boot/dts/vf500.dtsi
+++ b/arch/arm/boot/dts/vf500.dtsi
@@ -148,6 +148,10 @@
 	interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
 };
 
+&sai0 {
+	interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
+};
+
 &sai2 {
 	interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
 };
diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi
index 19fe045b8334..8bc0548aabc9 100644
--- a/arch/arm/boot/dts/vf610-colibri.dtsi
+++ b/arch/arm/boot/dts/vf610-colibri.dtsi
@@ -17,9 +17,89 @@
 	memory {
 		reg = <0x80000000 0x10000000>;
 	};
+
+	sound {
+		compatible = "fsl,fsl-sai-audio-wm9712";
+		fsl,ac97-controller = <&sai2>;
+
+		fsl,model = "Colibri VF61 AC97 Audio";
+
+		fsl,audio-routing =
+			"Headphone", "HPOUTL",
+			"Headphone", "HPOUTR",
+			"LineIn", "LINEINL",
+			"LineIn", "LINEINR",
+			"Mic", "MIC1";
+	};
+};
+
+&sai0 {
+	compatible = "fsl,vf610-sai-clk";
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_sai0>;
+	status = "okay";
+};
+
+&sai2 {
+	compatible = "fsl,vf610-sai-ac97";
+	#sound-dai-cells = <0>;
+
+	pinctrl-names = "default", "ac97-running", "ac97-reset",
+			"ac97-warm-reset";
+	pinctrl-0 = <&pinctrl_sai2_ac97_running>;
+	pinctrl-1 = <&pinctrl_sai2_ac97_running>;
+	pinctrl-2 = <&pinctrl_sai2_ac97_reset>;
+	pinctrl-3 = <&pinctrl_sai2_ac97_reset>;
+	ac97-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH &gpio0 8 GPIO_ACTIVE_HIGH
+		      &gpio0 13 GPIO_ACTIVE_HIGH>;
+	status = "okay";
 };
 
 &L2 {
 	arm,data-latency = <2 1 2>;
 	arm,tag-latency = <3 2 3>;
 };
+
+&iomuxc {
+	vf610-colibri {
+		pinctrl_sai0: sai0grp_1 {
+			fsl,pins = <
+				VF610_PAD_PTB23__SAI0_TX_BCLK	0x31C3
+			>;
+		};
+		pinctrl_sai2_ac97_reset: sai2grp_1 {
+			fsl,pins = <
+				/* Pen-down */
+				VF610_PAD_PTA11__GPIO_4		0x22ed
+				/* AC97 SData Out (test mode selection) */
+				VF610_PAD_PTA18__GPIO_8		0x22ed
+				/* AC97 Sync (warm reset) */
+				VF610_PAD_PTA19__GPIO_9		0x22ed
+				/* AC97 Reset (cold reset) */
+				VF610_PAD_PTA23__GPIO_13	0x22eb
+			>;
+		};
+
+		pinctrl_sai2_ac97_running: sai2grp_2 {
+			fsl,pins = <
+				/* AC97 Bit clock */
+				VF610_PAD_PTA16__SAI2_TX_BCLK	0x31C3
+
+				/* AC97 SData Out */
+				VF610_PAD_PTA18__SAI2_TX_DATA	0x31C2
+
+				/* AC97 Sync */
+				VF610_PAD_PTA19__SAI2_TX_SYNC	0x31C3
+
+				/* AC97 SData In */
+				VF610_PAD_PTA22__SAI2_RX_DATA	0x0041
+
+				/* AC97 Reset (cold reset, keep output buffer on) */
+				VF610_PAD_PTA23__GPIO_13	0x22eb
+
+				/* GenIRQ */
+				VF610_PAD_PTB2__GPIO_24		0x22ed
+			>;
+		};
+	};
+};
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index dfed92bd7bad..6eeaf9ddbc34 100644
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -161,11 +161,26 @@
 				status = "disabled";
 			};
 
+			sai0: sai@4002f000 {
+				compatible = "fsl,vf610-sai";
+				reg = <0x4002f000 0x1000>;
+				clocks = <&clks VF610_CLK_SAI0>,
+					<&clks VF610_CLK_SAI0>,
+					<&clks 0>, <&clks 0>;
+				clock-names = "bus", "mclk1", "mclk2", "mclk3";
+				dma-names = "tx", "rx";
+				dmas = <&edma0 0 17>,
+					<&edma0 0 16>;
+				status = "disabled";
+			};
+
 			sai2: sai@40031000 {
 				compatible = "fsl,vf610-sai";
 				reg = <0x40031000 0x1000>;
-				clocks = <&clks VF610_CLK_SAI2>;
-				clock-names = "sai";
+				clocks = <&clks VF610_CLK_SAI2>,
+					<&clks VF610_CLK_SAI2>,
+					<&clks 0>, <&clks 0>;
+				clock-names = "bus", "mclk1", "mclk2", "mclk3";
 				dma-names = "tx", "rx";
 				dmas = <&edma0 0 21>,
 					<&edma0 0 20>;
diff --git a/arch/arm/configs/colibri_vf_defconfig b/arch/arm/configs/colibri_vf_defconfig
index c6c9056ac959..af36561b5f9d 100644
--- a/arch/arm/configs/colibri_vf_defconfig
+++ b/arch/arm/configs/colibri_vf_defconfig
@@ -107,6 +107,9 @@ CONFIG_KEYBOARD_IMX=y
 # CONFIG_MOUSE_PS2 is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_EGALAX=y
+CONFIG_TOUCHSCREEN_WM97XX=y
+# CONFIG_TOUCHSCREEN_WM9705 is not set
+# CONFIG_TOUCHSCREEN_WM9713 is not set
 CONFIG_TOUCHSCREEN_STMPE=y
 CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
 # CONFIG_LEGACY_PTYS is not set
@@ -159,6 +162,7 @@ CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SND_IMX_SOC=y
+CONFIG_SND_SOC_FSL_SAI_WM9712=y
 CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
diff --git a/arch/arm/mach-imx/clk-vf610.c b/arch/arm/mach-imx/clk-vf610.c
index 9fc721acf39d..a731975b23c3 100644
--- a/arch/arm/mach-imx/clk-vf610.c
+++ b/arch/arm/mach-imx/clk-vf610.c
@@ -403,10 +403,11 @@ static void __init vf610_clocks_init(struct device_node *ccm_node)
 	clk_set_rate(clk[VF610_CLK_QSPI1_X2_DIV], clk_get_rate(clk[VF610_CLK_QSPI1_X4_DIV]) / 2);
 	clk_set_rate(clk[VF610_CLK_QSPI1_X1_DIV], clk_get_rate(clk[VF610_CLK_QSPI1_X2_DIV]) / 2);
 
-	clk_set_parent(clk[VF610_CLK_SAI0_SEL], clk[VF610_CLK_AUDIO_EXT]);
-	clk_set_parent(clk[VF610_CLK_SAI1_SEL], clk[VF610_CLK_AUDIO_EXT]);
-	clk_set_parent(clk[VF610_CLK_SAI2_SEL], clk[VF610_CLK_AUDIO_EXT]);
+	clk_set_parent(clk[VF610_CLK_SAI0_SEL], clk[VF610_CLK_PLL4_MAIN_DIV]);
+	clk_set_parent(clk[VF610_CLK_SAI1_SEL], clk[VF610_CLK_PLL4_MAIN_DIV]);
+	clk_set_parent(clk[VF610_CLK_SAI2_SEL], clk[VF610_CLK_PLL4_MAIN_DIV]);
 	clk_set_parent(clk[VF610_CLK_SAI3_SEL], clk[VF610_CLK_AUDIO_EXT]);
+	clk_set_rate(clk[VF610_CLK_PLL4_MAIN_DIV], 147456000);
 
 	clk_set_parent(clk[VF610_CLK_DCU0_SEL], clk[VF610_CLK_PLL1_PFD2]);