aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-01 23:34:58 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-01 23:34:58 -0500
commit3bc324922663bda59af5cdc409e8df3ed217d296 (patch)
tree1c9c7d527c4fd3383350d54acd7d15b9c5c4f639 /include
parent9d3493e84def26bd9b0bab825629063bacc89383 (diff)
parent3951e4aae2ce7e4593e575e91cbb22f1ba153596 (diff)
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/atmel-ssc.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/atmel-ssc.h b/include/linux/atmel-ssc.h
index 4eb31752e2b7..deb0ae58b99b 100644
--- a/include/linux/atmel-ssc.h
+++ b/include/linux/atmel-ssc.h
@@ -5,10 +5,16 @@
5#include <linux/list.h> 5#include <linux/list.h>
6#include <linux/io.h> 6#include <linux/io.h>
7 7
8struct atmel_ssc_platform_data {
9 int use_dma;
10};
11
8struct ssc_device { 12struct ssc_device {
9 struct list_head list; 13 struct list_head list;
14 resource_size_t phybase;
10 void __iomem *regs; 15 void __iomem *regs;
11 struct platform_device *pdev; 16 struct platform_device *pdev;
17 struct atmel_ssc_platform_data *pdata;
12 struct clk *clk; 18 struct clk *clk;
13 int user; 19 int user;
14 int irq; 20 int irq;