aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorShengjiu Wang <b02247@freescale.com>2014-04-27 22:40:10 -0400
committerShengjiu Wang <b02247@freescale.com>2014-04-29 00:43:02 -0400
commit22d1bec44929e5fb6fa8316c4687d493c7d264b4 (patch)
tree93c47078d636f776b5ef78063fe76f5941b5dcba /arch/arm/boot
parent0673acf93a40e5b26b667b627dc62b81b377cc70 (diff)
ENGR00310878-2 ASoC: fsl_esai: cherry-pick from upstream and merge to mainline
cherry-picked commit is 43d24e76b69826ce32292f47060ad78cdd0197fa Header of this commit is "ASoC: fsl_esai: Add ESAI CPU DAI driver", use upstream driver to replace current one. Merged feature is: 1. Move setting of PRRC and PCRC to the end of hw_params, and disable it in shutdown function. 2. Merged the xrun handler with this commit. 3. Use dma init with NO_RESIDUE|NO_DT|COMPAT. 4. Add spba clock for ESAI Signed-off-by: Shengjiu Wang <b02247@freescale.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/imx6qdl.dtsi2
-rw-r--r--arch/arm/boot/dts/imx6sx.dtsi2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 9cdd0d3710b8..d8a008669e17 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -246,7 +246,7 @@
246 }; 246 };
247 247
248 esai: esai@02024000 { 248 esai: esai@02024000 {
249 compatible = "fsl,imx6q-esai"; 249 compatible = "fsl,imx35-esai";
250 reg = <0x02024000 0x4000>; 250 reg = <0x02024000 0x4000>;
251 interrupts = <0 51 0x04>; 251 interrupts = <0 51 0x04>;
252 clocks = <&clks 228>, <&clks 229>, <&clks 118>, <&clks 228>, <&clks 156>; 252 clocks = <&clks 228>, <&clks 229>, <&clks 118>, <&clks 228>, <&clks 156>;
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 9d04725f07d4..134329746b91 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -244,7 +244,7 @@
244 }; 244 };
245 245
246 esai: esai@02024000 { 246 esai: esai@02024000 {
247 compatible = "fsl,imx6q-esai"; 247 compatible = "fsl,imx35-esai";
248 reg = <0x02024000 0x4000>; 248 reg = <0x02024000 0x4000>;
249 interrupts = <0 51 0x04>; 249 interrupts = <0 51 0x04>;
250 clocks = <&clks IMX6SX_CLK_ESAI_IPG>, 250 clocks = <&clks IMX6SX_CLK_ESAI_IPG>,