From 636036d29a20154b897571e1d5949faac98bfb7c Mon Sep 17 00:00:00 2001 From: Bo Shen Date: Tue, 6 Nov 2012 13:57:51 +0800 Subject: ARM: at91: atmel-ssc: add platform device id table Add platform device id to check whether the SSC controller support pdc or dam for data transfer If match "at91rm9200_ssc", which support pdc for data transfer If match "at91sam9g45_ssc", which support dma for data transfer Signed-off-by: Bo Shen Acked-by: Nicolas Ferre Signed-off-by: Mark Brown --- include/linux/atmel-ssc.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/linux/atmel-ssc.h b/include/linux/atmel-ssc.h index 4eb31752e2b7..1ca0e3292bc9 100644 --- a/include/linux/atmel-ssc.h +++ b/include/linux/atmel-ssc.h @@ -5,10 +5,15 @@ #include #include +struct atmel_ssc_platform_data { + int use_dma; +}; + struct ssc_device { struct list_head list; void __iomem *regs; struct platform_device *pdev; + struct atmel_ssc_platform_data *pdata; struct clk *clk; int user; int irq; -- cgit v1.2.3 From 31974361761b18e07e821d3b262e34f1a2d105cb Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Tue, 20 Nov 2012 16:38:17 +0800 Subject: ASoC: atmel-ssc: add phybase in device structure Useful for future dmaengine use. Signed-off-by: Nicolas Ferre Signed-off-by: Mark Brown --- drivers/misc/atmel-ssc.c | 2 ++ include/linux/atmel-ssc.h | 1 + 2 files changed, 3 insertions(+) (limited to 'include') diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c index a769719e36bf..d07a9eda7fff 100644 --- a/drivers/misc/atmel-ssc.c +++ b/drivers/misc/atmel-ssc.c @@ -157,6 +157,8 @@ static int ssc_probe(struct platform_device *pdev) return -EINVAL; } + ssc->phybase = regs->start; + ssc->clk = devm_clk_get(&pdev->dev, "pclk"); if (IS_ERR(ssc->clk)) { dev_dbg(&pdev->dev, "no pclk clock defined\n"); diff --git a/include/linux/atmel-ssc.h b/include/linux/atmel-ssc.h index 1ca0e3292bc9..deb0ae58b99b 100644 --- a/include/linux/atmel-ssc.h +++ b/include/linux/atmel-ssc.h @@ -11,6 +11,7 @@ struct atmel_ssc_platform_data { struct ssc_device { struct list_head list; + resource_size_t phybase; void __iomem *regs; struct platform_device *pdev; struct atmel_ssc_platform_data *pdata; -- cgit v1.2.3