From: Jonathan Albrieux <jonathan.albri...@gmail.com>

Enable sound and modem for the Longcheer L8910 (BQ Aquaris X5).
The setup is similar to most MSM8916 devices, i.e.:

 - QDSP6 audio
 - Earpiece/headphones/microphones via digital/analog codec in
   MSM8916/PM8916
 - Audio jack detection via analog codec in PM8916
 - WWAN Internet via BAM-DMUX

except:

 - Awinic AW8738 connected to HPH_R (headphones) output of the analog
   codec. Note that unlike for wingtech-wt88047 there is no analog
   switch that would allow disabling output via the headphone jack
   when the speaker is enabled.

Signed-off-by: Jonathan Albrieux <jonathan.albri...@gmail.com>
Co-developed-by: Stephan Gerhold <step...@gerhold.net>
Signed-off-by: Stephan Gerhold <step...@gerhold.net>
---
 .../boot/dts/qcom/msm8916-longcheer-l8910.dts      | 54 ++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts 
b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 41cadb906b98..c0dc9a3bbac4 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -3,6 +3,8 @@
 /dts-v1/;
 
 #include "msm8916-pm8916.dtsi"
+#include "msm8916-modem-qdsp6.dtsi"
+
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/leds/common.h>
@@ -22,6 +24,16 @@ chosen {
                stdout-path = "serial0";
        };
 
+       speaker_amp: audio-amplifier {
+               compatible = "awinic,aw8738";
+               mode-gpios = <&tlmm 114 GPIO_ACTIVE_HIGH>;
+               awinic,mode = <5>;
+               sound-name-prefix = "Speaker Amp";
+
+               pinctrl-0 = <&spk_ext_pa_default>;
+               pinctrl-names = "default";
+       };
+
        flash-led-controller {
                compatible = "ocs,ocp8110";
                enable-gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
@@ -107,6 +119,17 @@ &blsp_uart2 {
        status = "okay";
 };
 
+&mpss_mem {
+       reg = <0x0 0x86800000 0x0 0x5000000>;
+};
+
+&pm8916_codec {
+       qcom,micbias-lvl = <2800>;
+       qcom,mbhc-vthreshold-low = <75 100 120 180 500>;
+       qcom,mbhc-vthreshold-high = <75 100 120 180 500>;
+       qcom,hphl-jack-type-normally-open;
+};
+
 &pm8916_resin {
        status = "okay";
        linux,code = <KEY_VOLUMEDOWN>;
@@ -137,6 +160,30 @@ &sdhc_2 {
        cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
 };
 
+&sound {
+       status = "okay";
+
+       /*
+        * Provide widgets/pin-switches to allow enabling speaker separately.
+        * The hardware does not provide a way to disable the output via the
+        * headphone jack when the speaker is enabled.
+        */
+       model = "bq-paella";
+       widgets =
+               "Speaker", "Speaker",
+               "Headphone", "Headphones";
+       pin-switches = "Speaker";
+       audio-routing =
+               "Speaker", "Speaker Amp OUT",
+               "Speaker Amp IN", "HPH_R",
+               "Headphones", "HPH_L",
+               "Headphones", "HPH_R",
+               "AMIC1", "MIC BIAS External1",
+               "AMIC2", "MIC BIAS Internal2",
+               "AMIC3", "MIC BIAS External1";
+       aux-devs = <&speaker_amp>;
+};
+
 &usb {
        status = "okay";
        extcon = <&usb_id>, <&usb_id>;
@@ -205,6 +252,13 @@ sdc2_cd_default: sdc2-cd-default-state {
                bias-disable;
        };
 
+       spk_ext_pa_default: spk-ext-pa-default-state {
+               pins = "gpio114";
+               function = "gpio";
+               drive-strength = <2>;
+               bias-disable;
+       };
+
        usb_id_default: usb-id-default-state {
                pins = "gpio110";
                function = "gpio";

-- 
2.42.0

Reply via email to