[PATCH RESEND] mfd: anatop: permit adata be NULL when access register

[PATCH RESEND] mfd: anatop: permit adata be NULL when access register

[Richard Zhao]

From: Richard Zhao <richard.zhao@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@freescale.com>
Cc: Ying-Chun Liu (PaulLiu) <paul.liu@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

[PATCH RESEND] mfd: anatop: permit adata be NULL when access register

[Richard Zhao]

Cc Paul's other mail address.

On Mon, Jun 04, 2012 at 09:56:29AM +0800, Richard Zhao wrote:
> From: Richard Zhao <richard.zhao@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@freescale.com>
> Cc: Ying-Chun Liu (PaulLiu) <paul.liu@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
> 

[PATCH RESEND] mfd: anatop: permit adata be NULL when access register

[Shawn Guo]

On Mon, Jun 04, 2012 at 10:13:16AM +0800, Richard Zhao wrote:
> Cc Paul's other mail address.
> 
> On Mon, Jun 04, 2012 at 09:56:29AM +0800, Richard Zhao wrote:
> > From: Richard Zhao <richard.zhao@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@freescale.com>
> > Cc: Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>

Acked-by: Shawn Guo <shawn.guo@linaro.org>

[PATCH RESEND] mfd: anatop: permit adata be NULL when access register

[Ying-Chun Liu (PaulLiu)]

(2012?06?11? 14:19), Shawn Guo wrote:
> On Mon, Jun 04, 2012 at 10:13:16AM +0800, Richard Zhao wrote:
>> Cc Paul's other mail address.
>>
>> On Mon, Jun 04, 2012 at 09:56:29AM +0800, Richard Zhao wrote:
>>> From: Richard Zhao <richard.zhao@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@freescale.com>
>>> Cc: Ying-Chun Liu (PaulLiu) <paul.liu@linaro.org>
> 
> Acked-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>

-- 
                                PaulLiu (???)
E-mail: Ying-Chun Liu (PaulLiu) <paulliu@debian.org>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 900 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120611/5170a3a9/attachment-0001.sig>

[PATCH RESEND] mfd: anatop: permit adata be NULL when access register

[Samuel Ortiz]

Hi Richard,

On Mon, Jun 04, 2012 at 09:56:29AM +0800, Richard Zhao wrote:
> From: Richard Zhao <richard.zhao@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.
Even though I understand it's quite unlikely that you'll never get 2 anatop
blocks on the same system, the below patch is not really nice.
Please make your driver support N > 1 instances of your hardware, even though
it's only for the sake of code cleanness.

Cheers,
Samuel.

-- 
Intel Open Source Technology Centre
http://oss.intel.com/