Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ae3aba2 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v4.1-rc1' of... 

Merge tag 'asoc-v4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v4.1

A few fixes for v4.1, none earth shattering and mostly driver related
except for one change to fix !PM builds for Intel platforms which is
done by adding stubs in the core so other platforms don't run into the
same issue.
parents 7241ea55 d839c98f

include/sound/designware_i2s.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)

 * Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

include/sound/soc-dapm.h

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ struct device; 
	.access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\

	.tlv.p = (tlv_array), \

	.get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) }

	.private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) }

#define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \

	SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array)

#define SOC_DAPM_ENUM(xname, xenum) \

include/sound/soc.h

+12 −0
Original line number Diff line number Diff line
@@ -387,8 +387,20 @@ int snd_soc_codec_set_pll(struct snd_soc_codec *codec, int pll_id, int source, 
int snd_soc_register_card(struct snd_soc_card *card);

int snd_soc_unregister_card(struct snd_soc_card *card);

int devm_snd_soc_register_card(struct device *dev, struct snd_soc_card *card);

#ifdef CONFIG_PM_SLEEP

int snd_soc_suspend(struct device *dev);

int snd_soc_resume(struct device *dev);

#else

static inline int snd_soc_suspend(struct device *dev)

{

	return 0;

}



static inline int snd_soc_resume(struct device *dev)

{

	return 0;

}

#endif

int snd_soc_poweroff(struct device *dev);

int snd_soc_register_platform(struct device *dev,

		const struct snd_soc_platform_driver *platform_drv);

include/sound/spear_dma.h

+1 −1
Original line number Diff line number Diff line 
/*

* linux/spear_dma.h

*

* Copyright (ST) 2012 Rajeev Kumar (rajeev-dlh.kumar@st.com)

* Copyright (ST) 2012 Rajeev Kumar (rajeevkumar.linux@gmail.com)

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

sound/soc/codecs/rt5645.c

+12 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/platform_device.h>

#include <linux/spi/spi.h>

#include <linux/gpio.h>

#include <linux/acpi.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/pcm_params.h>
@@ -2656,6 +2657,15 @@ static const struct i2c_device_id rt5645_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, rt5645_i2c_id);



#ifdef CONFIG_ACPI

static struct acpi_device_id rt5645_acpi_match[] = {

	{ "10EC5645", 0 },

	{ "10EC5650", 0 },

	{},

};

MODULE_DEVICE_TABLE(acpi, rt5645_acpi_match);

#endif



static int rt5645_i2c_probe(struct i2c_client *i2c,

		    const struct i2c_device_id *id)

{
@@ -2770,7 +2780,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 


		case RT5645_DMIC_DATA_GPIO12:

			regmap_update_bits(rt5645->regmap, RT5645_DMIC_CTRL1,

				RT5645_DMIC_1_DP_MASK, RT5645_DMIC_2_DP_GPIO12);

				RT5645_DMIC_2_DP_MASK, RT5645_DMIC_2_DP_GPIO12);

			regmap_update_bits(rt5645->regmap, RT5645_GPIO_CTRL1,

				RT5645_GP12_PIN_MASK,

				RT5645_GP12_PIN_DMIC2_SDA);
@@ -2872,6 +2882,7 @@ static struct i2c_driver rt5645_i2c_driver = { 
	.driver = {

		.name = "rt5645",

		.owner = THIS_MODULE,

		.acpi_match_table = ACPI_PTR(rt5645_acpi_match),

	},

	.probe = rt5645_i2c_probe,

	.remove   = rt5645_i2c_remove,