Skip to content

Commit fd30dcc

Browse files
author
André Apitzsch
committed
WIP: bq-piccolo: Add sound support
Signed-off-by: André Apitzsch <[email protected]>
1 parent 9b2b962 commit fd30dcc

File tree

3 files changed

+219
-7
lines changed

3 files changed

+219
-7
lines changed

‎arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts

+212
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <dt-bindings/input/input.h>
1010
#include <dt-bindings/interrupt-controller/irq.h>
1111
#include <dt-bindings/leds/common.h>
12+
#include <dt-bindings/mfd/arizona.h>
1213
#include <dt-bindings/pinctrl/qcom,pmic-mpp.h>
1314

1415
/ {
@@ -77,6 +78,26 @@
7778
};
7879
};
7980

81+
/* regulator-spk {
82+
compatible = "regulator-fixed";
83+
regulator-name = "spk_vreg";
84+
startup-delay-us = <0>;
85+
enable-active-high;
86+
regulator-boot-on;
87+
regulator-always-on;
88+
gpio = <&msmgpio 101 GPIO_ACTIVE_HIGH>;
89+
};*/
90+
91+
regulator-wm8998-ldo {
92+
compatible = "regulator-fixed";
93+
regulator-name = "wm8998_ldo";
94+
95+
enable-active-high;
96+
regulator-boot-on;
97+
regulator-always-on;
98+
gpio = <&msmgpio 114 GPIO_ACTIVE_HIGH>;
99+
};
100+
80101
reg_ts_vdd: regulator-vdd-ts {
81102
compatible = "regulator-fixed";
82103
regulator-name = "regulator-vdd-ts";
@@ -126,6 +147,77 @@
126147

127148
};
128149

150+
&blsp_i2c1 {
151+
status = "okay";
152+
153+
speaker_codec: audio-codec@1a {
154+
compatible = "wlf,wm8998";
155+
reg = <0x1a>;
156+
157+
reset-gpios = <&msmgpio 120 GPIO_ACTIVE_HIGH>;
158+
wlf,ldoena-gpios = <&msmgpio 28 GPIO_ACTIVE_HIGH>;
159+
160+
pinctrl-names = "default", "sleep";
161+
pinctrl-0 = <&wlf_int_active &speaker_codec_default &speaker_codec_reset_default>;
162+
pinctrl-1 = <&wlf_int_suspend &speaker_codec_sleep &speaker_codec_reset_sleep>;
163+
164+
// TODO add pinctl for 114?
165+
// TODO add pinctl for 101?
166+
167+
gpio-controller;
168+
#gpio-cells = <2>;
169+
170+
sound-name-prefix = "Speaker";
171+
#sound-dai-cells = <1>;
172+
173+
AVDD-supply = <&pm8916_l6>;
174+
DBVDD1-supply = <&pm8916_l6>;
175+
DBVDD2-supply = <&pm8916_l6>;
176+
DBVDD3-supply = <&pm8916_l6>;
177+
CPVDD-supply = <&pm8916_l6>;
178+
SPKVDDL-supply = <&pm8916_l6>;
179+
SPKVDDR-supply = <&pm8916_l6>;
180+
181+
interrupt-controller;
182+
#interrupt-cells = <2>;
183+
interrupt-parent = <&msmgpio>;
184+
interrupts = <69 IRQ_TYPE_LEVEL_LOW>;
185+
186+
clocks = <&rpmcc RPM_SMD_BB_CLK2>;
187+
clock-names = "mclk2";
188+
189+
wlf,gpio-defaults = <
190+
ARIZONA_GP_DEFAULT
191+
ARIZONA_GP_DEFAULT
192+
ARIZONA_GP_DEFAULT
193+
ARIZONA_GP_DEFAULT
194+
ARIZONA_GP_DEFAULT
195+
>;
196+
197+
wlf,inmode = <0 0 0>;
198+
wlf,micd-detect-debounce = <500>;
199+
wlf,micd-rate = <ARIZONA_MICD_TIME_8MS>;
200+
wlf,micd-configs = <0 ARIZONA_DMIC_MICBIAS2 1>;
201+
wlf,micd-bias-start-time = <ARIZONA_MICD_TIME_16MS>;
202+
203+
// TODO:
204+
// wlf,infinite_micd = <0x01>;
205+
// wlf,micbias1 = <0xaf0 0x01 0x00 0x01 0x00>;
206+
// wlf,micbias2 = <0xaf0 0x01 0x00 0x01 0x00>;
207+
// wlf,micbias3 = <0xaf0 0x01 0x00 0x01 0x00>;
208+
// wlf,ldo-enable = <0x77 28 0x00>;
209+
// wlf,ena-ldo = <0x77 114 0x00>;
210+
// wlf,clk-gpio = <0x77 116 0x00>;
211+
// wlf,ldospk = <0x77 0x00 0x00>; // gpio101? downstream spk_vreg
212+
// wlf,init-mic-delay = <0x1f4>;
213+
214+
micvdd {
215+
regulator-min-microvolt = <3000000>;
216+
regulator-max-microvolt = <3000000>;
217+
};
218+
};
219+
};
220+
129221
&blsp_i2c3 {
130222
status = "okay";
131223

@@ -313,6 +405,40 @@
313405
status = "okay";
314406
};
315407

