diff options
author | Jyri Sarha <jsarha@ti.com> | 2013-10-18 11:37:44 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-22 07:03:21 -0400 |
commit | 3af9e0315699b60762157662f721f50fd1fe529b (patch) | |
tree | 72b0a194b25521da09a7ba0c0030bb1e357c8ab5 | |
parent | 4023fe6ff2192d6050647571ea54f5497b2ec8f6 (diff) |
ASoC: davinci-mcasp: Change compatible property model to more accurate
Change the model omap2-mcasp-audio in compatible property to
am33xx-mcasp-audio as omap2 does not have mcasp.
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt | 2 | ||||
-rw-r--r-- | sound/soc/davinci/davinci-mcasp.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt index c3ccde71f97a..1945aecf0a3a 100644 --- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt +++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt | |||
@@ -4,7 +4,7 @@ Required properties: | |||
4 | - compatible : | 4 | - compatible : |
5 | "ti,dm646x-mcasp-audio" : for DM646x platforms | 5 | "ti,dm646x-mcasp-audio" : for DM646x platforms |
6 | "ti,da830-mcasp-audio" : for both DA830 & DA850 platforms | 6 | "ti,da830-mcasp-audio" : for both DA830 & DA850 platforms |
7 | "ti,omap2-mcasp-audio" : for OMAP2 platforms (TI81xx, AM33xx) | 7 | "ti,am33xx-mcasp-audio" : for AM33xx platforms (AM33xx, TI81xx) |
8 | 8 | ||
9 | - reg : Should contain reg specifiers for the entries in the reg-names property. | 9 | - reg : Should contain reg specifiers for the entries in the reg-names property. |
10 | - reg-names : Should contain: | 10 | - reg-names : Should contain: |
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c index 4c207508348f..bbc9a0793eb9 100644 --- a/sound/soc/davinci/davinci-mcasp.c +++ b/sound/soc/davinci/davinci-mcasp.c | |||
@@ -1033,7 +1033,7 @@ static const struct of_device_id mcasp_dt_ids[] = { | |||
1033 | .data = &da830_mcasp_pdata, | 1033 | .data = &da830_mcasp_pdata, |
1034 | }, | 1034 | }, |
1035 | { | 1035 | { |
1036 | .compatible = "ti,omap2-mcasp-audio", | 1036 | .compatible = "ti,am33xx-mcasp-audio", |
1037 | .data = &omap2_mcasp_pdata, | 1037 | .data = &omap2_mcasp_pdata, |
1038 | }, | 1038 | }, |
1039 | { /* sentinel */ } | 1039 | { /* sentinel */ } |