From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 4 Dec 2015 12:39:28 +0000 (+0100)
Subject: ARM: dts: imx6ul: fix sai compatible strings, clocks and DMA types
X-Git-Tag: KARO-TXUL-2015-12-04~7
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=092029d54b749852dda8a1d1c0546f4c59bca3be

ARM: dts: imx6ul: fix sai compatible strings, clocks and DMA types
---

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 993d1cb09faf..7723ee8cbd91 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -271,49 +271,46 @@
 
 				sai1: sai@02028000 {
 					#sound-dai-cells = <0>;
-					compatible = "fsl,imx6q-ssi",
-							"fsl,imx51-ssi";
+					compatible = "fsl,imx6sx-sai";
 					reg = <0x02028000 0x4000>;
 					interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks IMX6UL_CLK_SAI1_IPG>,
-						 <&clks IMX6UL_CLK_SAI1>;
-					clock-names = "ipg", "baud";
-					dmas = <&sdma 35 1 0>,
-					       <&sdma 36 1 0>;
+						 <&clks IMX6UL_CLK_SAI1>,
+						 <&clks 0>, <&clks 0>;
+					clock-names = "bus", "mclk1", "mclk2", "mclk3";
+					dmas = <&sdma 35 24 0>,
+					       <&sdma 36 24 0>;
 					dma-names = "rx", "tx";
-					fsl,fifo-depth = <15>;
 					status = "disabled";
 				};
 
 				sai2: sai@0202c000 {
 					#sound-dai-cells = <0>;
-					compatible = "fsl,imx6q-ssi",
-							"fsl,imx51-ssi";
+					compatible = "fsl,imx6sx-sai";
 					reg = <0x0202c000 0x4000>;
 					interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks IMX6UL_CLK_SAI2_IPG>,
-						 <&clks IMX6UL_CLK_SAI2>;
-					clock-names = "ipg", "baud";
-					dmas = <&sdma 37 1 0>,
-					       <&sdma 38 1 0>;
+						 <&clks IMX6UL_CLK_SAI2>,
+						 <&clks 0>, <&clks 0>;
+					clock-names = "bus", "mclk1", "mclk2", "mclk3";
+					dmas = <&sdma 37 24 0>,
+					       <&sdma 38 24 0>;
 					dma-names = "rx", "tx";
-					fsl,fifo-depth = <15>;
 					status = "disabled";
 				};
 
 				sai3: sai@02030000 {
 					#sound-dai-cells = <0>;
-					compatible = "fsl,imx6q-ssi",
-							"fsl,imx51-ssi";
+					compatible = "fsl,imx6sx-sai";
 					reg = <0x02030000 0x4000>;
 					interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks IMX6UL_CLK_SAI3_IPG>,
-						 <&clks IMX6UL_CLK_SAI3>;
-					clock-names = "ipg", "baud";
-					dmas = <&sdma 39 1 0>,
-					       <&sdma 40 1 0>;
+						 <&clks IMX6UL_CLK_SAI3>,
+						 <&clks 0>, <&clks 0>;
+					clock-names = "bus", "mclk1", "mclk2", "mclk3";
+					dmas = <&sdma 39 24 0>,
+					       <&sdma 40 24 0>;
 					dma-names = "rx", "tx";
-					fsl,fifo-depth = <15>;
 					status = "disabled";
 				};
 			};