408+
&sound {
409+
pinctrl-names = "default", "sleep";
410+
pinctrl-0 = <&ext_mclk_tlmm_lines_act &ext_sec_tlmm_lines_act>;
411+
pinctrl-1 = <&ext_mclk_tlmm_lines_sus &ext_sec_tlmm_lines_sus>;
412+
413+
model = "bq-piccolo";
414+
widgets =
415+
"Speaker", "Speaker",
416+
"Headphone", "Headphones";
417+
pin-switches = "Speaker";
418+
/*audio-routing =
419+
"IN1AL", "MICBIAS1",
420+
"IN1AR", "MICBIAS1",
421+
"IN2A", "MICBIAS2";*/
422+
423+
status = "okay";
424+
};
425+
426+
&sound_dai_primary {
427+
status = "disabled";
428+
};
429+
430+
&sound_dai_tertiary {
431+
status = "disabled";
432+
};
433+
434+
&sound_dai_quaternary {
435+
status = "okay";
436+
437+
codec {
438+
sound-dai = <&speaker_codec 0>;
439+
};
440+
};
441+
316442
&usb {
317443
extcon = <&charger>, <&usb_id>;
318444
vbus-supply = <&usb_otg_vbus>;
@@ -331,6 +457,19 @@
331457
compatible = "qcom,wcn3620";
332458
};
333459

460+
&lpass_codec {
461+
status = "disabled";
462+
};
463+
464+
&wcd_codec {
465+
status = "disabled";
466+
/* qcom,micbias-lvl = <2800>;
467+
qcom,mbhc-vthreshold-low = <25 50 75 112 137>;
468+
qcom,mbhc-vthreshold-high = <25 50 75 112 137>;
469+
//qcom,hphl-jack-type-normally-open;
470+
*/
471+
};
472+
334473
&smd_rpm_regulators {
335474
vdd_l1_l2_l3-supply = <&pm8916_s3>;
336475
vdd_l4_l5_l6-supply = <&pm8916_s4>;
@@ -530,6 +669,79 @@
530669
drive-strength = <2>;
531670
output-high;
532671
};
672+
673+
speaker_codec_reset_default: speaker-codec-reset-default-state {
674+
pins = "gpio120";
675+
function = "ldo_update";
676+
677+
drive-strength = <6>;
678+
bias-pull-up;
679+
};
680+
681+
speaker_codec_reset_sleep: speaker-codec-reset-sleep-state {
682+
pins = "gpio120";
683+
function = "ldo_update";
684+
685+
drive-strength = <2>;
686+
bias-pull-down;
687+
};
688+
689+
speaker_codec_default: speaker-codec-default-state { // ldo_enable
690+
pins = "gpio28";
691+
function = "gpio";
692+
drive-strength = <6>;
693+
bias-pull-up;
694+
};
695+
696+
speaker_codec_sleep: speaker-codec-sleep-state { // ldo_enable
697+
pins = "gpio28";
698+
function = "gpio";
699+
drive-strength = <2>;
700+
bias-pull-down;
701+
};
702+
/*
703+
speaker_enaldo_default: speaker-ena-ldo-default-state { // ena_ldo
704+
pins = "gpio114";
705+
function = "gpio";
706+
drive-strength = <6>;
707+
bias-pull-up;
708+
};
709+
710+
speaker_enaldo_sleep: speaker-ena-ldo-sleep-state { // ena_ldo
711+
pins = "gpio114";
712+
function = "gpio";
713+
drive-strength = <2>;
714+
bias-pull-down;
715+
};*/
716+
717+
/* wlf_ldospk_pin {
718+
pins = "gpio101";
719+
label = "wlf_speaker_ldo";
720+
721+
wlf_ldospk_active {
722+
drive-strength = <6>;
723+
bias-pull-up;
724+
};
725+
726+
wlf_ldospk_suspend {
727+
drive-strength = <2>;
728+
bias-pull-down;
729+
};
730+
};*/
731+
732+
wlf_int_pin {
733+
/* wolfson codec */
734+
wlf_int_active: wlf-int-active {
735+
pins = "gpio69";
736+
drive-strength = <6>;
737+
bias-pull-up;
738+
};
739+
wlf_int_suspend: wlf-int-suspend {
740+
pins = "gpio69";
741+
drive-strength = <2>;
742+
bias-pull-down;
743+
};
744+
};
533745
};
534746

535747
&pm8916_mpps {

‎sound/soc/codecs/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -2053,7 +2053,7 @@ config SND_SOC_WM8997
20532053
depends on MFD_WM8997 && MFD_ARIZONA
20542054

20552055
config SND_SOC_WM8998
2056-
tristate
2056+
tristate "Wolfson Microelectronics WM8998 codec driver"
20572057
depends on MFD_WM8998 && MFD_ARIZONA
20582058

20592059
config SND_SOC_WM9081

‎sound/soc/qcom/apq8016_sbc.c

+6-6
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,12 @@ static int apq8016_dai_init(struct snd_soc_pcm_runtime *rtd, int mi2s)
119119

120120
component = codec_dai->component;
121121
/* Set default mclk for internal codec */
122-
rval = snd_soc_component_set_sysclk(component, 0, 0, DEFAULT_MCLK_RATE,
123-
SND_SOC_CLOCK_IN);
124-
if (rval != 0 && rval != -ENOTSUPP) {
125-
dev_warn(card->dev, "Failed to set mclk: %d\n", rval);
126-
return rval;
127-
}
122+
/* rval = snd_soc_component_set_sysclk(component, 0, 0, DEFAULT_MCLK_RATE,*/
123+
/* SND_SOC_CLOCK_IN);*/
124+
/* if (rval != 0 && rval != -ENOTSUPP) {*/
125+
/* dev_warn(card->dev, "Failed to set mclk: %d\n", rval);*/
126+
/* return rval;*/
127+
/* }*/
128128
rval = snd_soc_component_set_jack(component, &pdata->jack, NULL);
129129
if (rval != 0 && rval != -ENOTSUPP) {
130130
dev_warn(card->dev, "Failed to set jack: %d\n", rval);

0 commit comments

Comments
 (0)