ENGR00313280-2 ASoC: fsl: Merge upsteamed cs42xx8 driver.

The upsteamed commit is 0c516b4ff85c0be4cee5b30ae59c9565c7f91a00

ASoC: cs42xx8: Add codec driver support for CS42448/CS42888

This patch adds support for the Cirrus Logic CS42448/CS42888 Audio CODEC that
has six/four 24-bit AD and eight 24-bit DA converters.

[ CS42448/CS42888 supports both I2C and SPI control ports. As initial patch,
  this patch only adds the support for I2C. ]

Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
Acked-by: Brian Austin <brian.austin@cirrus.com>
Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Shengjiu Wang <b02247@freescale.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index f1d882a7503f..30668ecf24d0 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -441,7 +441,7 @@
                 compatible = "cirrus,cs42888";
                 reg = <0x048>;
                 clocks = <&codec_osc 0>;
-                clock-names = "codec_osc";
+                clock-names = "mclk";
                 VA-supply = <&reg_audio>;
                 VD-supply = <&reg_audio>;
                 VLS-supply = <&reg_audio>;
diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
index 901b469ee508..41a4ce274911 100644
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
@@ -301,7 +301,7 @@
                 compatible = "cirrus,cs42888";
                 reg = <0x048>;
                 clocks = <&clks IMX6SX_CLK_ESAI_EXTAL>;
-                clock-names = "esai_extal";
+                clock-names = "mclk";
                 VA-supply = <&reg_3p3v>;
                 VD-supply = <&reg_3p3v>;
                 VLS-supply = <&reg_3p3v>;