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, 28 insertions, 29 deletions

diff --git a/Documentation/devicetree/bindings/sound/cs42888.txt b/Documentation/devicetree/bindings/sound/cs42888.txt
deleted file mode 100644
index e669ef3972ca..000000000000
--- a/Documentation/devicetree/bindings/sound/cs42888.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-CS42888 audio CODEC
-
-This device supports I2C only.
-
-Required properties:
-
-  - compatible: "cirrus,cs42888"
-  - reg: the I2C address of the device.
-  - clocks: Phandle to the clock node.
-  - clock-names: Contains name for each entry in clocks.
-		"codec_osc" : the external oscillator.
-		"esai" : the hckt clock from esai.
-  - <name>-supply: Phandle to the regulator <name>.
-
-Note: cs42888 needs a regulators node and a clocks node.
-
-Example:
-In this case, the clock is external oscillator.
-
-codec: cs42888@48 {
-	compatible = "cirrus,cs42888";
-	reg = <0x048>;
-	clocks = <&codec_osc 0>;
-	clock-names = "codec_osc";
-	VA-supply = <&reg_audio>;
-	VD-supply = <&reg_audio>;
-	VLS-supply = <&reg_audio>;
-	VLC-supply = <&reg_audio>;
-};
diff --git a/Documentation/devicetree/bindings/sound/cs42xx8.txt b/Documentation/devicetree/bindings/sound/cs42xx8.txt
new file mode 100644
index 000000000000..f631fbca6284
--- /dev/null
+++ b/Documentation/devicetree/bindings/sound/cs42xx8.txt
@@ -0,0 +1,28 @@
+CS42448/CS42888 audio CODEC
+
+Required properties:
+
+  - compatible : must contain one of "cirrus,cs42448" and "cirrus,cs42888"
+
+  - reg : the I2C address of the device for I2C
+
+  - clocks : a list of phandles + clock-specifiers, one for each entry in
+    clock-names
+
+  - clock-names : must contain "mclk"
+
+  - VA-supply, VD-supply, VLS-supply, VLC-supply: power supplies for the device,
+    as covered in Documentation/devicetree/bindings/regulator/regulator.txt
+
+Example:
+
+codec: cs42888@48 {
+	compatible = "cirrus,cs42888";
+	reg = <0x48>;
+	clocks = <&codec_mclk 0>;
+	clock-names = "mclk";
+	VA-supply = <&reg_audio>;
+	VD-supply = <&reg_audio>;
+	VLS-supply = <&reg_audio>;
+	VLC-supply = <&reg_audio>;
+};