diff options
author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-04-08 19:13:15 +0800 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2015-04-14 14:00:18 -0500 |
commit | 4658270a9a18b3ed00266c20d88c9fa44f77714d (patch) | |
tree | 67c04f386cdaf4b134098fcf87fd302396cdd244 /Documentation | |
parent | c41d8867ea1d3f629ac34b5ebded68bb5b5d6938 (diff) |
ENGR00307635-5 ASoC: imx-wm8962: Add non-SSI cpu dai support
The current imx-wm8962 machine driver is designed for SSI as CPU DAI only
while as its name we should make the driver more generic to any other CPU
DAI on i.MX serires -- ESAI, SAI for example.
So this patch makes the driver more general so as to support those non-SSI
cases.
Acked-by: Wang Shengjiu <b02247@freescale.com>
Signed-off-by: Nicolin Chen <Guangyu.Chen@freescale.com>
(cherry picked from commit b6fca438dde1b4c0bbdee31729871d601f287dc9)
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt b/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt index 5d4222e72585..fe1e119d7572 100644 --- a/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt +++ b/Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt @@ -3,7 +3,7 @@ Freescale i.MX audio complex with WM8962 codec Required properties: - compatible : "fsl,imx-audio-wm8962" - model : The user-visible name of this sound complex -- ssi-controller : The phandle of the i.MX SSI controller +- cpu-dai : The phandle of CPU DAI - audio-codec : The phandle of the WM8962 audio codec - audio-routing : A list of the connections between audio components. Each entry is a pair of strings, the first being the connection's sink, @@ -36,7 +36,7 @@ sound { compatible = "fsl,imx6q-sabresd-wm8962", "fsl,imx-audio-wm8962"; model = "wm8962-audio"; - ssi-controller = <&ssi2>; + cpu-dai = <&ssi2>; audio-codec = <&codec>; audio-routing = "Headphone Jack", "HPOUTL", |