diff options
| author | Shengjiu Wang <b02247@freescale.com> | 2014-04-28 10:40:10 +0800 |
|---|---|---|
| committer | Shengjiu Wang <b02247@freescale.com> | 2014-04-29 12:43:02 +0800 |
| commit | 22d1bec44929e5fb6fa8316c4687d493c7d264b4 (patch) | |
| tree | 93c47078d636f776b5ef78063fe76f5941b5dcba /arch | |
| parent | 0673acf93a40e5b26b667b627dc62b81b377cc70 (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')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx.dtsi | 2 |
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 @@ }; esai: esai@02024000 { - compatible = "fsl,imx6q-esai"; + compatible = "fsl,imx35-esai"; reg = <0x02024000 0x4000>; interrupts = <0 51 0x04>; 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 @@ }; esai: esai@02024000 { - compatible = "fsl,imx6q-esai"; + compatible = "fsl,imx35-esai"; reg = <0x02024000 0x4000>; interrupts = <0 51 0x04>; clocks = <&clks IMX6SX_CLK_ESAI_IPG>, |