|
@@ -274,9 +274,10 @@ static void arizona_extcon_pulse_micbias(struct arizona_extcon_info *info)
|
|
struct arizona *arizona = info->arizona;
|
|
struct arizona *arizona = info->arizona;
|
|
const char *widget = arizona_extcon_get_micbias(info);
|
|
const char *widget = arizona_extcon_get_micbias(info);
|
|
struct snd_soc_dapm_context *dapm = arizona->dapm;
|
|
struct snd_soc_dapm_context *dapm = arizona->dapm;
|
|
|
|
+ struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
- ret = snd_soc_dapm_force_enable_pin(dapm, widget);
|
|
|
|
|
|
+ ret = snd_soc_component_force_enable_pin(component, widget);
|
|
if (ret != 0)
|
|
if (ret != 0)
|
|
dev_warn(arizona->dev, "Failed to enable %s: %d\n",
|
|
dev_warn(arizona->dev, "Failed to enable %s: %d\n",
|
|
widget, ret);
|
|
widget, ret);
|
|
@@ -284,7 +285,7 @@ static void arizona_extcon_pulse_micbias(struct arizona_extcon_info *info)
|
|
snd_soc_dapm_sync(dapm);
|
|
snd_soc_dapm_sync(dapm);
|
|
|
|
|
|
if (!arizona->pdata.micd_force_micbias) {
|
|
if (!arizona->pdata.micd_force_micbias) {
|
|
- ret = snd_soc_dapm_disable_pin(arizona->dapm, widget);
|
|
|
|
|
|
+ ret = snd_soc_component_disable_pin(component, widget);
|
|
if (ret != 0)
|
|
if (ret != 0)
|
|
dev_warn(arizona->dev, "Failed to disable %s: %d\n",
|
|
dev_warn(arizona->dev, "Failed to disable %s: %d\n",
|
|
widget, ret);
|
|
widget, ret);
|
|
@@ -349,6 +350,7 @@ static void arizona_stop_mic(struct arizona_extcon_info *info)
|
|
struct arizona *arizona = info->arizona;
|
|
struct arizona *arizona = info->arizona;
|
|
const char *widget = arizona_extcon_get_micbias(info);
|
|
const char *widget = arizona_extcon_get_micbias(info);
|
|
struct snd_soc_dapm_context *dapm = arizona->dapm;
|
|
struct snd_soc_dapm_context *dapm = arizona->dapm;
|
|
|
|
+ struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
|
|
bool change;
|
|
bool change;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
@@ -356,7 +358,7 @@ static void arizona_stop_mic(struct arizona_extcon_info *info)
|
|
ARIZONA_MICD_ENA, 0,
|
|
ARIZONA_MICD_ENA, 0,
|
|
&change);
|
|
&change);
|
|
|
|
|
|
- ret = snd_soc_dapm_disable_pin(dapm, widget);
|
|
|
|
|
|
+ ret = snd_soc_component_disable_pin(component, widget);
|
|
if (ret != 0)
|
|
if (ret != 0)
|
|
dev_warn(arizona->dev,
|
|
dev_warn(arizona->dev,
|
|
"Failed to disable %s: %d\n",
|
|
"Failed to disable %s: %d\n",
|