samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

asoc: msmnile: add usbc analog handle parsing

Browse Source 
Add change to parse fsa handle in machine driver
to use it to call gnd/mic swap api of fsa driver.

Change-Id: Ie9c2aede45138b0d4e3bf94f11feccab47874223
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
This commit is contained in:
Karthikeyan Mani
2018-02-22 01:36:23 -08:00
parent 8fe02478b7
commit a29178a08e
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
asoc/sdm855.c
View File

@@ -21,6 +21,7 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/pm_qos.h> #include <linux/pm_qos.h>
#include <linux/soc/qcom/fsa4480-i2c.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/soc-dapm.h> #include <sound/soc-dapm.h>
@@ -165,6 +166,7 @@ struct msm_asoc_mach_data {
struct device_node *us_euro_gpio_p; /* used by pinctrl API */ struct device_node *us_euro_gpio_p; /* used by pinctrl API */
struct device_node *hph_en1_gpio_p; /* used by pinctrl API */ struct device_node *hph_en1_gpio_p; /* used by pinctrl API */
struct device_node *hph_en0_gpio_p; /* used by pinctrl API */ struct device_node *hph_en0_gpio_p; /* used by pinctrl API */
struct device_node *fsa_handle;
}; };
struct msm_asoc_wcd93xx_codec { struct msm_asoc_wcd93xx_codec {
@@ -3581,7 +3583,14 @@ done:
static bool msm_usbc_swap_gnd_mic(struct snd_soc_codec *codec, bool active) static bool msm_usbc_swap_gnd_mic(struct snd_soc_codec *codec, bool active)
{ {
struct snd_soc_card *card = codec->component.card;
struct msm_asoc_mach_data *pdata =
snd_soc_card_get_drvdata(card);
if (!pdata->fsa_handle)
return false; return false;
return fsa4480_switch_event(pdata->fsa_handle, FSA_MIC_GND_SWAP);
} }
static bool msm_swap_gnd_mic(struct snd_soc_codec *codec, bool active) static bool msm_swap_gnd_mic(struct snd_soc_codec *codec, bool active)
@@ -7293,6 +7302,12 @@ static int msm_asoc_machine_probe(struct platform_device *pdev)
"qcom,us-euro-gpios"); "qcom,us-euro-gpios");
wcd_mbhc_cfg.swap_gnd_mic = msm_swap_gnd_mic; wcd_mbhc_cfg.swap_gnd_mic = msm_swap_gnd_mic;
} }
pdata->fsa_handle = of_parse_phandle(pdev->dev.of_node,
"fsa4480-i2c-handle", 0);
if (!pdata->fsa_handle)
dev_dbg(&pdev->dev, "property %s not detected in node %s\n",
"fsa4480-i2c-handle", pdev->dev.of_node->full_name);
/* Parse pinctrl info from devicetree */ /* Parse pinctrl info from devicetree */
ret = msm_get_pinctrl(pdev); ret = msm_get_pinctrl(pdev);
if (!ret) { if (!ret) {