shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: rockchip: rename property 'i2s-controller' to 'audio-controller'

Browse Source 
because we have i2s controller, spdif controller, so we use audio-controller
to include both.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
This commit is contained in:
Sugar Zhang
2015-06-16 14:15:24 +08:00
parent 09db66c5b4
commit 56490c7b7e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/rockchip/card_info.c
View File

@@ -18,7 +18,7 @@
/*
Get sound card infos:
audio-codec
i2s-controller
audio-controller
format
@@ -30,14 +30,14 @@
bitclock-master
frame-master
Get audio-codec and i2s-controller in this fun,
Get audio-codec and audio-controller in this fun,
and get oher infos in fun snd_soc_of_parse_daifmt().
Set in dts:
dais {
dai0 {
audio-codec = <&codec_of_node>;
i2s-controller = <&cpu_of_node>;
audio-controller = <&cpu_of_node>;
format = "i2s";
//continuous-clock;
//bitclock-inversion;
@@ -48,7 +48,7 @@
dai1 {
audio-codec = <&codec_of_node>;
i2s-controller = <&cpu_of_node>;
audio-controller = <&cpu_of_node>;
format = "dsp_a";
//continuous-clock;
bitclock-inversion;
@@ -101,10 +101,10 @@ int rockchip_of_get_sound_card_info_(struct snd_soc_card *card,
card->dai_link[dai_num].cpu_of_node = of_parse_phandle(
child_dai_node,
"i2s-controller", 0);
"audio-controller", 0);
if (!card->dai_link[dai_num].cpu_of_node) {
dev_err(card->dev,
"Property 'i2s-controller' missing or invalid\n");
"Property 'audio-controller' missing or invalid\n");
return -EINVAL;
}

4
sound/soc/rockchip/rk_rk616.c
View File

@@ -302,7 +302,7 @@ static struct snd_soc_card rockchip_rk616_snd_card = {
* dais {
* dai0 {
* audio-codec = <&rk616>;
* i2s-controller = <&i2s0>;
* audio-controller = <&i2s0>;
* format = "i2s";
* //continuous-clock;
* //bitclock-inversion;
@@ -313,7 +313,7 @@ static struct snd_soc_card rockchip_rk616_snd_card = {
*
* dai1 {
* audio-codec = <&rk616>;
* i2s-controller = <&i2s0>;
* audio-controller = <&i2s0>;
* format = "dsp_a";
* //continuous-clock;
* bitclock-inversion;

4
sound/soc/rockchip/rk_rt3261.c
View File

@@ -259,7 +259,7 @@ dts:
dais {
dai0 {
audio-codec = <&rt3261>;
i2s-controller = <&i2s0>;
audio-controller = <&i2s0>;
format = "i2s";
//continuous-clock;
//bitclock-inversion;
@@ -270,7 +270,7 @@ dts:
dai1 {
audio-codec = <&rt3261>;
i2s-controller = <&i2s0>;
audio-controller = <&i2s0>;
format = "dsp_a";
//continuous-clock;
bitclock-inversion;