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

Commit 669be070 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'topic/asoc' of... 

Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.36
parents 1082e270 ad8332c1

arch/arm/mach-omap2/mcbsp.c

+4 −8
Original line number Diff line number Diff line
@@ -186,32 +186,28 @@ static struct omap_mcbsp_platform_data omap44xx_mcbsp_pdata[] = { 
		.phys_base      = OMAP44XX_MCBSP1_BASE,

		.dma_rx_sync    = OMAP44XX_DMA_MCBSP1_RX,

		.dma_tx_sync    = OMAP44XX_DMA_MCBSP1_TX,

		.rx_irq         = INT_24XX_MCBSP1_IRQ_RX,

		.tx_irq         = INT_24XX_MCBSP1_IRQ_TX,

		.tx_irq         = OMAP44XX_IRQ_MCBSP1,

		.ops            = &omap2_mcbsp_ops,

	},

	{

		.phys_base      = OMAP44XX_MCBSP2_BASE,

		.dma_rx_sync    = OMAP44XX_DMA_MCBSP2_RX,

		.dma_tx_sync    = OMAP44XX_DMA_MCBSP2_TX,

		.rx_irq         = INT_24XX_MCBSP2_IRQ_RX,

		.tx_irq         = INT_24XX_MCBSP2_IRQ_TX,

		.tx_irq         = OMAP44XX_IRQ_MCBSP2,

		.ops            = &omap2_mcbsp_ops,

	},

	{

		.phys_base      = OMAP44XX_MCBSP3_BASE,

		.dma_rx_sync    = OMAP44XX_DMA_MCBSP3_RX,

		.dma_tx_sync    = OMAP44XX_DMA_MCBSP3_TX,

		.rx_irq         = INT_24XX_MCBSP3_IRQ_RX,

		.tx_irq         = INT_24XX_MCBSP3_IRQ_TX,

		.tx_irq         = OMAP44XX_IRQ_MCBSP3,

		.ops            = &omap2_mcbsp_ops,

	},

	{

		.phys_base      = OMAP44XX_MCBSP4_BASE,

		.dma_rx_sync    = OMAP44XX_DMA_MCBSP4_RX,

		.dma_tx_sync    = OMAP44XX_DMA_MCBSP4_TX,

		.rx_irq         = INT_24XX_MCBSP4_IRQ_RX,

		.tx_irq         = INT_24XX_MCBSP4_IRQ_TX,

		.tx_irq         = OMAP44XX_IRQ_MCBSP4,

		.ops            = &omap2_mcbsp_ops,

	},

};

arch/arm/plat-omap/mcbsp.c

