Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sh', 'asoc/topic/ssm2518' and 'asoc/topic/sti' into asoc-next
This commit is contained in:
@@ -13,6 +13,9 @@
|
||||
*/
|
||||
#define S3C64XX_AC97_GPD 0
|
||||
#define S3C64XX_AC97_GPE 1
|
||||
|
||||
#include <linux/dmaengine.h>
|
||||
|
||||
extern void s3c64xx_ac97_setup_gpio(int);
|
||||
|
||||
struct samsung_i2s {
|
||||
@@ -39,6 +42,11 @@ struct samsung_i2s {
|
||||
*/
|
||||
struct s3c_audio_pdata {
|
||||
int (*cfg_gpio)(struct platform_device *);
|
||||
dma_filter_fn dma_filter;
|
||||
void *dma_playback;
|
||||
void *dma_capture;
|
||||
void *dma_play_sec;
|
||||
void *dma_capture_mic;
|
||||
union {
|
||||
struct samsung_i2s i2s;
|
||||
} type;
|
||||
|
Reference in New Issue
Block a user