diff options
| author | Nicolin Chen <Guangyu.Chen@freescale.com> | 2014-04-08 07:13:15 -0400 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:58:18 -0400 |
| commit | b6fca438dde1b4c0bbdee31729871d601f287dc9 (patch) | |
| tree | 4cfb7fdda1e5607cbddf8963739afbd9221e1f00 /arch/arm/boot | |
| parent | 8ecd9158728b846e2c13c7d81d33b4b277df1067 (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>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sl-evk-common.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb.dts | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index 9cd552f9a01a..100b9c8364d4 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi | |||
| @@ -129,7 +129,7 @@ | |||
| 129 | compatible = "fsl,imx6q-sabresd-wm8962", | 129 | compatible = "fsl,imx6q-sabresd-wm8962", |
| 130 | "fsl,imx-audio-wm8962"; | 130 | "fsl,imx-audio-wm8962"; |
| 131 | model = "wm8962-audio"; | 131 | model = "wm8962-audio"; |
| 132 | ssi-controller = <&ssi2>; | 132 | cpu-dai = <&ssi2>; |
| 133 | audio-codec = <&codec>; | 133 | audio-codec = <&codec>; |
| 134 | audio-routing = | 134 | audio-routing = |
| 135 | "Headphone Jack", "HPOUTL", | 135 | "Headphone Jack", "HPOUTL", |
diff --git a/arch/arm/boot/dts/imx6sl-evk-common.dtsi b/arch/arm/boot/dts/imx6sl-evk-common.dtsi index 0eb42954e80d..38be901cbac2 100644 --- a/arch/arm/boot/dts/imx6sl-evk-common.dtsi +++ b/arch/arm/boot/dts/imx6sl-evk-common.dtsi | |||
| @@ -90,7 +90,7 @@ | |||
| 90 | compatible = "fsl,imx6q-sabresd-wm8962", | 90 | compatible = "fsl,imx6q-sabresd-wm8962", |
| 91 | "fsl,imx-audio-wm8962"; | 91 | "fsl,imx-audio-wm8962"; |
| 92 | model = "wm8962-audio"; | 92 | model = "wm8962-audio"; |
| 93 | ssi-controller = <&ssi2>; | 93 | cpu-dai = <&ssi2>; |
| 94 | audio-codec = <&codec>; | 94 | audio-codec = <&codec>; |
| 95 | audio-routing = | 95 | audio-routing = |
| 96 | "Headphone Jack", "HPOUTL", | 96 | "Headphone Jack", "HPOUTL", |
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts index 57046d179c7a..d4e68ededd3e 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts | |||
| @@ -122,7 +122,7 @@ | |||
| 122 | compatible = "fsl,imx6q-sabresd-wm8962", | 122 | compatible = "fsl,imx6q-sabresd-wm8962", |
| 123 | "fsl,imx-audio-wm8962"; | 123 | "fsl,imx-audio-wm8962"; |
| 124 | model = "wm8962-audio"; | 124 | model = "wm8962-audio"; |
| 125 | ssi-controller = <&ssi2>; | 125 | cpu-dai = <&ssi2>; |
| 126 | audio-codec = <&codec>; | 126 | audio-codec = <&codec>; |
| 127 | audio-routing = | 127 | audio-routing = |
| 128 | "Headphone Jack", "HPOUTL", | 128 | "Headphone Jack", "HPOUTL", |