+19 −15
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold) 
{

	struct omap_mcbsp *mcbsp;



	if (!cpu_is_omap34xx())

	if (!cpu_is_omap34xx() && !cpu_is_omap44xx())

		return;



	if (!omap_mcbsp_check_valid_id(id)) {
@@ -510,7 +510,7 @@ void omap_mcbsp_set_rx_threshold(unsigned int id, u16 threshold) 
{

	struct omap_mcbsp *mcbsp;



	if (!cpu_is_omap34xx())

	if (!cpu_is_omap34xx() && !cpu_is_omap44xx())

		return;



	if (!omap_mcbsp_check_valid_id(id)) {
@@ -641,7 +641,7 @@ static inline void omap34xx_mcbsp_request(struct omap_mcbsp *mcbsp) 
	 * Enable wakup behavior, smart idle and all wakeups

	 * REVISIT: some wakeups may be unnecessary

	 */

	if (cpu_is_omap34xx()) {

	if (cpu_is_omap34xx() || cpu_is_omap44xx()) {

		u16 syscon;



		syscon = MCBSP_READ(mcbsp, SYSCON);
@@ -664,7 +664,7 @@ static inline void omap34xx_mcbsp_free(struct omap_mcbsp *mcbsp) 
	/*

	 * Disable wakup behavior, smart idle and all wakeups

	 */

	if (cpu_is_omap34xx()) {

	if (cpu_is_omap34xx() || cpu_is_omap44xx()) {

		u16 syscon;



		syscon = MCBSP_READ(mcbsp, SYSCON);
@@ -778,8 +778,10 @@ int omap_mcbsp_request(unsigned int id) 
			goto err_clk_disable;

		}



		if (mcbsp->rx_irq) {

			init_completion(&mcbsp->rx_irq_completion);

		err = request_irq(mcbsp->rx_irq, omap_mcbsp_rx_irq_handler,

			err = request_irq(mcbsp->rx_irq,

					omap_mcbsp_rx_irq_handler,

					0, "McBSP", (void *)mcbsp);

			if (err != 0) {

				dev_err(mcbsp->dev, "Unable to request RX IRQ %d "
@@ -788,6 +790,7 @@ int omap_mcbsp_request(unsigned int id) 
				goto err_free_irq;

			}

		}

	}



	return 0;

err_free_irq:
@@ -835,6 +838,7 @@ void omap_mcbsp_free(unsigned int id) 


	if (mcbsp->io_type == OMAP_MCBSP_IRQ_IO) {

		/* Free IRQs */

		if (mcbsp->rx_irq)

			free_irq(mcbsp->rx_irq, (void *)mcbsp);

		free_irq(mcbsp->tx_irq, (void *)mcbsp);

	}
@@ -909,7 +913,7 @@ void omap_mcbsp_start(unsigned int id, int tx, int rx) 
		MCBSP_WRITE(mcbsp, SPCR2, w | (1 << 7));

	}



	if (cpu_is_omap2430() || cpu_is_omap34xx()) {

	if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) {

		/* Release the transmitter and receiver */

		w = MCBSP_READ_CACHE(mcbsp, XCCR);

		w &= ~(tx ? XDISABLE : 0);
@@ -939,7 +943,7 @@ void omap_mcbsp_stop(unsigned int id, int tx, int rx) 


	/* Reset transmitter */

	tx &= 1;

	if (cpu_is_omap2430() || cpu_is_omap34xx()) {

	if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) {

		w = MCBSP_READ_CACHE(mcbsp, XCCR);

		w |= (tx ? XDISABLE : 0);

		MCBSP_WRITE(mcbsp, XCCR, w);
@@ -949,7 +953,7 @@ void omap_mcbsp_stop(unsigned int id, int tx, int rx) 


	/* Reset receiver */

	rx &= 1;

	if (cpu_is_omap2430() || cpu_is_omap34xx()) {

	if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) {

		w = MCBSP_READ_CACHE(mcbsp, RCCR);

		w |= (rx ? RDISABLE : 0);

		MCBSP_WRITE(mcbsp, RCCR, w);

sound/soc/codecs/tlv320dac33.c

+4 −1
Original line number Diff line number Diff line
@@ -352,7 +352,7 @@ static int dac33_hard_power(struct snd_soc_codec *codec, int power) 


	/* Safety check */

	if (unlikely(power == dac33->chip_power)) {

		dev_warn(codec->dev, "Trying to set the same power state: %s\n",

		dev_dbg(codec->dev, "Trying to set the same power state: %s\n",

			power ? "ON" : "OFF");

		goto exit;

	}
@@ -589,6 +589,9 @@ static int dac33_set_bias_level(struct snd_soc_codec *codec, 
		}

		break;

	case SND_SOC_BIAS_OFF:

		/* Do not power off, when the codec is already off */

		if (codec->bias_level == SND_SOC_BIAS_OFF)

			return 0;

		ret = dac33_hard_power(codec, 0);

		if (ret != 0)

			return ret;

sound/soc/codecs/tpa6130a2.c

+20 −36
Original line number Diff line number Diff line
@@ -35,22 +35,11 @@ 


static struct i2c_client *tpa6130a2_client;



#define TPA6130A2_NUM_SUPPLIES 2

static const char *tpa6130a2_supply_names[TPA6130A2_NUM_SUPPLIES] = {

	"CPVSS",

	"Vdd",

};



static const char *tpa6140a2_supply_names[TPA6130A2_NUM_SUPPLIES] = {

	"HPVdd",

	"AVdd",

};



/* This struct is used to save the context */

struct tpa6130a2_data {

	struct mutex mutex;

	unsigned char regs[TPA6130A2_CACHEREGNUM];

	struct regulator_bulk_data supplies[TPA6130A2_NUM_SUPPLIES];

	struct regulator *supply;

	int power_gpio;

	unsigned char power_state;

	enum tpa_model id;
@@ -135,11 +124,10 @@ static int tpa6130a2_power(int power) 
		if (data->power_gpio >= 0)

			gpio_set_value(data->power_gpio, 1);



		ret = regulator_bulk_enable(ARRAY_SIZE(data->supplies),

					    data->supplies);

		ret = regulator_enable(data->supply);

		if (ret != 0) {

			dev_err(&tpa6130a2_client->dev,

				"Failed to enable supplies: %d\n", ret);

				"Failed to enable supply: %d\n", ret);

			goto exit;

		}
@@ -160,11 +148,10 @@ static int tpa6130a2_power(int power) 
		if (data->power_gpio >= 0)

			gpio_set_value(data->power_gpio, 0);



		ret = regulator_bulk_disable(ARRAY_SIZE(data->supplies),

					     data->supplies);

		ret = regulator_disable(data->supply);

		if (ret != 0) {

			dev_err(&tpa6130a2_client->dev,

				"Failed to disable supplies: %d\n", ret);

				"Failed to disable supply: %d\n", ret);

			goto exit;

		}
@@ -371,8 +358,8 @@ static const struct snd_soc_dapm_widget tpa6130a2_dapm_widgets[] = { 
			0, 0, tpa6130a2_supply_event,

			SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD),

	/* Outputs */

	SND_SOC_DAPM_HP("TPA6130A2 Headphone Left", NULL),

	SND_SOC_DAPM_HP("TPA6130A2 Headphone Right", NULL),

	SND_SOC_DAPM_OUTPUT("TPA6130A2 Headphone Left"),

	SND_SOC_DAPM_OUTPUT("TPA6130A2 Headphone Right"),

};



static const struct snd_soc_dapm_route audio_map[] = {
@@ -411,7 +398,8 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client, 
	struct device *dev;

	struct tpa6130a2_data *data;

	struct tpa6130a2_platform_data *pdata;

	int i, ret;

	const char *regulator;

	int ret;



	dev = &client->dev;
@@ -453,25 +441,21 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client, 
	}



	switch (data->id) {

	default:

		dev_warn(dev, "Unknown TPA model (%d). Assuming 6130A2\n",

			 pdata->id);

	case TPA6130A2:

		for (i = 0; i < ARRAY_SIZE(data->supplies); i++)

			data->supplies[i].supply = tpa6130a2_supply_names[i];

		regulator = "Vdd";

		break;

	case TPA6140A2:

		for (i = 0; i < ARRAY_SIZE(data->supplies); i++)

			data->supplies[i].supply = tpa6140a2_supply_names[i];;

		regulator = "AVdd";

		break;

	default:

		dev_warn(dev, "Unknown TPA model (%d). Assuming 6130A2\n",

			 pdata->id);

		for (i = 0; i < ARRAY_SIZE(data->supplies); i++)

			data->supplies[i].supply = tpa6130a2_supply_names[i];

	}



	ret = regulator_bulk_get(dev, ARRAY_SIZE(data->supplies),

				 data->supplies);

	if (ret != 0) {

		dev_err(dev, "Failed to request supplies: %d\n", ret);

	data->supply = regulator_get(dev, regulator);

	if (IS_ERR(data->supply)) {

		ret = PTR_ERR(data->supply);

		dev_err(dev, "Failed to request supply: %d\n", ret);

		goto err_regulator;

	}
@@ -494,7 +478,7 @@ static int __devinit tpa6130a2_probe(struct i2c_client *client, 
	return 0;



err_power:

	regulator_bulk_free(ARRAY_SIZE(data->supplies), data->supplies);

	regulator_put(data->supply);

err_regulator:

	if (data->power_gpio >= 0)

		gpio_free(data->power_gpio);
@@ -515,7 +499,7 @@ static int __devexit tpa6130a2_remove(struct i2c_client *client) 
	if (data->power_gpio >= 0)

		gpio_free(data->power_gpio);



	regulator_bulk_free(ARRAY_SIZE(data->supplies), data->supplies);

	regulator_put(data->supply);



	kfree(data);

	tpa6130a2_client = NULL;

sound/soc/codecs/twl4030.c

+12 −0
Original line number Diff line number Diff line
@@ -1102,6 +1102,16 @@ static const struct soc_enum twl4030_vibradir_enum = 
			ARRAY_SIZE(twl4030_vibradir_texts),

			twl4030_vibradir_texts);



/* Digimic Left and right swapping */

static const char *twl4030_digimicswap_texts[] = {

	"Not swapped", "Swapped",

};



static const struct soc_enum twl4030_digimicswap_enum =

	SOC_ENUM_SINGLE(TWL4030_REG_MISC_SET_1, 0,

			ARRAY_SIZE(twl4030_digimicswap_texts),

			twl4030_digimicswap_texts);



static const struct snd_kcontrol_new twl4030_snd_controls[] = {

	/* Codec operation mode control */

	SOC_ENUM_EXT("Codec Operation Mode", twl4030_op_modes_enum,
@@ -1178,6 +1188,8 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = { 


	SOC_ENUM("Vibra H-bridge mode", twl4030_vibradirmode_enum),

	SOC_ENUM("Vibra H-bridge direction", twl4030_vibradir_enum),



	SOC_ENUM("Digimic LR Swap", twl4030_digimicswap_enum),

};



static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {