Commit a6ce3052 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood',... 

Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood', 'asoc/topic/max98090' and 'asoc/topic/mc13783' into asoc-next
parents e7177999 d6e08617 6145dfc6 121eb444 a28d167f

Documentation/devicetree/bindings/sound/max98090.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ This device supports I2C only. 


Required properties:



- compatible : "maxim,max98090".

- compatible : "maxim,max98090" or "maxim,max98091".



- reg : The I2C address of the device.

arch/x86/include/asm/platform_sst_audio.h

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

 * platform_sst_audio.h:  sst audio platform data header file

 *

 * Copyright (C) 2012-14 Intel Corporation

 * Author: Jeeja KP <jeeja.kp@intel.com>

 * 	Omair Mohammed Abdullah <omair.m.abdullah@intel.com>

 *	Vinod Koul ,vinod.koul@intel.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 the Free Software Foundation; version 2

 * of the License.

 */

#ifndef _PLATFORM_SST_AUDIO_H_

#define _PLATFORM_SST_AUDIO_H_



#include <linux/sfi.h>



enum sst_audio_task_id_mrfld {

	SST_TASK_ID_NONE = 0,

	SST_TASK_ID_SBA = 1,

	SST_TASK_ID_MEDIA = 3,

	SST_TASK_ID_MAX = SST_TASK_ID_MEDIA,

};



/* Device IDs for Merrifield are Pipe IDs,

 * ref: DSP spec v0.75 */

enum sst_audio_device_id_mrfld {

	/* Output pipeline IDs */

	PIPE_ID_OUT_START = 0x0,

	PIPE_CODEC_OUT0 = 0x2,

	PIPE_CODEC_OUT1 = 0x3,

	PIPE_SPROT_LOOP_OUT = 0x4,

	PIPE_MEDIA_LOOP1_OUT = 0x5,

	PIPE_MEDIA_LOOP2_OUT = 0x6,

	PIPE_VOIP_OUT = 0xC,

	PIPE_PCM0_OUT = 0xD,

	PIPE_PCM1_OUT = 0xE,

	PIPE_PCM2_OUT = 0xF,

	PIPE_MEDIA0_OUT = 0x12,

	PIPE_MEDIA1_OUT = 0x13,

/* Input Pipeline IDs */

	PIPE_ID_IN_START = 0x80,

	PIPE_CODEC_IN0 = 0x82,

	PIPE_CODEC_IN1 = 0x83,

	PIPE_SPROT_LOOP_IN = 0x84,

	PIPE_MEDIA_LOOP1_IN = 0x85,

	PIPE_MEDIA_LOOP2_IN = 0x86,

	PIPE_VOIP_IN = 0x8C,

	PIPE_PCM0_IN = 0x8D,

	PIPE_PCM1_IN = 0x8E,

	PIPE_MEDIA0_IN = 0x8F,

	PIPE_MEDIA1_IN = 0x90,

	PIPE_MEDIA2_IN = 0x91,

	PIPE_RSVD = 0xFF,

};



/* The stream map for each platform consists of an array of the below

 * stream map structure.

 */

struct sst_dev_stream_map {

	u8 dev_num;		/* device id */

	u8 subdev_num;		/* substream */

	u8 direction;

	u8 device_id;		/* fw id */

	u8 task_id;		/* fw task */

	u8 status;

};



struct sst_platform_data {

	/* Intel software platform id*/

	struct sst_dev_stream_map *pdev_strm_map;

	unsigned int strm_map_size;

};



int add_sst_platform_device(void);

#endif

include/sound/rt286.h

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

 * linux/sound/rt286.h -- Platform data for RT286

 *

 * Copyright 2013 Realtek Microelectronics

 *

 * 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 __LINUX_SND_RT286_H

#define __LINUX_SND_RT286_H



struct rt286_platform_data {

	bool cbj_en; /*combo jack enable*/

	bool gpio2_en; /*GPIO2 enable*/

};



#endif

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_PCM3008

	select SND_SOC_PCM512x_I2C if I2C

	select SND_SOC_PCM512x_SPI if SPI_MASTER

	select SND_SOC_RT286 if I2C

	select SND_SOC_RT5631 if I2C

	select SND_SOC_RT5640 if I2C

	select SND_SOC_RT5645 if I2C
@@ -455,6 +456,9 @@ config SND_SOC_RL6231 
	default m if SND_SOC_RT5645=m

	default m if SND_SOC_RT5651=m



config SND_SOC_RT286

	tristate



config SND_SOC_RT5631

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ snd-soc-pcm512x-objs := pcm512x.o 
snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o

snd-soc-pcm512x-spi-objs := pcm512x-spi.o

snd-soc-rl6231-objs := rl6231.o

snd-soc-rt286-objs := rt286.o

snd-soc-rt5631-objs := rt5631.o

snd-soc-rt5640-objs := rt5640.o

snd-soc-rt5645-objs := rt5645.o
@@ -237,6 +238,7 @@ obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o 
obj-$(CONFIG_SND_SOC_PCM512x_I2C)	+= snd-soc-pcm512x-i2c.o

obj-$(CONFIG_SND_SOC_PCM512x_SPI)	+= snd-soc-pcm512x-spi.o

obj-$(CONFIG_SND_SOC_RL6231)	+= snd-soc-rl6231.o

obj-$(CONFIG_SND_SOC_RT286)	+= snd-soc-rt286.o

obj-$(CONFIG_SND_SOC_RT5631)	+= snd-soc-rt5631.o

obj-$(CONFIG_SND_SOC_RT5640)	+= snd-soc-rt5640.o

obj-$(CONFIG_SND_SOC_RT5645)	+= snd-soc-rt5645.o