|
@@ -85,17 +85,13 @@ static int poodle_startup(struct snd_pcm_substream *substream)
|
|
}
|
|
}
|
|
|
|
|
|
/* we need to unmute the HP at shutdown as the mute burns power on poodle */
|
|
/* we need to unmute the HP at shutdown as the mute burns power on poodle */
|
|
-static int poodle_shutdown(struct snd_pcm_substream *substream)
|
|
|
|
|
|
+static void poodle_shutdown(struct snd_pcm_substream *substream)
|
|
{
|
|
{
|
|
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
|
|
|
|
- struct snd_soc_codec *codec = rtd->socdev->codec;
|
|
|
|
-
|
|
|
|
/* set = unmute headphone */
|
|
/* set = unmute headphone */
|
|
locomo_gpio_write(&poodle_locomo_device.dev,
|
|
locomo_gpio_write(&poodle_locomo_device.dev,
|
|
POODLE_LOCOMO_GPIO_MUTE_L, 1);
|
|
POODLE_LOCOMO_GPIO_MUTE_L, 1);
|
|
locomo_gpio_write(&poodle_locomo_device.dev,
|
|
locomo_gpio_write(&poodle_locomo_device.dev,
|
|
POODLE_LOCOMO_GPIO_MUTE_R, 1);
|
|
POODLE_LOCOMO_GPIO_MUTE_R, 1);
|
|
- return 0;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
static int poodle_hw_params(struct snd_pcm_substream *substream,
|
|
static int poodle_hw_params(struct snd_pcm_substream *substream,
|
|
@@ -232,7 +228,7 @@ static const struct soc_enum poodle_enum[] = {
|
|
SOC_ENUM_SINGLE_EXT(2, spk_function),
|
|
SOC_ENUM_SINGLE_EXT(2, spk_function),
|
|
};
|
|
};
|
|
|
|
|
|
-static const snd_kcontrol_new_t wm8731_poodle_controls[] = {
|
|
|
|
|
|
+static const struct snd_kcontrol_new wm8731_poodle_controls[] = {
|
|
SOC_ENUM_EXT("Jack Function", poodle_enum[0], poodle_get_jack,
|
|
SOC_ENUM_EXT("Jack Function", poodle_enum[0], poodle_get_jack,
|
|
poodle_set_jack),
|
|
poodle_set_jack),
|
|
SOC_ENUM_EXT("Speaker Function", poodle_enum[1], poodle_get_spk,
|
|
SOC_ENUM_EXT("Speaker Function", poodle_enum[1], poodle_get_spk,
|