[PATCH RESEND] mfd: anatop: permit adata be NULL when access register
Richard Zhao
richard.zhao at freescale.com
Sun Jun 3 21:56:29 EDT 2012
From: Richard Zhao <richard.zhao at linaro.org>
It makes anatop register access easier. Anatop has many misc registers,
which may not be a specific driver.
There's only one anatop device for a running system, so we use a global
variable to store struct anatop.
Signed-off-by: Richard Zhao <richard.zhao at freescale.com>
Cc: Ying-Chun Liu (PaulLiu) <paul.liu at linaro.org>
---
drivers/mfd/anatop-mfd.c | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/drivers/mfd/anatop-mfd.c b/drivers/mfd/anatop-mfd.c
index 6da0634..60d59cb 100644
--- a/drivers/mfd/anatop-mfd.c
+++ b/drivers/mfd/anatop-mfd.c
@@ -41,8 +41,15 @@
#include <linux/of_address.h>
#include <linux/mfd/anatop.h>
+/* For any running system, there's only one anatop device. */
+static struct anatop *anatop_data;
+
u32 anatop_read_reg(struct anatop *adata, u32 addr)
{
+ BUG_ON(!anatop_data);
+ if (!adata)
+ adata = anatop_data;
+
return readl(adata->ioreg + addr);
}
EXPORT_SYMBOL_GPL(anatop_read_reg);
@@ -51,6 +58,10 @@ void anatop_write_reg(struct anatop *adata, u32 addr, u32 data, u32 mask)
{
u32 val;
+ BUG_ON(!anatop_data);
+ if (!adata)
+ adata = anatop_data;
+
data &= mask;
spin_lock(&adata->reglock);
@@ -83,6 +94,7 @@ static int __devinit of_anatop_probe(struct platform_device *pdev)
drvdata->ioreg = ioreg;
spin_lock_init(&drvdata->reglock);
platform_set_drvdata(pdev, drvdata);
+ anatop_data = drvdata;
of_platform_populate(np, of_anatop_match, NULL, dev);
return 0;
--
1.7.5.4
More information about the linux-arm-kernel
mailing list