diff mbox

[06/26] mfd: ab8500-sysctrl: Provide configuration for SysClkReqRfClkBuf registers

Message ID 1358254566-12419-7-git-send-email-lee.jones@linaro.org (mailing list archive)
State New, archived
Headers show

Commit Message

Lee Jones Jan. 15, 2013, 12:55 p.m. UTC 
From: Kennet Wallden <kennet.wallden@stericsson.com>

Add the possibility to pass configuration settings for
SysCl1kReqRfClkBuf to SysClk8ReqRfClkBuf via platform data.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Kennet Wallden <kennet.wallden@stericsson.com>
Reviewed-by: Karl-Johan PERNTZ <karl-johan.perntz@stericsson.com>
Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
---
 drivers/mfd/ab8500-sysctrl.c              |   25 +++++++++++++++++++++++++
 include/linux/mfd/abx500/ab8500-sysctrl.h |    5 +++++
 include/linux/mfd/abx500/ab8500.h         |    2 ++
 3 files changed, 32 insertions(+)

Comments

Samuel Ortiz Jan. 27, 2013, 11:52 p.m. UTC | #1 
Hi Lee, Kennet,

On Tue, Jan 15, 2013 at 12:55:46PM +0000, Lee Jones wrote:
> From: Kennet Wallden <kennet.wallden@stericsson.com>
> 
> Add the possibility to pass configuration settings for
> SysCl1kReqRfClkBuf to SysClk8ReqRfClkBuf via platform data.
> 
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Kennet Wallden <kennet.wallden@stericsson.com>
> Reviewed-by: Karl-Johan PERNTZ <karl-johan.perntz@stericsson.com>
> Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
> ---
>  drivers/mfd/ab8500-sysctrl.c              |   25 +++++++++++++++++++++++++
>  include/linux/mfd/abx500/ab8500-sysctrl.h |    5 +++++
>  include/linux/mfd/abx500/ab8500.h         |    2 ++
>  3 files changed, 32 insertions(+)
> 
> diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
> index cf58f69..19a024e 100644
> --- a/drivers/mfd/ab8500-sysctrl.c
> +++ b/drivers/mfd/ab8500-sysctrl.c
> @@ -113,11 +113,36 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value)
>  static int __devinit ab8500_sysctrl_probe(struct platform_device *pdev)
>  {
>  	struct ab8500_platform_data *plat;
> +	struct ab8500_sysctrl_platform_data *pdata;
>  
>  	sysctrl_dev = &pdev->dev;
>  	plat = dev_get_platdata(pdev->dev.parent);
>  	if (plat->pm_power_off)
>  		pm_power_off = ab8500_power_off;
> +
> +	pdata = plat->sysctrl;
> +
> +	if (pdata) {
> +		int ret;
> +		int i;
> +		int j;
Cosmetic 
int i, j, ret;


> +		for (i = AB8500_SYSCLKREQ1RFCLKBUF;
> +		     i <= AB8500_SYSCLKREQ8RFCLKBUF; i++) {
> +			j = i - AB8500_SYSCLKREQ1RFCLKBUF;
> +			ret = ab8500_sysctrl_write(i, 0xff,
> +						   pdata->initial_req_buf_config[j]);
> +			dev_dbg(&pdev->dev,
> +				"Setting SysClkReq%dRfClkBuf 0x%X\n",
> +				j + 1,
> +				pdata->initial_req_buf_config[j]);
> +			if (ret < 0) {
> +				dev_err(&pdev->dev,
> +					"unable to set sysClkReq%dRfClkBuf: "
> +					"%d\n", j + 1, ret);
> +			}
> +		}
> +	}
> +
>  	return 0;
>  }
>  
> diff --git a/include/linux/mfd/abx500/ab8500-sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h
> index 10eb509..ebf12e7 100644
> --- a/include/linux/mfd/abx500/ab8500-sysctrl.h
> +++ b/include/linux/mfd/abx500/ab8500-sysctrl.h
> @@ -37,6 +37,11 @@ static inline int ab8500_sysctrl_clear(u16 reg, u8 bits)
>  	return ab8500_sysctrl_write(reg, bits, 0);
>  }
>  
> +/* Configuration data for SysClkReq1RfClkBuf - SysClkReq8RfClkBuf */
> +struct ab8500_sysctrl_platform_data {
> +	u8 initial_req_buf_config[8];
> +};
> +
>  /* Registers */
>  #define AB8500_TURNONSTATUS		0x100
>  #define AB8500_RESETSTATUS		0x101
> diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
> index 96840c4..3f4e6d1 100644
> --- a/include/linux/mfd/abx500/ab8500.h
> +++ b/include/linux/mfd/abx500/ab8500.h
> @@ -270,6 +270,7 @@ struct regulator_reg_init;
>  struct regulator_init_data;
>  struct ab8500_gpio_platform_data;
>  struct ab8500_codec_platform_data;
> +struct ab8500_sysctrl_platform_data;
>  
>  /**
>   * struct ab8500_platform_data - AB8500 platform data
> @@ -291,6 +292,7 @@ struct ab8500_platform_data {
>  	struct regulator_init_data *regulator;
>  	struct ab8500_gpio_platform_data *gpio;
>  	struct ab8500_codec_platform_data *codec;
> +	struct ab8500_sysctrl_platform_data *sysctrl;
>  };
>  
>  extern int __devinit ab8500_init(struct ab8500 *ab8500,
> -- 
> 1.7.9.5
>
Lee Jones Jan. 28, 2013, 8:38 a.m. UTC | #2 
On Mon, 28 Jan 2013, Samuel Ortiz wrote:

> Hi Lee, Kennet,
> 
> On Tue, Jan 15, 2013 at 12:55:46PM +0000, Lee Jones wrote:
> > From: Kennet Wallden <kennet.wallden@stericsson.com>
> > 
> > Add the possibility to pass configuration settings for
> > SysCl1kReqRfClkBuf to SysClk8ReqRfClkBuf via platform data.
> > 
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > Signed-off-by: Kennet Wallden <kennet.wallden@stericsson.com>
> > Reviewed-by: Karl-Johan PERNTZ <karl-johan.perntz@stericsson.com>
> > Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
> > ---
> >  drivers/mfd/ab8500-sysctrl.c              |   25 +++++++++++++++++++++++++
> >  include/linux/mfd/abx500/ab8500-sysctrl.h |    5 +++++
> >  include/linux/mfd/abx500/ab8500.h         |    2 ++
> >  3 files changed, 32 insertions(+)
> > 
> > diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
> > index cf58f69..19a024e 100644
> > --- a/drivers/mfd/ab8500-sysctrl.c
> > +++ b/drivers/mfd/ab8500-sysctrl.c
> > @@ -113,11 +113,36 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value)
> >  static int __devinit ab8500_sysctrl_probe(struct platform_device *pdev)
> >  {
> >  	struct ab8500_platform_data *plat;
> > +	struct ab8500_sysctrl_platform_data *pdata;
> >  
> >  	sysctrl_dev = &pdev->dev;
> >  	plat = dev_get_platdata(pdev->dev.parent);
> >  	if (plat->pm_power_off)
> >  		pm_power_off = ab8500_power_off;
> > +
> > +	pdata = plat->sysctrl;
> > +
> > +	if (pdata) {
> > +		int ret;
> > +		int i;
> > +		int j;
> Cosmetic 
> int i, j, ret;

Hmmm... this is how I'd prefer it too, but other maintainers prefer
one-per-line. It would be better if we could standardise it somewhere
to prevent unnecessary fixups.

> > +		for (i = AB8500_SYSCLKREQ1RFCLKBUF;
> > +		     i <= AB8500_SYSCLKREQ8RFCLKBUF; i++) {
> > +			j = i - AB8500_SYSCLKREQ1RFCLKBUF;
> > +			ret = ab8500_sysctrl_write(i, 0xff,
> > +						   pdata->initial_req_buf_config[j]);
> > +			dev_dbg(&pdev->dev,
> > +				"Setting SysClkReq%dRfClkBuf 0x%X\n",
> > +				j + 1,
> > +				pdata->initial_req_buf_config[j]);
> > +			if (ret < 0) {
> > +				dev_err(&pdev->dev,
> > +					"unable to set sysClkReq%dRfClkBuf: "
> > +					"%d\n", j + 1, ret);
> > +			}
> > +		}
> > +	}
> > +
> >  	return 0;
> >  }
> >  
> > diff --git a/include/linux/mfd/abx500/ab8500-sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h
> > index 10eb509..ebf12e7 100644
> > --- a/include/linux/mfd/abx500/ab8500-sysctrl.h
> > +++ b/include/linux/mfd/abx500/ab8500-sysctrl.h
> > @@ -37,6 +37,11 @@ static inline int ab8500_sysctrl_clear(u16 reg, u8 bits)
> >  	return ab8500_sysctrl_write(reg, bits, 0);
> >  }
> >  
> > +/* Configuration data for SysClkReq1RfClkBuf - SysClkReq8RfClkBuf */
> > +struct ab8500_sysctrl_platform_data {
> > +	u8 initial_req_buf_config[8];
> > +};
> > +
> >  /* Registers */
> >  #define AB8500_TURNONSTATUS		0x100
> >  #define AB8500_RESETSTATUS		0x101
> > diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
> > index 96840c4..3f4e6d1 100644
> > --- a/include/linux/mfd/abx500/ab8500.h
> > +++ b/include/linux/mfd/abx500/ab8500.h
> > @@ -270,6 +270,7 @@ struct regulator_reg_init;
> >  struct regulator_init_data;
> >  struct ab8500_gpio_platform_data;
> >  struct ab8500_codec_platform_data;
> > +struct ab8500_sysctrl_platform_data;
> >  
> >  /**
> >   * struct ab8500_platform_data - AB8500 platform data
> > @@ -291,6 +292,7 @@ struct ab8500_platform_data {
> >  	struct regulator_init_data *regulator;
> >  	struct ab8500_gpio_platform_data *gpio;
> >  	struct ab8500_codec_platform_data *codec;
> > +	struct ab8500_sysctrl_platform_data *sysctrl;
> >  };
> >  
> >  extern int __devinit ab8500_init(struct ab8500 *ab8500,
>
Samuel Ortiz Feb. 3, 2013, 5:02 p.m. UTC | #3 
Hi Lee,

On Mon, Jan 28, 2013 at 08:38:16AM +0000, Lee Jones wrote:
> On Mon, 28 Jan 2013, Samuel Ortiz wrote:
> 
> > Hi Lee, Kennet,
> > 
> > On Tue, Jan 15, 2013 at 12:55:46PM +0000, Lee Jones wrote:
> > > From: Kennet Wallden <kennet.wallden@stericsson.com>
> > > 
> > > Add the possibility to pass configuration settings for
> > > SysCl1kReqRfClkBuf to SysClk8ReqRfClkBuf via platform data.
> > > 
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > Signed-off-by: Kennet Wallden <kennet.wallden@stericsson.com>
> > > Reviewed-by: Karl-Johan PERNTZ <karl-johan.perntz@stericsson.com>
> > > Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com>
> > > ---
> > >  drivers/mfd/ab8500-sysctrl.c              |   25 +++++++++++++++++++++++++
> > >  include/linux/mfd/abx500/ab8500-sysctrl.h |    5 +++++
> > >  include/linux/mfd/abx500/ab8500.h         |    2 ++
> > >  3 files changed, 32 insertions(+)
> > > 
> > > diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
> > > index cf58f69..19a024e 100644
> > > --- a/drivers/mfd/ab8500-sysctrl.c
> > > +++ b/drivers/mfd/ab8500-sysctrl.c
> > > @@ -113,11 +113,36 @@ int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value)
> > >  static int __devinit ab8500_sysctrl_probe(struct platform_device *pdev)
> > >  {
> > >  	struct ab8500_platform_data *plat;
> > > +	struct ab8500_sysctrl_platform_data *pdata;
> > >  
> > >  	sysctrl_dev = &pdev->dev;
> > >  	plat = dev_get_platdata(pdev->dev.parent);
> > >  	if (plat->pm_power_off)
> > >  		pm_power_off = ab8500_power_off;
> > > +
> > > +	pdata = plat->sysctrl;
> > > +
> > > +	if (pdata) {
> > > +		int ret;
> > > +		int i;
> > > +		int j;
> > Cosmetic 
> > int i, j, ret;
> 
> Hmmm... this is how I'd prefer it too, 
Great, I'm glad we agree :)

> but other maintainers prefer
> one-per-line. It would be better if we could standardise it somewhere
> to prevent unnecessary fixups.
I certainly don't like that coding style and I sincerely believe a vast
majority of the kernel code avoids it as well.

Cheers,
Samuel.
diff mbox

Patch

diff --git a/drivers/mfd/ab8500-sysctrl.c b/drivers/mfd/ab8500-sysctrl.c
index cf58f69..19a024e 100644
--- a/drivers/mfd/ab8500-sysctrl.c
+++ b/drivers/mfd/ab8500-sysctrl.c
@@ -113,11 +113,36 @@  int ab8500_sysctrl_write(u16 reg, u8 mask, u8 value)
 static int __devinit ab8500_sysctrl_probe(struct platform_device *pdev)
 {
 	struct ab8500_platform_data *plat;
+	struct ab8500_sysctrl_platform_data *pdata;
 
 	sysctrl_dev = &pdev->dev;
 	plat = dev_get_platdata(pdev->dev.parent);
 	if (plat->pm_power_off)
 		pm_power_off = ab8500_power_off;
+
+	pdata = plat->sysctrl;
+
+	if (pdata) {
+		int ret;
+		int i;
+		int j;
+		for (i = AB8500_SYSCLKREQ1RFCLKBUF;
+		     i <= AB8500_SYSCLKREQ8RFCLKBUF; i++) {
+			j = i - AB8500_SYSCLKREQ1RFCLKBUF;
+			ret = ab8500_sysctrl_write(i, 0xff,
+						   pdata->initial_req_buf_config[j]);
+			dev_dbg(&pdev->dev,
+				"Setting SysClkReq%dRfClkBuf 0x%X\n",
+				j + 1,
+				pdata->initial_req_buf_config[j]);
+			if (ret < 0) {
+				dev_err(&pdev->dev,
+					"unable to set sysClkReq%dRfClkBuf: "
+					"%d\n", j + 1, ret);
+			}
+		}
+	}
+
 	return 0;
 }
 
diff --git a/include/linux/mfd/abx500/ab8500-sysctrl.h b/include/linux/mfd/abx500/ab8500-sysctrl.h
index 10eb509..ebf12e7 100644
--- a/include/linux/mfd/abx500/ab8500-sysctrl.h
+++ b/include/linux/mfd/abx500/ab8500-sysctrl.h
@@ -37,6 +37,11 @@  static inline int ab8500_sysctrl_clear(u16 reg, u8 bits)
 	return ab8500_sysctrl_write(reg, bits, 0);
 }
 
+/* Configuration data for SysClkReq1RfClkBuf - SysClkReq8RfClkBuf */
+struct ab8500_sysctrl_platform_data {
+	u8 initial_req_buf_config[8];
+};
+
 /* Registers */
 #define AB8500_TURNONSTATUS		0x100
 #define AB8500_RESETSTATUS		0x101
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index 96840c4..3f4e6d1 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -270,6 +270,7 @@  struct regulator_reg_init;
 struct regulator_init_data;
 struct ab8500_gpio_platform_data;
 struct ab8500_codec_platform_data;
+struct ab8500_sysctrl_platform_data;
 
 /**
  * struct ab8500_platform_data - AB8500 platform data
@@ -291,6 +292,7 @@  struct ab8500_platform_data {
 	struct regulator_init_data *regulator;
 	struct ab8500_gpio_platform_data *gpio;
 	struct ab8500_codec_platform_data *codec;
+	struct ab8500_sysctrl_platform_data *sysctrl;
 };
 
 extern int __devinit ab8500_init(struct ab8500 *ab8500,