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

Commit 4609ed6b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next 

ASoC: Updates for 3.6

This has been a pretty quiet release - very little activity in framework
terms, mostly just a few new drivers and updates:

- Added the ability to add and remove DAPM paths dynamically, mostly for
  reparenting on clock changes.
- New machine drivers for Marvell Brownstone, ST-Ericsson Ux500
  reference platform and ttc-dkp.
- New CPU drivers for Blackfin BF6xx SPORTs in I2S mode, Marvell MMP,
  Synopsis Designware I2S controllers, and SPEAr DMA and S/PDIF
- New CODEC drivers for Dialog DA732x, ST STA529, ST-Ericsson AB8500, TI
  Isabelle and Wolfson Microelectronics WM5102 and WM5110
parents 639aa4bd 409b78cc

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -6747,9 +6747,11 @@ F: include/linux/tifm.h 


TI LM49xxx FAMILY ASoC CODEC DRIVERS

M:	M R Swami Reddy <mr.swami.reddy@ti.com>

M:	Vishwas A Deshpande <vishwas.a.deshpande@ti.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Maintained

F:	sound/soc/codecs/lm49453*

F:	sound/soc/codecs/isabelle*



TI TWL4030 SERIES SOC CODEC DRIVER

M:	Peter Ujfalusi <peter.ujfalusi@ti.com>

arch/arm/mach-ux500/board-mop500.c

+14 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/mfd/tc3589x.h>

#include <linux/mfd/tps6105x.h>

#include <linux/mfd/abx500/ab8500-gpio.h>

#include <linux/mfd/abx500/ab8500-codec.h>

#include <linux/leds-lp5521.h>

#include <linux/input.h>

#include <linux/smsc911x.h>
@@ -97,6 +98,18 @@ static struct ab8500_gpio_platform_data ab8500_gpio_pdata = { 
					0x7A, 0x00, 0x00},

};



/* ab8500-codec */

static struct ab8500_codec_platform_data ab8500_codec_pdata = {

	.amics =  {

		.mic1_type = AMIC_TYPE_DIFFERENTIAL,

		.mic2_type = AMIC_TYPE_DIFFERENTIAL,

		.mic1a_micbias = AMIC_MICBIAS_VAMIC1,

		.mic1b_micbias = AMIC_MICBIAS_VAMIC1,

		.mic2_micbias = AMIC_MICBIAS_VAMIC2

	},

	.ear_cmv = EAR_CMV_0_95V

};



static struct gpio_keys_button snowball_key_array[] = {

	{

		.gpio           = 32,
@@ -195,6 +208,7 @@ static struct ab8500_platform_data ab8500_platdata = { 
	.regulator	= ab8500_regulators,

	.num_regulator	= ARRAY_SIZE(ab8500_regulators),

	.gpio		= &ab8500_gpio_pdata,

	.codec		= &ab8500_codec_pdata,

};



static struct resource ab8500_resources[] = {

include/linux/dmaengine.h

+6 −0
Original line number Diff line number Diff line
@@ -670,6 +670,12 @@ static inline int dmaengine_resume(struct dma_chan *chan) 
	return dmaengine_device_control(chan, DMA_RESUME, 0);

}



static inline enum dma_status dmaengine_tx_status(struct dma_chan *chan,

	dma_cookie_t cookie, struct dma_tx_state *state)

{

	return chan->device->device_tx_status(chan, cookie, state);

}



static inline dma_cookie_t dmaengine_submit(struct dma_async_tx_descriptor *desc)

{

	return desc->tx_submit(desc);

include/linux/mfd/abx500/ab8500-codec.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) ST-Ericsson SA 2012

 *

 * Author: Ola Lilja <ola.o.lilja@stericsson.com>

 *         for ST-Ericsson.

 *

 * License terms:

 *

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

 * under the terms of the GNU General Public License version 2 as published

 * by the Free Software Foundation.

 */



#ifndef AB8500_CORE_CODEC_H

#define AB8500_CORE_CODEC_H



/* Mic-types */

enum amic_type {

	AMIC_TYPE_SINGLE_ENDED,

	AMIC_TYPE_DIFFERENTIAL

};



/* Mic-biases */

enum amic_micbias {

	AMIC_MICBIAS_VAMIC1,

	AMIC_MICBIAS_VAMIC2

};



/* Bias-voltage */

enum ear_cm_voltage {

	EAR_CMV_0_95V,

	EAR_CMV_1_10V,

	EAR_CMV_1_27V,

	EAR_CMV_1_58V

};



/* Analog microphone settings */

struct amic_settings {

	enum amic_type mic1_type;

	enum amic_type mic2_type;

	enum amic_micbias mic1a_micbias;

	enum amic_micbias mic1b_micbias;

	enum amic_micbias mic2_micbias;

};



/* Platform data structure for the audio-parts of the AB8500 */

struct ab8500_codec_platform_data {

	struct amic_settings amics;

	enum ear_cm_voltage ear_cmv;

};



#endif

include/linux/mfd/abx500/ab8500.h

+2 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ struct ab8500 { 
struct regulator_reg_init;

struct regulator_init_data;

struct ab8500_gpio_platform_data;

struct ab8500_codec_platform_data;



/**

 * struct ab8500_platform_data - AB8500 platform data
@@ -284,6 +285,7 @@ struct ab8500_platform_data { 
	int num_regulator;

	struct regulator_init_data *regulator;

	struct ab8500_gpio_platform_data *gpio;

	struct ab8500_codec_platform_data *codec;

};



extern int __devinit ab8500_init(struct ab8500 *ab8500,