From: Sugar Zhang <sugar.zhang@rock-chips.com>
Date: Tue, 16 Jun 2015 06:15:24 +0000 (+0800)
Subject: ASoC: rockchip: rename property 'i2s-controller' to 'audio-controller'
X-Git-Tag: firefly_0821_release~4036
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=56490c7b7e5df2942c8c065df138585f4c0576fb;p=firefly-linux-kernel-4.4.55.git

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

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>
---

diff --git a/sound/soc/rockchip/card_info.c b/sound/soc/rockchip/card_info.c
index f787b0dcbf66..ddcea4e0bd9b 100755
--- a/sound/soc/rockchip/card_info.c
+++ b/sound/soc/rockchip/card_info.c
@@ -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;
 		}
 
diff --git a/sound/soc/rockchip/rk_rk616.c b/sound/soc/rockchip/rk_rk616.c
index 7e11c6907f45..a149ed1c9d23 100755
--- a/sound/soc/rockchip/rk_rk616.c
+++ b/sound/soc/rockchip/rk_rk616.c
@@ -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;
diff --git a/sound/soc/rockchip/rk_rt3261.c b/sound/soc/rockchip/rk_rt3261.c
index cf1683ba5bcc..9a2c2b048e7b 100644
--- a/sound/soc/rockchip/rk_rt3261.c
+++ b/sound/soc/rockchip/rk_rt3261.c
@@ -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;