From 4f14b281b4ea14776f3627f4c161dcea607ffd76 Mon Sep 17 00:00:00 2001 From: qjb Date: Wed, 19 Mar 2014 16:52:59 +0800 Subject: [PATCH] i2s dts update --- arch/arm/boot/dts/rk3288.dtsi | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 08874d7d6067..6bcee0c91dcb 100755 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -629,30 +629,31 @@ compatible = "rockchip-i2s"; reg = <0xff890000 0x10000>; i2s-id = <0>; - // clocks = <&clk_i2s>; - // clock-names = "i2s_clk","i2s_mclk"; + clocks = <&clk_i2s>, <&clk_i2s_out>; + clock-names = "i2s_clk","i2s_mclk"; interrupts = ; - // dmas = <&pdma0 0>, - // <&pdma0 1>; + dmas = <&pdma0 0>, + <&pdma0 1>; //#dma-cells = <2>; - // dma-names = "tx", "rx"; - // pinctrl-names = "default", "sleep"; - // pinctrl-0 = <&i2s0_mclk &i2s0_sclk &i2s0_lrckrx &i2s0_lrcktx &i2s0_sdi &i2s0_sdo0 &i2s0_sdo1 &i2s0_sdo2 &i2s0_sdo3>; - // pinctrl-1 = <&i2s0_gpio>; + dma-names = "tx", "rx"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2s_mclk &i2s_sclk &i2s_lrckrx &i2s_lrcktx &i2s_sdi &i2s_sdo0 &i2s_sdo1 &i2s_sdo2 &i2s_sdo3>; + pinctrl-1 = <&i2s_gpio>; }; spdif: rockchip-spdif@0xff8b0000 { compatible = "rockchip-spdif"; reg = <0xff8b0000 0x10000>; //8channel - //reg = ;//2channel - // clocks = <&clk_spdif>; - // clock-names = "spdif_mclk"; + //reg = ;//2channel + clocks = <&clk_spdif>; + clock-names = "spdif_mclk"; interrupts = ; - // dmas = <&pdma0 8>; + dmas = <&pdma0 3>; + //dmas = <&pdma0 2>; //2channel //#dma-cells = <1>; - // dma-names = "tx"; - // pinctrl-names = "default"; - // pinctrl-0 = <&spdif_tx>; + dma-names = "tx"; + pinctrl-names = "default"; + pinctrl-0 = <&spdif_tx>; }; pwm0: pwm@ff680000 { -- 2.34.1