summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/rk312x.dtsi
diff options
context:
space:
mode:
authorSugar Zhang <sugar.zhang@rock-chips.com>2015-06-16 14:19:18 +0800
committerSugar Zhang <sugar.zhang@rock-chips.com>2015-06-16 14:19:18 +0800
commit96dca4bffea70c91f97922bcd98ba4d306b2eded (patch)
tree3ba83d145e8ba98f8a160ddc7867f64197e27d08 /arch/arm/boot/dts/rk312x.dtsi
parent56490c7b7e5df2942c8c065df138585f4c0576fb (diff)
dts: 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>
Diffstat (limited to 'arch/arm/boot/dts/rk312x.dtsi')
-rwxr-xr-xarch/arm/boot/dts/rk312x.dtsi6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 58add870beef..46fb32d7b5c9 100755
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -976,7 +976,7 @@
dais {
dai0 {
audio-codec = <&codec_hdmi_spdif>;
- i2s-controller = <&spdif>;
+ audio-controller = <&spdif>;
};
};
};
@@ -995,7 +995,7 @@
dais {
dai0 {
audio-codec = <&codec>;
- i2s-controller = <&i2s1>;
+ audio-controller = <&i2s1>;
format = "i2s";
//continuous-clock;
//bitclock-inversion;
@@ -1005,7 +1005,7 @@
};
dai1 {
audio-codec = <&codec>;
- i2s-controller = <&i2s1>;
+ audio-controller = <&i2s1>;
format = "i2s";
//continuous-clock;
//bitclock-inversion;