VisionFive2 Linux kernel

author: WalkerChenL <walker.chen@starfivetech.com> 2022-01-18 10:32:19 +0800 committer: Fu Wei <wefu@redhat.com> 2022-01-26 20:34:30 +0800 commit: f81db4e18342f7eb0d9c8612ca6e44dcdca20a2d parent: ab522d44e7f705a1a8c548a6de4f28e34d04e2e6

Commit Summary:

Support AC108 daughter board for 3 dev-boards

Diffstat:

3 files changed, 7 insertions, 1 deletion

diff --git a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts
index d895eea45f1d..59d0dc441f4e 100644
--- a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts
+++ b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts
@@ -24,3 +24,7 @@
 #ifdef WM8960_ENABLED
 #include "codecs/sf_wm8960.dtsi"
 #endif
+
+#ifdef AC108_ENABLED
+#include "codecs/sf_ac108.dtsi"
+#endif
diff --git a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
index 44420da7c031..42fbab813a93 100644
--- a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi
@@ -11,7 +11,7 @@
 #include <dt-bindings/pinctrl/pinctrl-starfive.h>
 
 #undef WM8960_ENABLED
-#define AC108_ENABLED
+#undef AC108_ENABLED
 
 / {
 	aliases {
diff --git a/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts b/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts
index c760c6f3742b..600e7f357ec3 100644
--- a/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts
+++ b/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts
@@ -34,3 +34,7 @@
 #ifdef WM8960_ENABLED
 #include "codecs/sf_wm8960.dtsi"
 #endif
+
+#ifdef AC108_ENABLED
+#include "codecs/sf_ac108.dtsi"
+#endif