dts: starfive: Move wm8960 and ac108 node under i2c form dtsi file to wm8960/ac108...

The default dts do not contain wm8960/ac108, move to the other file.
The booting of default dts do not have wrong log about wm8960/ac108

Signed-off-by: Jianlong Huang <jianlong.huang@starfivetech.com>

diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-ac108.dts b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-ac108.dts
index be979a9f9f8acebbf5d0882daaf99e804795a283..0dbcf21f0cdd84e665c7d6519a6eaf05fc0285cf 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-ac108.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-ac108.dts
@@ -8,6 +8,15 @@
 #include "jh7110-visionfive-v2.dts"
 #include "codecs/sf_ac108.dtsi"
 
+&i2c0 {
+       ac108_a: ac108@3b {
+               compatible = "x-power,ac108_0";
+               reg = <0x3b>;
+               #sound-dai-cells = <0>;
+               data-protocol = <0>;
+       };
+};
+
 &i2srx_3ch {
        status = "okay";
 };

diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-wm8960.dts b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-wm8960.dts
index 480bd0d2cc94d74d36b67b0a23ffb5c3a1cdb984..7403e13413b0c2943a86005644789feab058c092 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-wm8960.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2-wm8960.dts
@@ -8,6 +8,16 @@
 #include "jh7110-visionfive-v2.dts"
 #include "codecs/sf_wm8960.dtsi"
 
+&i2c0 {
+       wm8960: codec@1a {
+               compatible = "wlf,wm8960";
+               reg = <0x1a>;
+               #sound-dai-cells = <0>;
+
+               wlf,shared-lrclk;
+       };
+};
+
 &i2srx_3ch {
        status = "okay";
 };

diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
index a2d21bcf6f66789115eb9034841ff2af8154bc30..4b5818dec0aeba2e30d4ca1736c7e232595e5503 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
@@ -382,21 +382,6 @@
        pinctrl-names = "default";
        pinctrl-0 = <&i2c0_pins>;
        status = "okay";
-
-       ac108_a: ac108@3b {
-               compatible = "x-power,ac108_0";
-               reg = <0x3b>;
-               #sound-dai-cells = <0>;
-               data-protocol = <0>;
-       };
-
-       wm8960: codec@1a {
-               compatible = "wlf,wm8960";
-               reg = <0x1a>;
-               #sound-dai-cells = <0>;
-
-               wlf,shared-lrclk;
-       };
 };
 
 &i2c2 {