| Message ID | 1317118372-17052-7-git-send-email-rnayak@ti.com |
|---|---|
| State | New |
| Headers | show |
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 >
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; 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, }, };
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(-)