dts: starfive: Add ac108 dts config

    Add ac108 dts

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

diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
index 1a3f954..5686bcc 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dts
@@ -7,11 +7,6 @@
 /dts-v1/;
 #include "jh7110-visionfive-v2.dtsi"
 
-#ifdef AC108_ENABLED
-#define WM8960_AC108_COMMON 1
-#include "codecs/sf_ac108.dtsi"
-#endif
-
 / {
        model = "StarFive VisionFive V2";
        compatible = "starfive,visionfive-v2", "starfive,jh7110";

diff --git a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
index 1361960..22c2973 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtsi
@@ -10,11 +10,18 @@
 #include "jh7110.dtsi"
 #include "codecs/sf_pwmdac.dtsi"
 #undef WM8960_ENABLED
+#undef AC108_ENABLED
 
 #ifdef WM8960_ENABLED
+#define WM8960_AC108_COMMON 1
 #include "codecs/sf_wm8960.dtsi"
 #endif
 
+#ifdef AC108_ENABLED
+#define WM8960_AC108_COMMON 1
+#include "codecs/sf_ac108.dtsi"
+#endif
+
 / {
        model = "StarFive VisionFive V2";
        compatible = "starfive,visionfive-v2", "starfive,jh7110";
@@ -319,7 +326,7 @@
                };
        };
 
-#ifdef WM8960_ENABLED
+#ifdef WM8960_AC108_COMMON
        i2srx_pins: i2srx-pins {
                i2srx-pins0 {
                        sf,pins = <PAD_GPIO61>;
@@ -347,7 +354,8 @@
                        sf,pin-gpio-doen = <OEN_HIGH>;
                };
        };
-
+#endif
+#ifdef WM8960_ENABLED
        i2stx_pins: i2stx-pins {
                i2stx-pins0 {
                        sf,pins = <PAD_GPIO44>;
@@ -389,13 +397,14 @@
        pinctrl-names = "default";
        pinctrl-0 = <&i2c0_pins>;
        status = "okay";
-
+#ifdef AC108_ENABLED
        ac108_a: ac108@3b {
                compatible = "x-power,ac108_0";
                reg = <0x3b>;
                #sound-dai-cells = <0>;
                data-protocol = <0>;
        };
+#endif
 #ifdef WM8960_ENABLED
        wm8960: codec@1a {
                compatible = "wlf,wm8960";
@@ -626,16 +635,17 @@
        status = "okay";
 };
 
-#ifdef WM8960_ENABLED
+#ifdef WM8960_AC108_COMMON
 &i2srx_3ch {
        pinctrl-names = "default";
-       pinctrl-0 = <&i2srx_pins>;
+       pinctrl-0 = <&i2s_clk_pins &i2srx_pins>;
        status = "okay";
 };
-
+#endif
+#ifdef WM8960_ENABLED
 &i2stx_4ch1 {
        pinctrl-names = "default";
-       pinctrl-0 = <&i2s_clk_pins &i2stx_pins>;
+       pinctrl-0 = <&i2stx_pins>;
        status = "okay";
 };
 #endif