| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 5 Dec 2012 10:28:46 +0800
From: Haojian Zhuang <haojian.zhuang@...il.com>
To: Qing Xu <qingx@...vell.com>
Cc: Samuel Ortiz <sameo@...ux.intel.com>,
Grant Likely <grant.likely@...retlab.ca>,
Rob Herring <rob.herring@...xeda.com>,
Qiao Zhou <zhouqiao@...vell.com>, cxie4@...vell.com,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] mfd: 88pm80x: add dt support
On Wed, Dec 5, 2012 at 10:23 AM, Qing Xu <qingx@...vell.com> wrote:
> From: Qing Xu <qingx@...vell.com>
>
> add dt support for 88pm800 and 88pm805
>
> Signed-off-by: Qing Xu <qingx@...vell.com>
> ---
> drivers/mfd/88pm800.c | 26 +++++++++++++++++++++++---
> drivers/mfd/88pm805.c | 26 +++++++++++++++++++++++---
> drivers/mfd/88pm80x.c | 32 ++++++++++++++++++++++++++++++++
> include/linux/mfd/88pm80x.h | 3 +++
> 4 files changed, 81 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c
> index 3fcc8dd..20b67d7 100644
> --- a/drivers/mfd/88pm800.c
> +++ b/drivers/mfd/88pm800.c
> @@ -506,6 +506,22 @@ static int __devinit pm800_probe(struct i2c_client *client,
> struct pm80x_chip *chip;
> struct pm80x_platform_data *pdata = client->dev.platform_data;
> struct pm80x_subchip *subchip;
> + struct device_node *node = client->dev.of_node;
> +
> + if (node && !pdata) {
> + /* parse DT to get platform data */
> + pdata = devm_kzalloc(&client->dev,
> + sizeof(struct pm80x_platform_data),
> + GFP_KERNEL);
> + if (!pdata)
> + return -ENOMEM;
> + ret = pm80x_dt_init(node, &client->dev, pdata);
> + if (ret)
> + return -EINVAL;
> + } else if (!pdata) {
> + pr_info("No platform data in %s!\n", __func__);
> + return -EINVAL;
> + }
>
> ret = pm80x_init(client, id);
> if (ret) {
> @@ -540,9 +556,6 @@ static int __devinit pm800_probe(struct i2c_client *client,
> goto err_800_init;
> }
>
> - if (pdata->plat_config)
> - pdata->plat_config(chip, pdata);
> -
> return 0;
>
> err_800_init:
> @@ -570,11 +583,18 @@ static int __devexit pm800_remove(struct i2c_client *client)
> return 0;
> }
>
> +static const struct of_device_id pm800_dt_ids[] = {
> + { .compatible = "marvell,88pm800", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, pm800_dt_ids);
> +
> static struct i2c_driver pm800_driver = {
> .driver = {
> .name = "88PM800",
> .owner = THIS_MODULE,
> .pm = &pm80x_pm_ops,
> + .of_match_table = of_match_ptr(pm800_dt_ids),
> },
> .probe = pm800_probe,
> .remove = __devexit_p(pm800_remove),
> diff --git a/drivers/mfd/88pm805.c b/drivers/mfd/88pm805.c
> index 39a91bd..b0fb3ff 100644
> --- a/drivers/mfd/88pm805.c
> +++ b/drivers/mfd/88pm805.c
> @@ -239,6 +239,22 @@ static int __devinit pm805_probe(struct i2c_client *client,
> int ret = 0;
> struct pm80x_chip *chip;
> struct pm80x_platform_data *pdata = client->dev.platform_data;
> + struct device_node *node = client->dev.of_node;
> +
> + if (node && !pdata) {
> + /* parse DT to get platform data */
> + pdata = devm_kzalloc(&client->dev,
> + sizeof(struct pm80x_platform_data),
> + GFP_KERNEL);
> + if (!pdata)
> + return -ENOMEM;
> + ret = pm80x_dt_init(node, &client->dev, pdata);
> + if (ret)
> + return -EINVAL;
> + } else if (!pdata) {
> + pr_info("No platform data in %s!\n", __func__);
> + return -EINVAL;
> + }
>
> ret = pm80x_init(client, id);
> if (ret) {
> @@ -254,9 +270,6 @@ static int __devinit pm805_probe(struct i2c_client *client,
> goto err_805_init;
> }
>
> - if (pdata->plat_config)
> - pdata->plat_config(chip, pdata);
> -
> return 0;
>
> err_805_init:
> @@ -277,11 +290,18 @@ static int __devexit pm805_remove(struct i2c_client *client)
> return 0;
> }
>
> +static const struct of_device_id pm805_dt_ids[] = {
> + { .compatible = "marvell,88pm805", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, pm805_dt_ids);
> +
> static struct i2c_driver pm805_driver = {
> .driver = {
> .name = "88PM805",
> .owner = THIS_MODULE,
> .pm = &pm80x_pm_ops,
> + .of_match_table = of_match_ptr(pm805_dt_ids),
> },
> .probe = pm805_probe,
> .remove = __devexit_p(pm805_remove),
> diff --git a/drivers/mfd/88pm80x.c b/drivers/mfd/88pm80x.c
> index 1adb355..bd59202 100644
> --- a/drivers/mfd/88pm80x.c
> +++ b/drivers/mfd/88pm80x.c
> @@ -111,6 +111,38 @@ int pm80x_deinit(struct i2c_client *client)
> }
> EXPORT_SYMBOL_GPL(pm80x_deinit);
>
> +int pm80x_dt_init(struct device_node *np,
> + struct device *dev,
> + struct pm80x_platform_data *pdata)
> +{
> + int ret;
> + ret = of_property_read_u32(np, "marvell,88pm80x-irqmode",
> + &pdata->irq_mode);
> + if (ret) {
> + dev_err(dev, "Not found \"marvell,88pm80x-irqmode\" "
> + "property\n");
> + return -EINVAL;
> + }
> +
> + ret = of_property_read_u32(np, "marvell,88pm80x-poweraddr",
> + (u32*)(&pdata->power_page_addr));
> + if (ret) {
> + dev_err(dev, "Not found \"marvell,88pm80x-poweraddr\" "
> + "property\n");
> + return -EINVAL;
> + }
> +
> + ret = of_property_read_u32(np, "marvell,88pm80x-gpadcaddr",
> + (u32*)(&pdata->gpadc_page_addr));
> + if (ret) {
> + dev_err(dev, "Not found \"marvell,88pm80x-gpadcaddr\" "
> + "property\n");
> + return -EINVAL;
> + }
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(pm80x_dt_init);
> +
> #ifdef CONFIG_PM_SLEEP
> static int pm80x_suspend(struct device *dev)
> {
> diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h
> index 904efb9..153f492 100644
> --- a/include/linux/mfd/88pm80x.h
> +++ b/include/linux/mfd/88pm80x.h
> @@ -367,4 +367,7 @@ static inline int pm80x_dev_resume(struct device *dev)
> extern int pm80x_init(struct i2c_client *client,
> const struct i2c_device_id *id) __devinit;
> extern int pm80x_deinit(struct i2c_client *client);
> +extern int pm80x_dt_init(struct device_node *np,
> + struct device *dev,
> + struct pm80x_platform_data *pdata);
> #endif /* __LINUX_MFD_88PM80X_H */
> --
> 1.7.0.4
>
Document?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists