ASoC: msm8930: Enable speaker boost for MTP and FLUID
The power to speaker is supplied through speaker boost in case
of MTP and FLUID. It is required to enable the speaker boost in
order to supply power to the speaker. For CDP, the speaker boost
is not present and hence there is no need to enable it.
Fix to enable speaker boost only for MTP and FLUID.
CRs-fixed: 361358
Change-Id: Ic6588652a9cabcff188007e43d5c97cf5d1a3a78
Signed-off-by: Bhalchandra Gajare <gajare@codeaurora.org>
diff --git a/sound/soc/msm/msm8930.c b/sound/soc/msm/msm8930.c
index 3f7e399..b31ed65 100644
--- a/sound/soc/msm/msm8930.c
+++ b/sound/soc/msm/msm8930.c
@@ -38,6 +38,7 @@
#define SPK_AMP_POS 0x1
#define SPK_AMP_NEG 0x2
+#define SPKR_BOOST_GPIO 15
#define SITAR_EXT_CLK_RATE 12288000
#define SITAR_MBHC_DEF_BUTTONS 3
@@ -116,6 +117,8 @@
static void msm8960_ext_spk_power_amp_on(u32 spk)
{
+ int ret = 0;
+
if (spk & (SPK_AMP_POS | SPK_AMP_NEG)) {
if ((msm8930_ext_spk_pamp & SPK_AMP_POS) &&
(msm8930_ext_spk_pamp & SPK_AMP_NEG)) {
@@ -130,6 +133,23 @@
if ((msm8930_ext_spk_pamp & SPK_AMP_POS) &&
(msm8930_ext_spk_pamp & SPK_AMP_NEG)) {
+ if (machine_is_msm8930_mtp()
+ || machine_is_msm8930_fluid()) {
+ pr_debug("%s: Configure Speaker Boost GPIO %u",
+ __func__, SPKR_BOOST_GPIO);
+ ret = gpio_request(SPKR_BOOST_GPIO,
+ "SPKR_BOOST_EN");
+ if (ret) {
+ pr_err("%s: Failed to configure speaker boost "
+ "gpio %u\n", __func__, SPKR_BOOST_GPIO);
+ return;
+ }
+
+ pr_debug("%s: Enable Speaker boost gpio %u\n",
+ __func__, SPKR_BOOST_GPIO);
+ gpio_direction_output(SPKR_BOOST_GPIO, 1);
+ }
+
pm8xxx_spk_enable(MSM8930_SPK_ON);
pr_debug("%s: slepping 4 ms after turning on external "
" Left Speaker Ampl\n", __func__);
@@ -149,6 +169,13 @@
if (spk & (SPK_AMP_POS | SPK_AMP_NEG)) {
if (!msm8930_ext_spk_pamp)
return;
+ if (machine_is_msm8930_mtp()
+ || machine_is_msm8930_fluid()) {
+ pr_debug("%s: Free speaker boost gpio %u\n",
+ __func__, SPKR_BOOST_GPIO);
+ gpio_direction_output(SPKR_BOOST_GPIO, 0);
+ gpio_free(SPKR_BOOST_GPIO);
+ }
pm8xxx_spk_enable(MSM8930_SPK_OFF);
msm8930_ext_spk_pamp = 0;