From 53d3292a72fdb3972010a7ef66db2f7ae0ca3e77 Mon Sep 17 00:00:00 2001 From: sugar Date: Mon, 8 Dec 2014 09:11:51 +0800 Subject: [PATCH] Revert "rk3126/rk3126b: i2s: use i2s_2ch." This reverts commit 942d98b30dd2c9907b4f53c160a16ee4216745a0. --- arch/arm/boot/dts/rk312x.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index d92bf5c7799b..875a2f2374ac 100755 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -483,6 +483,7 @@ //pinctrl-names = "default", "sleep"; //pinctrl-0 = <&i2s0_mclk &i2s0_sclk &i2s0_lrckrx &i2s0_lrcktx &i2s0_sdi &i2s0_sdo>; //pinctrl-1 = <&i2s0_gpio>; + status = "disabled"; }; i2s1: i2s@10200000 { @@ -495,7 +496,6 @@ dmas = <&pdma 14>, <&pdma 15>; //#dma-cells = <2>; dma-names = "tx", "rx"; - status = "disabled"; }; spdif: spdif@10204000 { @@ -972,7 +972,7 @@ dais { dai0 { audio-codec = <&codec>; - i2s-controller = <&i2s0>; + i2s-controller = <&i2s1>; format = "i2s"; //continuous-clock; //bitclock-inversion; @@ -982,7 +982,7 @@ }; dai1 { audio-codec = <&codec>; - i2s-controller = <&i2s0>; + i2s-controller = <&i2s1>; format = "i2s"; //continuous-clock; //bitclock-inversion; -- 2.34.1