codec : Remove codec dts From rk312x.dtsi To rk3128-box.dtsi

diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index b5b9f5db03c1c5e7a320486a61608b6cb01f2266..ed241b9fdbf1c95b4afbf8cb749e62a2d2d3e1f3 100755 (executable)
--- 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 23c340418a92be9403f1e3c61401d6655b91f9e5..6561e9314dea9950d61e513ceac278eee1cae8d7 100755 (executable)
--- 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>;