On Tue, 03 Mar 2015, Charles Keepax wrote:
> From: Richard Fitzgerald <r...@opensource.wolfsonmicro.com>
>
> Signed-off-by: Richard Fitzgerald <r...@opensource.wolfsonmicro.com>
> Acked-by: Mark Brown <broo...@kernel.org>
> Signed-off-by: Charles Keepax <ckee...@opensource.wolfsonmicro.com>
> ---
> sound/soc/codecs/arizona.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
Applied, thanks.
Will send out pull-request once this has had time to soak in -next.
> diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
> index 4c90602..95d31d6 100644
> --- a/sound/soc/codecs/arizona.c
> +++ b/sound/soc/codecs/arizona.c
> @@ -280,6 +280,7 @@ int arizona_init_gpio(struct snd_soc_codec *codec)
>
> switch (arizona->type) {
> case WM5110:
> + case WM8280:
> snd_soc_dapm_disable_pin(&codec->dapm, "DRC2 Signal Activity");
> break;
> default:
> @@ -1728,6 +1729,7 @@ static int arizona_calc_fratio(struct arizona_fll *fll,
>
> switch (fll->arizona->type) {
> case WM5110:
> + case WM8280:
> if (fll->arizona->rev < 3 || sync)
> return init_ratio;
> break;
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
