---

yaml --- r: 342697 b: refs/heads/master c: 3197436 h: refs/heads/master i: 342695: d4a2c8d v: v3
git-mirror · Nov 20, 2012 · 054c9d0 · 054c9d0
1 parent 6c31442
commit 054c9d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 531f67e41dcde1e358cf821d056241a66355cf03
+refs/heads/master: 31974361761b18e07e821d3b262e34f1a2d105cb
diff --git a/trunk/drivers/misc/atmel-ssc.c b/trunk/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/trunk/include/linux/atmel-ssc.h b/trunk/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;