All of lore.kernel.org
 help / color / mirror / Atom feed
From: Grant Likely <grant.likely@secretlab.ca>
To: Rajendra Nayak <rnayak@ti.com>
Cc: broonie@opensource.wolfsonmicro.com,
	devicetree-discuss@lists.ozlabs.org, linux-omap@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, tony@atomide.com,
	lrg@ti.com, b-cousson@ti.com, patches@linaro.org
Subject: Re: [PATCH 6/9] regulator: make fixed regulator driver extract data from dt
Date: Thu, 29 Sep 2011 19:34:21 -0600	[thread overview]
Message-ID: <20110930013421.GG12606@ponder.secretlab.ca> (raw)
In-Reply-To: <1317118372-17052-7-git-send-email-rnayak@ti.com>

On Tue, Sep 27, 2011 at 03:42:49PM +0530, Rajendra Nayak wrote:
> Modify the fixed regulator driver to extract fixed_voltage_config from
> device tree when passed, instead of getting it through platform_data
> structures (on non-DT builds)
> 
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> ---
>  drivers/regulator/fixed.c |   18 +++++++++++++++++-
>  1 files changed, 17 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
> index c09f791..0a9a10d 100644
> --- a/drivers/regulator/fixed.c
> +++ b/drivers/regulator/fixed.c
> @@ -140,10 +140,15 @@ static struct regulator_ops fixed_voltage_ops = {
>  
>  static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
>  {
> -	struct fixed_voltage_config *config = pdev->dev.platform_data;
> +	struct fixed_voltage_config *config;

This line doesn't actually need to change; just override it below if
the of_node is present.

>  	struct fixed_voltage_data *drvdata;
>  	int ret;
>  
> +	if (pdev->dev.of_node)
> +		config = of_get_fixed_voltage_config(&pdev->dev);
> +	else
> +		config = pdev->dev.platform_data;
> +
>  	drvdata = kzalloc(sizeof(struct fixed_voltage_data), GFP_KERNEL);
>  	if (drvdata == NULL) {
>  		dev_err(&pdev->dev, "Failed to allocate device data\n");
> @@ -252,12 +257,23 @@ static int __devexit reg_fixed_voltage_remove(struct platform_device *pdev)
>  	return 0;
>  }
>  
> +#if defined(CONFIG_OF)
> +static const struct of_device_id fixed_of_match[] __devinitconst = {
> +	{ .compatible = "regulator-fixed", },
> +	{},
> +};
> +MODULE_DEVICE_TABLE(of, fixed_of_match);
> +#else
> +#define fixed_of_match NULL
> +#endif
> +
>  static struct platform_driver regulator_fixed_voltage_driver = {
>  	.probe		= reg_fixed_voltage_probe,
>  	.remove		= __devexit_p(reg_fixed_voltage_remove),
>  	.driver		= {
>  		.name		= "reg-fixed-voltage",
>  		.owner		= THIS_MODULE,
> +		.of_match_table = fixed_of_match,


>  	},
>  };
>  
> -- 
> 1.7.1
> 

WARNING: multiple messages have this Message-ID (diff)
From: grant.likely@secretlab.ca (Grant Likely)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/9] regulator: make fixed regulator driver extract data from dt
Date: Thu, 29 Sep 2011 19:34:21 -0600	[thread overview]
Message-ID: <20110930013421.GG12606@ponder.secretlab.ca> (raw)
In-Reply-To: <1317118372-17052-7-git-send-email-rnayak@ti.com>

On Tue, Sep 27, 2011 at 03:42:49PM +0530, Rajendra Nayak wrote:
> Modify the fixed regulator driver to extract fixed_voltage_config from
> device tree when passed, instead of getting it through platform_data
> structures (on non-DT builds)
> 
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> ---
>  drivers/regulator/fixed.c |   18 +++++++++++++++++-
>  1 files changed, 17 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
> index c09f791..0a9a10d 100644
> --- a/drivers/regulator/fixed.c
> +++ b/drivers/regulator/fixed.c
> @@ -140,10 +140,15 @@ static struct regulator_ops fixed_voltage_ops = {
>  
>  static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
>  {
> -	struct fixed_voltage_config *config = pdev->dev.platform_data;
> +	struct fixed_voltage_config *config;

This line doesn't actually need to change; just override it below if
the of_node is present.

>  	struct fixed_voltage_data *drvdata;
>  	int ret;
>  
> +	if (pdev->dev.of_node)
> +		config = of_get_fixed_voltage_config(&pdev->dev);
> +	else
> +		config = pdev->dev.platform_data;
> +
>  	drvdata = kzalloc(sizeof(struct fixed_voltage_data), GFP_KERNEL);
>  	if (drvdata == NULL) {
>  		dev_err(&pdev->dev, "Failed to allocate device data\n");
> @@ -252,12 +257,23 @@ static int __devexit reg_fixed_voltage_remove(struct platform_device *pdev)
>  	return 0;
>  }
>  
> +#if defined(CONFIG_OF)
> +static const struct of_device_id fixed_of_match[] __devinitconst = {
> +	{ .compatible = "regulator-fixed", },
> +	{},
> +};
> +MODULE_DEVICE_TABLE(of, fixed_of_match);
> +#else
> +#define fixed_of_match NULL
> +#endif
> +
>  static struct platform_driver regulator_fixed_voltage_driver = {
>  	.probe		= reg_fixed_voltage_probe,
>  	.remove		= __devexit_p(reg_fixed_voltage_remove),
>  	.driver		= {
>  		.name		= "reg-fixed-voltage",
>  		.owner		= THIS_MODULE,
> +		.of_match_table = fixed_of_match,


>  	},
>  };
>  
> -- 
> 1.7.1
> 

  reply	other threads:[~2011-09-30  1:34 UTC|newest]

Thread overview: 114+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-27 10:12 [PATCH 0/9] Device tree support for regulators Rajendra Nayak
2011-09-27 10:12 ` Rajendra Nayak
2011-09-27 10:12 ` [PATCH 1/9] regulator: twl: Remove hardcoded board constraints from driver Rajendra Nayak
2011-09-27 10:12   ` Rajendra Nayak
2011-09-27 11:37   ` Mark Brown
2011-09-27 11:37     ` Mark Brown
2011-09-27 14:47     ` Rajendra Nayak
2011-09-27 14:47       ` Rajendra Nayak
2011-09-27 10:12 ` [PATCH 2/9] regulator: helper routine to extract regulator_init_data Rajendra Nayak
2011-09-27 10:12   ` Rajendra Nayak
2011-09-27 12:10   ` Mark Brown
2011-09-27 12:10     ` Mark Brown
2011-09-27 14:48     ` Rajendra Nayak
2011-09-27 14:48       ` Rajendra Nayak
     [not found]       ` <4E81E224.2070408-l0cyMroinI0@public.gmane.org>
2011-09-27 15:05         ` Mark Brown
2011-09-27 15:05           ` Mark Brown
2011-09-28  8:06           ` Cousson, Benoit
2011-09-28  8:06             ` Cousson, Benoit
2011-09-30  4:27           ` Rajendra Nayak
2011-09-30  4:27             ` Rajendra Nayak
2011-09-30  7:58             ` Cousson, Benoit
2011-09-30  7:58               ` Cousson, Benoit
2011-09-30 10:49               ` Mark Brown
2011-09-30 10:49                 ` Mark Brown
2011-09-30 10:28             ` Mark Brown
2011-09-30 10:28               ` Mark Brown
2011-09-30 10:48               ` Mark Brown
2011-09-30 10:48                 ` Mark Brown
2011-09-30 11:09                 ` Rajendra Nayak
2011-09-30 11:09                   ` Rajendra Nayak
2011-09-30 11:35                   ` Cousson, Benoit
2011-09-30 11:35                     ` Cousson, Benoit
2011-09-30 12:18                   ` Mark Brown
2011-09-30 12:18                     ` Mark Brown
2011-10-04  5:28                     ` Rajendra Nayak
2011-10-04  5:28                       ` Rajendra Nayak
2011-10-04 10:18                       ` Mark Brown
2011-10-04 10:18                         ` Mark Brown
2011-10-04 11:40                         ` Rajendra Nayak
2011-10-04 11:40                           ` Rajendra Nayak
2011-10-04 11:51                           ` Mark Brown
2011-10-04 11:51                             ` Mark Brown
2011-10-04 12:02                             ` Rajendra Nayak
2011-10-04 12:02                               ` Rajendra Nayak
2011-10-04 12:11                               ` Mark Brown
2011-10-04 12:11                                 ` Mark Brown
2011-10-04 12:40                                 ` Nayak, Rajendra
2011-10-04 12:40                                   ` Nayak, Rajendra
     [not found]     ` <20110927121003.GB4289-yzvPICuk2AATkU/dhu1WVueM+bqZidxxQQ4Iyu8u01E@public.gmane.org>
2011-09-30  1:24       ` Grant Likely
2011-09-30  1:24         ` Grant Likely
2011-10-04 23:01     ` Russell King - ARM Linux
2011-10-04 23:01       ` Russell King - ARM Linux
2011-10-04 23:48       ` Grant Likely
2011-10-04 23:48         ` Grant Likely
2011-09-27 10:12 ` [PATCH 3/9] omap4: sdp: Pass regulator data from dt Rajendra Nayak
2011-09-27 10:12   ` Rajendra Nayak
2011-09-27 10:12 ` [PATCH 4/9] regulator: twl: Make twl-regulator driver extract data from DT Rajendra Nayak
2011-09-27 10:12   ` Rajendra Nayak
2011-09-27 12:14   ` Mark Brown
2011-09-27 12:14     ` Mark Brown
2011-09-27 14:48     ` Rajendra Nayak
2011-09-27 14:48       ` Rajendra Nayak
2011-09-27 10:12 ` [PATCH 5/9] regulator: helper routine to extract fixed_voltage_config Rajendra Nayak
2011-09-27 10:12   ` Rajendra Nayak
2011-09-27 12:16   ` Mark Brown
2011-09-27 12:16     ` Mark Brown
2011-09-27 14:49     ` Rajendra Nayak
2011-09-27 14:49       ` Rajendra Nayak
2011-09-27 16:13       ` Mark Brown
2011-09-27 16:13         ` Mark Brown
     [not found]   ` <1317118372-17052-6-git-send-email-rnayak-l0cyMroinI0@public.gmane.org>
2011-09-30  1:26     ` Grant Likely
2011-09-30  1:26       ` Grant Likely
2011-09-27 10:12 ` [PATCH 6/9] regulator: make fixed regulator driver extract data from dt Rajendra Nayak
2011-09-27 10:12   ` Rajendra Nayak
2011-09-30  1:34   ` Grant Likely [this message]
2011-09-30  1:34     ` Grant Likely
2011-09-27 10:12 ` [PATCH 7/9] omap4: panda: Pass regulator data from DT Rajendra Nayak
2011-09-27 10:12   ` Rajendra Nayak
2011-09-27 10:12 ` [PATCH 8/9] regulator: helper to extract regulator node based on supply name Rajendra Nayak
2011-09-27 10:12   ` Rajendra Nayak
2011-09-27 12:21   ` Mark Brown
2011-09-27 12:21     ` Mark Brown
2011-09-27 14:49     ` Rajendra Nayak
2011-09-27 14:49       ` Rajendra Nayak
2011-09-27 18:59       ` Mark Brown
2011-09-27 18:59         ` Mark Brown
2011-09-28  8:09         ` Cousson, Benoit
2011-09-28  8:09           ` Cousson, Benoit
2011-09-28  8:18           ` Rajendra Nayak
2011-09-28  8:18             ` Rajendra Nayak
2011-09-28 12:26           ` Mark Brown
2011-09-28 12:26             ` Mark Brown
2011-09-30  9:34             ` Rajendra Nayak
2011-09-30  9:34               ` Rajendra Nayak
2011-09-30 10:35               ` Mark Brown
2011-09-30 10:35                 ` Mark Brown
2011-10-04 17:00               ` Grant Likely
2011-10-04 17:00                 ` Grant Likely
2011-09-28 10:56         ` Rajendra Nayak
2011-09-28 10:56           ` Rajendra Nayak
2011-09-30  1:36   ` Grant Likely
2011-09-30  1:36     ` Grant Likely
2011-09-27 10:12 ` [PATCH 9/9] regulator: map consumer regulator based on device tree Rajendra Nayak
2011-09-27 10:12   ` Rajendra Nayak
2011-09-27 12:23   ` Mark Brown
2011-09-27 12:23     ` Mark Brown
2011-09-27 14:49     ` Rajendra Nayak
2011-09-27 14:49       ` Rajendra Nayak
     [not found]   ` <1317118372-17052-10-git-send-email-rnayak-l0cyMroinI0@public.gmane.org>
2011-09-30  1:38     ` Grant Likely
2011-09-30  1:38       ` Grant Likely
2011-09-30  9:29       ` Rajendra Nayak
2011-09-30  9:29         ` Rajendra Nayak
2011-09-30  1:39 ` [PATCH 0/9] Device tree support for regulators Grant Likely
2011-09-30  1:39   ` Grant Likely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110930013421.GG12606@ponder.secretlab.ca \
    --to=grant.likely@secretlab.ca \
    --cc=b-cousson@ti.com \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=lrg@ti.com \
    --cc=patches@linaro.org \
    --cc=rnayak@ti.com \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.