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

Commit 2c9ee33d authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.32' into for-2.6.33

parents 766df6d9 539d3d8c

sound/soc/blackfin/bf5xx-i2s.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -76,12 +76,12 @@ static struct sport_param sport_params[2] = { 
 * TFS. When Port G is selected and EMAC then there is a conflict between

 * TFS. When Port G is selected and EMAC then there is a conflict between

 * the PHY interrupt line and TFS.  Current settings prevent the conflict

 * the PHY interrupt line and TFS.  Current settings prevent the conflict

 * by ignoring the TFS pin when Port G is selected. This allows both

 * by ignoring the TFS pin when Port G is selected. This allows both

 * ssm2602 using Port G and EMAC concurrently.

 * codecs and EMAC using Port G concurrently.

 */

 */

#ifdef CONFIG_BF527_SPORT0_PORTF

#ifdef CONFIG_BF527_SPORT0_PORTG

#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)

#else

#define LOCAL_SPORT0_TFS (0)

#define LOCAL_SPORT0_TFS (0)

#else

#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)

#endif

#endif





static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,

static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,

sound/soc/blackfin/bf5xx-tdm.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -70,12 +70,12 @@ static struct sport_param sport_params[2] = { 
 * TFS. When Port G is selected and EMAC then there is a conflict between

 * TFS. When Port G is selected and EMAC then there is a conflict between

 * the PHY interrupt line and TFS.  Current settings prevent the conflict

 * the PHY interrupt line and TFS.  Current settings prevent the conflict

 * by ignoring the TFS pin when Port G is selected. This allows both

 * by ignoring the TFS pin when Port G is selected. This allows both

 * ssm2602 using Port G and EMAC concurrently.

 * codecs and EMAC using Port G concurrently.

 */

 */

#ifdef CONFIG_BF527_SPORT0_PORTF

#ifdef CONFIG_BF527_SPORT0_PORTG

#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)

#else

#define LOCAL_SPORT0_TFS (0)

#define LOCAL_SPORT0_TFS (0)

#else

#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)

#endif

#endif





static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,

static u16 sport_req[][7] = { {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_RFS,

sound/soc/codecs/ad1836.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -251,8 +251,7 @@ static int __devexit ad1836_spi_remove(struct spi_device *spi) 




static struct spi_driver ad1836_spi_driver = {

static struct spi_driver ad1836_spi_driver = {

	.driver = {

	.driver = {

		.name	= "ad1836-spi",

		.name	= "ad1836",

		.bus	= &spi_bus_type,

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

	},

	},

	.probe		= ad1836_spi_probe,

	.probe		= ad1836_spi_probe,

sound/soc/codecs/ad1938.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -456,7 +456,6 @@ static int __devexit ad1938_spi_remove(struct spi_device *spi) 
static struct spi_driver ad1938_spi_driver = {

static struct spi_driver ad1938_spi_driver = {

	.driver = {

	.driver = {

		.name	= "ad1938",

		.name	= "ad1938",

		.bus	= &spi_bus_type,

		.owner	= THIS_MODULE,

		.owner	= THIS_MODULE,

	},

	},

	.probe		= ad1938_spi_probe,

	.probe		= ad1938_spi_probe,
@@ -515,6 +514,7 @@ static int ad1938_register(struct ad1938_priv *ad1938) 
	codec->num_dai = 1;

	codec->num_dai = 1;

	codec->write = ad1938_write_reg;

	codec->write = ad1938_write_reg;

	codec->read = ad1938_read_reg_cache;

	codec->read = ad1938_read_reg_cache;

	codec->set_bias_level = ad1938_set_bias_level;

	INIT_LIST_HEAD(&codec->dapm_widgets);

	INIT_LIST_HEAD(&codec->dapm_widgets);

	INIT_LIST_HEAD(&codec->dapm_paths);

	INIT_LIST_HEAD(&codec->dapm_paths);

sound/soc/codecs/wm8753.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -595,6 +595,7 @@ static const struct snd_soc_dapm_route audio_map[] = { 




	/* Mono Capture mixer-mux */

	/* Mono Capture mixer-mux */

	{"Capture Right Mixer", "Stereo", "Capture Right Mux"},

	{"Capture Right Mixer", "Stereo", "Capture Right Mux"},

	{"Capture Left Mixer", "Stereo", "Capture Left Mux"},

	{"Capture Left Mixer", "Analogue Mix Left", "Capture Left Mux"},

	{"Capture Left Mixer", "Analogue Mix Left", "Capture Left Mux"},

	{"Capture Left Mixer", "Analogue Mix Left", "Capture Right Mux"},

	{"Capture Left Mixer", "Analogue Mix Left", "Capture Right Mux"},

	{"Capture Right Mixer", "Analogue Mix Right", "Capture Left Mux"},

	{"Capture Right Mixer", "Analogue Mix Right", "Capture Left Mux"},