From b2204794ef56bb21eaf687f8484174ff918bf514 Mon Sep 17 00:00:00 2001 From: Sun Mingjun Date: Tue, 12 Aug 2014 15:28:22 +0800 Subject: [PATCH] codec : Remove codec dts From rk312x.dtsi To rk3128-box.dtsi --- arch/arm/boot/dts/rk3128-box.dts | 13 +++++++++++++ arch/arm/boot/dts/rk312x.dtsi | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts index b5b9f5db03c1..ed241b9fdbf1 100755 --- a/arch/arm/boot/dts/rk3128-box.dts +++ b/arch/arm/boot/dts/rk3128-box.dts @@ -50,6 +50,19 @@ rockchip,remote_wakeup; rockchip,usb_irq_wakeup; }; + + codec: codec@20030000 { + compatible = "rk312x-codec"; + reg = <0x20030000 0x1000>; + spk_ctl_io = <&gpio1 GPIO_A3 0>; + //pinctrl-names = "default"; + //pinctrl-0 = <&i2s_gpio>; + + boot_depop = <1>; + pa_enable_time = <1000>; + clocks = <&clk_gates5 14>; + clock-names = "g_pclk_acodec"; + }; }; diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index 23c340418a92..6561e9314dea 100755 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -438,19 +438,6 @@ dma-names = "tx", "rx"; }; - codec: codec@20030000 { - compatible = "rk312x-codec"; - reg = <0x20030000 0x1000>; - spk_ctl_io = <&gpio1 GPIO_A3 0>; - //pinctrl-names = "default"; - //pinctrl-0 = <&i2s_gpio>; - - boot_depop = <1>; - pa_enable_time = <1000>; - clocks = <&clk_gates5 14>; - clock-names = "g_pclk_acodec"; - }; - spdif: spdif@10204000 { compatible = "rk312x-spdif"; reg = <0x10204000 0x1000>; -- 2.34.1