diff options
| author | WalkerChenL <walker.chen@starfivetech.com> | 2022-01-05 10:24:01 +0300 |
|---|---|---|
| committer | WalkerChenL <walker.chen@starfivetech.com> | 2022-01-05 10:24:15 +0300 |
| commit | 627cb6255b997ef14b5661e62731b79ce47615d2 (patch) | |
| tree | 9c2a52b2854500571951717d74743e4aafb2539d | |
| parent | 1847d43b2dd85da06f1df0c34a84cbcab1bec1c5 (diff) | |
| download | linux-627cb6255b997ef14b5661e62731b79ce47615d2.tar.xz | |
Support WM8960 codec in 3 dev-boards
Signed-off-by: WalkerChenL <walker.chen@starfivetech.com>
4 files changed, 16 insertions, 2 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight-a1.dts b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight-a1.dts index c7e6b793d763..1b77d9985136 100644 --- a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight-a1.dts +++ b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight-a1.dts @@ -23,4 +23,6 @@ starfive,keep-gpiomux = <13 14 63 0 2 3 45>; }; +#ifdef WM8960_ENABLED #include "codecs/sf_wm8960.dtsi" +#endif diff --git a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts index ec42effa7a0e..d895eea45f1d 100644 --- a/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts +++ b/arch/riscv/boot/dts/starfive/jh7100-beaglev-starlight.dts @@ -18,5 +18,9 @@ &gpio { /* don't reset gpio mux for serial console on uart3 */ - starfive,keep-gpiomux = <13 14>; + starfive,keep-gpiomux = <13 14 63 0 2 3 45>; }; + +#ifdef WM8960_ENABLED +#include "codecs/sf_wm8960.dtsi" +#endif diff --git a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi index ee62e5485b3c..4428d24848a1 100644 --- a/arch/riscv/boot/dts/starfive/jh7100-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7100-common.dtsi @@ -10,6 +10,8 @@ #include <dt-bindings/leds/common.h> #include <dt-bindings/pinctrl/pinctrl-starfive.h> +#undef WM8960_ENABLED + / { aliases { mshc0 = &sdio0; @@ -495,12 +497,14 @@ pinctrl-0 = <&i2c1_pins>; status = "okay"; +#ifdef WM8960_ENABLED wm8960: codec@1a { compatible = "wlf,wm8960"; reg = <0x1a>; #sound-dai-cells = <0>; wlf,shared-lrclk; }; +#endif seeed_plane_i2c@45 { compatible = "seeed_panel"; 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 68616a1c9cf6..c760c6f3742b 100644 --- a/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts +++ b/arch/riscv/boot/dts/starfive/jh7100-starfive-visionfive-v1.dts @@ -20,7 +20,7 @@ &gpio { /* don't reset gpio mux for serial console and reset gpio */ - starfive,keep-gpiomux = <13 14 63>; + starfive,keep-gpiomux = <13 14 63 0 2 3 45>; }; &i2c0 { @@ -30,3 +30,7 @@ pagesize = <16>; }; }; + +#ifdef WM8960_ENABLED +#include "codecs/sf_wm8960.dtsi" +#endif |