* [PATCH v2] drivers: Update drv260x driver @ 2016-12-09 21:45 Jingkui Wang 2016-12-11 7:22 ` Dmitry Torokhov 0 siblings, 1 reply; 3+ messages in thread From: Jingkui Wang @ 2016-12-09 21:45 UTC (permalink / raw) To: linux-input; +Cc: dmitry.torokhov, Dan Murphy, Jingkui Wang, linux-kernel Update driver drv260x to use generic device properties Remove platform data and corresponding header file Signed-off-by: Jingkui Wang <jkwang@google.com> --- Changes in v2: - Delete unused header file drivers/input/misc/drv260x.c | 43 ++++++----------------------- include/linux/platform_data/drv260x-pdata.h | 28 ------------------- 2 files changed, 8 insertions(+), 63 deletions(-) delete mode 100644 include/linux/platform_data/drv260x-pdata.h diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c index 2adfd86c..4f448ba 100644 --- a/drivers/input/misc/drv260x.c +++ b/drivers/input/misc/drv260x.c @@ -19,7 +19,6 @@ #include <linux/input.h> #include <linux/module.h> #include <linux/of_gpio.h> -#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/delay.h> @@ -27,7 +26,6 @@ #include <linux/regulator/consumer.h> #include <dt-bindings/input/ti-drv260x.h> -#include <linux/platform_data/drv260x-pdata.h> #define DRV260X_STATUS 0x0 #define DRV260X_MODE 0x1 @@ -468,52 +466,39 @@ static const struct regmap_config drv260x_regmap_config = { .cache_type = REGCACHE_NONE, }; -#ifdef CONFIG_OF -static int drv260x_parse_dt(struct device *dev, +static int drv260x_read_device_property(struct device *dev, struct drv260x_data *haptics) { - struct device_node *np = dev->of_node; unsigned int voltage; int error; - error = of_property_read_u32(np, "mode", &haptics->mode); + error = device_property_read_u32(dev, "mode", &haptics->mode); if (error) { dev_err(dev, "%s: No entry for mode\n", __func__); return error; } - error = of_property_read_u32(np, "library-sel", &haptics->library); + error = device_property_read_u32(dev, "library-sel", &haptics->library); if (error) { dev_err(dev, "%s: No entry for library selection\n", __func__); return error; } - error = of_property_read_u32(np, "vib-rated-mv", &voltage); + error = device_property_read_u32(dev, "vib-rated-mv", &voltage); if (!error) haptics->rated_voltage = drv260x_calculate_voltage(voltage); - - error = of_property_read_u32(np, "vib-overdrive-mv", &voltage); + error = device_property_read_u32(dev, "vib-overdrive-mv", &voltage); if (!error) haptics->overdrive_voltage = drv260x_calculate_voltage(voltage); return 0; } -#else -static inline int drv260x_parse_dt(struct device *dev, - struct drv260x_data *haptics) -{ - dev_err(dev, "no platform data defined\n"); - - return -EINVAL; -} -#endif static int drv260x_probe(struct i2c_client *client, const struct i2c_device_id *id) { - const struct drv260x_platform_data *pdata = dev_get_platdata(&client->dev); struct drv260x_data *haptics; int error; @@ -524,21 +509,9 @@ static int drv260x_probe(struct i2c_client *client, haptics->rated_voltage = DRV260X_DEF_OD_CLAMP_VOLT; haptics->rated_voltage = DRV260X_DEF_RATED_VOLT; - if (pdata) { - haptics->mode = pdata->mode; - haptics->library = pdata->library_selection; - if (pdata->vib_overdrive_voltage) - haptics->overdrive_voltage = drv260x_calculate_voltage(pdata->vib_overdrive_voltage); - if (pdata->vib_rated_voltage) - haptics->rated_voltage = drv260x_calculate_voltage(pdata->vib_rated_voltage); - } else if (client->dev.of_node) { - error = drv260x_parse_dt(&client->dev, haptics); - if (error) - return error; - } else { - dev_err(&client->dev, "Platform data not set\n"); - return -ENODEV; - } + error = drv260x_read_device_property(&client->dev, haptics); + if (error) + return error; if (haptics->mode < DRV260X_LRA_MODE || diff --git a/include/linux/platform_data/drv260x-pdata.h b/include/linux/platform_data/drv260x-pdata.h deleted file mode 100644 index 0a03b09..0000000 --- a/include/linux/platform_data/drv260x-pdata.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Platform data for DRV260X haptics driver family - * - * Author: Dan Murphy <dmurphy@ti.com> - * - * Copyright: (C) 2014 Texas Instruments, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - */ - -#ifndef _LINUX_DRV260X_PDATA_H -#define _LINUX_DRV260X_PDATA_H - -struct drv260x_platform_data { - u32 library_selection; - u32 mode; - u32 vib_rated_voltage; - u32 vib_overdrive_voltage; -}; - -#endif -- 2.6.6 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drivers: Update drv260x driver 2016-12-09 21:45 [PATCH v2] drivers: Update drv260x driver Jingkui Wang @ 2016-12-11 7:22 ` Dmitry Torokhov [not found] ` <CACMZmvUfkt3Fv4Lr42-mnbzYsUdAuC98XUzz2kg4c9bRLX2rJA@mail.gmail.com> 0 siblings, 1 reply; 3+ messages in thread From: Dmitry Torokhov @ 2016-12-11 7:22 UTC (permalink / raw) To: Jingkui Wang; +Cc: linux-input, Dan Murphy, linux-kernel [-- Attachment #1: Type: text/plain, Size: 7125 bytes --] Hi Jingkui, On Fri, Dec 09, 2016 at 01:45:26PM -0800, Jingkui Wang wrote: > Update driver drv260x to use generic device properties > Remove platform data and corresponding header file Please next time come up with more descriptive subject than "drivers: Update drv260x driver": when scanning commit messages person shoudl be able to gauge whether the change is interesting or not. > -static int drv260x_parse_dt(struct device *dev, > +static int drv260x_read_device_property(struct device *dev, > struct drv260x_data *haptics) > { > - struct device_node *np = dev->of_node; > unsigned int voltage; > int error; > > - error = of_property_read_u32(np, "mode", &haptics->mode); > + error = device_property_read_u32(dev, "mode", &haptics->mode); > if (error) { > dev_err(dev, "%s: No entry for mode\n", __func__); > return error; > } > > - error = of_property_read_u32(np, "library-sel", &haptics->library); > + error = device_property_read_u32(dev, "library-sel", &haptics->library); > if (error) { > dev_err(dev, "%s: No entry for library selection\n", > __func__); > return error; > } Now that platform code is gone there it makes no sense separating reading properties from validating the settings. Does the following version look OK to you (it needs a patch introducing temporary in probe() function, you'll find it attached)? Thanks. -- Dmitry Input: drv260x - use generic device properties From: Jingkui Wang <jkwang@google.com> Update driver drv260x to use generic device properties so that it can be used on non-DT systems. We also remove platform data as generic device properties work on static board code as well. Signed-off-by: Jingkui Wang <jkwang@google.com> Patchwork-Id: 9469075 Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/misc/drv260x.c | 80 ++++++--------------------- include/linux/platform_data/drv260x-pdata.h | 28 --------- 2 files changed, 19 insertions(+), 89 deletions(-) delete mode 100644 include/linux/platform_data/drv260x-pdata.h diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c index 18c266c..11664d7 100644 --- a/drivers/input/misc/drv260x.c +++ b/drivers/input/misc/drv260x.c @@ -18,8 +18,6 @@ #include <linux/i2c.h> #include <linux/input.h> #include <linux/module.h> -#include <linux/of_gpio.h> -#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/slab.h> #include <linux/delay.h> @@ -27,7 +25,6 @@ #include <linux/regulator/consumer.h> #include <dt-bindings/input/ti-drv260x.h> -#include <linux/platform_data/drv260x-pdata.h> #define DRV260X_STATUS 0x0 #define DRV260X_MODE 0x1 @@ -468,54 +465,12 @@ static const struct regmap_config drv260x_regmap_config = { .cache_type = REGCACHE_NONE, }; -#ifdef CONFIG_OF -static int drv260x_parse_dt(struct device *dev, - struct drv260x_data *haptics) -{ - struct device_node *np = dev->of_node; - unsigned int voltage; - int error; - - error = of_property_read_u32(np, "mode", &haptics->mode); - if (error) { - dev_err(dev, "%s: No entry for mode\n", __func__); - return error; - } - - error = of_property_read_u32(np, "library-sel", &haptics->library); - if (error) { - dev_err(dev, "%s: No entry for library selection\n", - __func__); - return error; - } - - error = of_property_read_u32(np, "vib-rated-mv", &voltage); - if (!error) - haptics->rated_voltage = drv260x_calculate_voltage(voltage); - - - error = of_property_read_u32(np, "vib-overdrive-mv", &voltage); - if (!error) - haptics->overdrive_voltage = drv260x_calculate_voltage(voltage); - - return 0; -} -#else -static inline int drv260x_parse_dt(struct device *dev, - struct drv260x_data *haptics) -{ - dev_err(dev, "no platform data defined\n"); - - return -EINVAL; -} -#endif - static int drv260x_probe(struct i2c_client *client, const struct i2c_device_id *id) { - const struct drv260x_platform_data *pdata = dev_get_platdata(&client->dev); struct device *dev = &client->dev; struct drv260x_data *haptics; + u32 voltage; int error; haptics = devm_kzalloc(dev, sizeof(*haptics), GFP_KERNEL); @@ -525,29 +480,24 @@ static int drv260x_probe(struct i2c_client *client, haptics->overdrive_voltage = DRV260X_DEF_OD_CLAMP_VOLT; haptics->rated_voltage = DRV260X_DEF_RATED_VOLT; - if (pdata) { - haptics->mode = pdata->mode; - haptics->library = pdata->library_selection; - if (pdata->vib_overdrive_voltage) - haptics->overdrive_voltage = drv260x_calculate_voltage(pdata->vib_overdrive_voltage); - if (pdata->vib_rated_voltage) - haptics->rated_voltage = drv260x_calculate_voltage(pdata->vib_rated_voltage); - } else if (client->dev.of_node) { - error = drv260x_parse_dt(&client->dev, haptics); - if (error) - return error; - } else { - dev_err(dev, "Platform data not set\n"); - return -ENODEV; + error = device_property_read_u32(dev, "mode", &haptics->mode); + if (error) { + dev_err(dev, "Can't fetch 'mode' property: %d\n", error); + return error; } - if (haptics->mode < DRV260X_LRA_MODE || haptics->mode > DRV260X_ERM_MODE) { dev_err(dev, "Vibrator mode is invalid: %i\n", haptics->mode); return -EINVAL; } + error = device_property_read_u32(dev, "library-sel", &haptics->library); + if (error) { + dev_err(dev, "Can't fetch 'library-sel' property: %d\n", error); + return error; + } + if (haptics->library < DRV260X_LIB_EMPTY || haptics->library > DRV260X_ERM_LIB_F) { dev_err(dev, @@ -569,6 +519,14 @@ static int drv260x_probe(struct i2c_client *client, return -EINVAL; } + error = device_property_read_u32(dev, "vib-rated-mv", &voltage); + haptics->rated_voltage = error ? DRV260X_DEF_RATED_VOLT : + drv260x_calculate_voltage(voltage); + + error = device_property_read_u32(dev, "vib-overdrive-mv", &voltage); + haptics->overdrive_voltage = error ? DRV260X_DEF_OD_CLAMP_VOLT : + drv260x_calculate_voltage(voltage); + haptics->regulator = devm_regulator_get(dev, "vbat"); if (IS_ERR(haptics->regulator)) { error = PTR_ERR(haptics->regulator); diff --git a/include/linux/platform_data/drv260x-pdata.h b/include/linux/platform_data/drv260x-pdata.h deleted file mode 100644 index 0a03b09..0000000 --- a/include/linux/platform_data/drv260x-pdata.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Platform data for DRV260X haptics driver family - * - * Author: Dan Murphy <dmurphy@ti.com> - * - * Copyright: (C) 2014 Texas Instruments, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - */ - -#ifndef _LINUX_DRV260X_PDATA_H -#define _LINUX_DRV260X_PDATA_H - -struct drv260x_platform_data { - u32 library_selection; - u32 mode; - u32 vib_rated_voltage; - u32 vib_overdrive_voltage; -}; - -#endif [-- Attachment #2: drv260x-use-temp-dev.patch --] [-- Type: text/x-diff, Size: 4665 bytes --] Input: drv260x - use temporary for &client->dev From: Dmitry Torokhov <dmitry.torokhov@gmail.com> Let's introduce a temporary for "client->dev" is probe() as we use it quite a few times and "dev" is shorter. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/misc/drv260x.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c index 9789d4f..18c266c 100644 --- a/drivers/input/misc/drv260x.c +++ b/drivers/input/misc/drv260x.c @@ -514,10 +514,11 @@ static int drv260x_probe(struct i2c_client *client, const struct i2c_device_id *id) { const struct drv260x_platform_data *pdata = dev_get_platdata(&client->dev); + struct device *dev = &client->dev; struct drv260x_data *haptics; int error; - haptics = devm_kzalloc(&client->dev, sizeof(*haptics), GFP_KERNEL); + haptics = devm_kzalloc(dev, sizeof(*haptics), GFP_KERNEL); if (!haptics) return -ENOMEM; @@ -536,22 +537,20 @@ static int drv260x_probe(struct i2c_client *client, if (error) return error; } else { - dev_err(&client->dev, "Platform data not set\n"); + dev_err(dev, "Platform data not set\n"); return -ENODEV; } if (haptics->mode < DRV260X_LRA_MODE || haptics->mode > DRV260X_ERM_MODE) { - dev_err(&client->dev, - "Vibrator mode is invalid: %i\n", - haptics->mode); + dev_err(dev, "Vibrator mode is invalid: %i\n", haptics->mode); return -EINVAL; } if (haptics->library < DRV260X_LIB_EMPTY || haptics->library > DRV260X_ERM_LIB_F) { - dev_err(&client->dev, + dev_err(dev, "Library value is invalid: %i\n", haptics->library); return -EINVAL; } @@ -559,40 +558,37 @@ static int drv260x_probe(struct i2c_client *client, if (haptics->mode == DRV260X_LRA_MODE && haptics->library != DRV260X_LIB_EMPTY && haptics->library != DRV260X_LIB_LRA) { - dev_err(&client->dev, - "LRA Mode with ERM Library mismatch\n"); + dev_err(dev, "LRA Mode with ERM Library mismatch\n"); return -EINVAL; } if (haptics->mode == DRV260X_ERM_MODE && (haptics->library == DRV260X_LIB_EMPTY || haptics->library == DRV260X_LIB_LRA)) { - dev_err(&client->dev, - "ERM Mode with LRA Library mismatch\n"); + dev_err(dev, "ERM Mode with LRA Library mismatch\n"); return -EINVAL; } - haptics->regulator = devm_regulator_get(&client->dev, "vbat"); + haptics->regulator = devm_regulator_get(dev, "vbat"); if (IS_ERR(haptics->regulator)) { error = PTR_ERR(haptics->regulator); - dev_err(&client->dev, - "unable to get regulator, error: %d\n", error); + dev_err(dev, "unable to get regulator, error: %d\n", error); return error; } - haptics->enable_gpio = devm_gpiod_get_optional(&client->dev, "enable", + haptics->enable_gpio = devm_gpiod_get_optional(dev, "enable", GPIOD_OUT_HIGH); if (IS_ERR(haptics->enable_gpio)) return PTR_ERR(haptics->enable_gpio); - haptics->input_dev = devm_input_allocate_device(&client->dev); + haptics->input_dev = devm_input_allocate_device(dev); if (!haptics->input_dev) { dev_err(&client->dev, "Failed to allocate input device\n"); return -ENOMEM; } haptics->input_dev->name = "drv260x:haptics"; - haptics->input_dev->dev.parent = client->dev.parent; + haptics->input_dev->dev.parent = dev->parent; haptics->input_dev->close = drv260x_close; input_set_drvdata(haptics->input_dev, haptics); input_set_capability(haptics->input_dev, EV_FF, FF_RUMBLE); @@ -600,8 +596,7 @@ static int drv260x_probe(struct i2c_client *client, error = input_ff_create_memless(haptics->input_dev, NULL, drv260x_haptics_play); if (error) { - dev_err(&client->dev, "input_ff_create() failed: %d\n", - error); + dev_err(dev, "input_ff_create() failed: %d\n", error); return error; } @@ -613,21 +608,19 @@ static int drv260x_probe(struct i2c_client *client, haptics->regmap = devm_regmap_init_i2c(client, &drv260x_regmap_config); if (IS_ERR(haptics->regmap)) { error = PTR_ERR(haptics->regmap); - dev_err(&client->dev, "Failed to allocate register map: %d\n", - error); + dev_err(dev, "Failed to allocate register map: %d\n", error); return error; } error = drv260x_init(haptics); if (error) { - dev_err(&client->dev, "Device init failed: %d\n", error); + dev_err(dev, "Device init failed: %d\n", error); return error; } error = input_register_device(haptics->input_dev); if (error) { - dev_err(&client->dev, "couldn't register input device: %d\n", - error); + dev_err(dev, "couldn't register input device: %d\n", error); return error; } ^ permalink raw reply related [flat|nested] 3+ messages in thread
[parent not found: <CACMZmvUfkt3Fv4Lr42-mnbzYsUdAuC98XUzz2kg4c9bRLX2rJA@mail.gmail.com>]
* Re: [PATCH v2] drivers: Update drv260x driver [not found] ` <CACMZmvUfkt3Fv4Lr42-mnbzYsUdAuC98XUzz2kg4c9bRLX2rJA@mail.gmail.com> @ 2016-12-12 19:05 ` Jingkui Wang 0 siblings, 0 replies; 3+ messages in thread From: Jingkui Wang @ 2016-12-12 19:05 UTC (permalink / raw) To: Dmitry Torokhov; +Cc: linux-input, Dan Murphy, linux-kernel Opps, sorry for containing html. Thanks again. Jingkui On Mon, Dec 12, 2016 at 11:02 AM, Jingkui Wang <jkwang@google.com> wrote: > It looks great! Really appreciate your help. > > Thanks, > Jingkui Wang > > On Sat, Dec 10, 2016 at 11:22 PM, Dmitry Torokhov > <dmitry.torokhov@gmail.com> wrote: >> >> Hi Jingkui, >> >> On Fri, Dec 09, 2016 at 01:45:26PM -0800, Jingkui Wang wrote: >> > Update driver drv260x to use generic device properties >> > Remove platform data and corresponding header file >> >> Please next time come up with more descriptive subject than "drivers: >> Update drv260x driver": when scanning commit messages person shoudl be >> able to gauge whether the change is interesting or not. >> >> > -static int drv260x_parse_dt(struct device *dev, >> > +static int drv260x_read_device_property(struct device *dev, >> > struct drv260x_data *haptics) >> > { >> > - struct device_node *np = dev->of_node; >> > unsigned int voltage; >> > int error; >> > >> > - error = of_property_read_u32(np, "mode", &haptics->mode); >> > + error = device_property_read_u32(dev, "mode", &haptics->mode); >> > if (error) { >> > dev_err(dev, "%s: No entry for mode\n", __func__); >> > return error; >> > } >> > >> > - error = of_property_read_u32(np, "library-sel", >> > &haptics->library); >> > + error = device_property_read_u32(dev, "library-sel", >> > &haptics->library); >> > if (error) { >> > dev_err(dev, "%s: No entry for library selection\n", >> > __func__); >> > return error; >> > } >> >> Now that platform code is gone there it makes no sense separating >> reading properties from validating the settings. Does the following >> version look OK to you (it needs a patch introducing temporary in >> probe() function, you'll find it attached)? >> >> Thanks. >> >> -- >> Dmitry >> >> >> Input: drv260x - use generic device properties >> >> From: Jingkui Wang <jkwang@google.com> >> >> Update driver drv260x to use generic device properties so that it can be >> used on non-DT systems. We also remove platform data as generic device >> properties work on static board code as well. >> >> Signed-off-by: Jingkui Wang <jkwang@google.com> >> Patchwork-Id: 9469075 >> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> >> --- >> drivers/input/misc/drv260x.c | 80 >> ++++++--------------------- >> include/linux/platform_data/drv260x-pdata.h | 28 --------- >> 2 files changed, 19 insertions(+), 89 deletions(-) >> delete mode 100644 include/linux/platform_data/drv260x-pdata.h >> >> diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c >> index 18c266c..11664d7 100644 >> --- a/drivers/input/misc/drv260x.c >> +++ b/drivers/input/misc/drv260x.c >> @@ -18,8 +18,6 @@ >> #include <linux/i2c.h> >> #include <linux/input.h> >> #include <linux/module.h> >> -#include <linux/of_gpio.h> >> -#include <linux/platform_device.h> >> #include <linux/regmap.h> >> #include <linux/slab.h> >> #include <linux/delay.h> >> @@ -27,7 +25,6 @@ >> #include <linux/regulator/consumer.h> >> >> #include <dt-bindings/input/ti-drv260x.h> >> -#include <linux/platform_data/drv260x-pdata.h> >> >> #define DRV260X_STATUS 0x0 >> #define DRV260X_MODE 0x1 >> @@ -468,54 +465,12 @@ static const struct regmap_config >> drv260x_regmap_config = { >> .cache_type = REGCACHE_NONE, >> }; >> >> -#ifdef CONFIG_OF >> -static int drv260x_parse_dt(struct device *dev, >> - struct drv260x_data *haptics) >> -{ >> - struct device_node *np = dev->of_node; >> - unsigned int voltage; >> - int error; >> - >> - error = of_property_read_u32(np, "mode", &haptics->mode); >> - if (error) { >> - dev_err(dev, "%s: No entry for mode\n", __func__); >> - return error; >> - } >> - >> - error = of_property_read_u32(np, "library-sel", >> &haptics->library); >> - if (error) { >> - dev_err(dev, "%s: No entry for library selection\n", >> - __func__); >> - return error; >> - } >> - >> - error = of_property_read_u32(np, "vib-rated-mv", &voltage); >> - if (!error) >> - haptics->rated_voltage = >> drv260x_calculate_voltage(voltage); >> - >> - >> - error = of_property_read_u32(np, "vib-overdrive-mv", &voltage); >> - if (!error) >> - haptics->overdrive_voltage = >> drv260x_calculate_voltage(voltage); >> - >> - return 0; >> -} >> -#else >> -static inline int drv260x_parse_dt(struct device *dev, >> - struct drv260x_data *haptics) >> -{ >> - dev_err(dev, "no platform data defined\n"); >> - >> - return -EINVAL; >> -} >> -#endif >> - >> static int drv260x_probe(struct i2c_client *client, >> const struct i2c_device_id *id) >> { >> - const struct drv260x_platform_data *pdata = >> dev_get_platdata(&client->dev); >> struct device *dev = &client->dev; >> struct drv260x_data *haptics; >> + u32 voltage; >> int error; >> >> haptics = devm_kzalloc(dev, sizeof(*haptics), GFP_KERNEL); >> @@ -525,29 +480,24 @@ static int drv260x_probe(struct i2c_client *client, >> haptics->overdrive_voltage = DRV260X_DEF_OD_CLAMP_VOLT; >> haptics->rated_voltage = DRV260X_DEF_RATED_VOLT; >> >> - if (pdata) { >> - haptics->mode = pdata->mode; >> - haptics->library = pdata->library_selection; >> - if (pdata->vib_overdrive_voltage) >> - haptics->overdrive_voltage = >> drv260x_calculate_voltage(pdata->vib_overdrive_voltage); >> - if (pdata->vib_rated_voltage) >> - haptics->rated_voltage = >> drv260x_calculate_voltage(pdata->vib_rated_voltage); >> - } else if (client->dev.of_node) { >> - error = drv260x_parse_dt(&client->dev, haptics); >> - if (error) >> - return error; >> - } else { >> - dev_err(dev, "Platform data not set\n"); >> - return -ENODEV; >> + error = device_property_read_u32(dev, "mode", &haptics->mode); >> + if (error) { >> + dev_err(dev, "Can't fetch 'mode' property: %d\n", error); >> + return error; >> } >> >> - >> if (haptics->mode < DRV260X_LRA_MODE || >> haptics->mode > DRV260X_ERM_MODE) { >> dev_err(dev, "Vibrator mode is invalid: %i\n", >> haptics->mode); >> return -EINVAL; >> } >> >> + error = device_property_read_u32(dev, "library-sel", >> &haptics->library); >> + if (error) { >> + dev_err(dev, "Can't fetch 'library-sel' property: %d\n", >> error); >> + return error; >> + } >> + >> if (haptics->library < DRV260X_LIB_EMPTY || >> haptics->library > DRV260X_ERM_LIB_F) { >> dev_err(dev, >> @@ -569,6 +519,14 @@ static int drv260x_probe(struct i2c_client *client, >> return -EINVAL; >> } >> >> + error = device_property_read_u32(dev, "vib-rated-mv", &voltage); >> + haptics->rated_voltage = error ? DRV260X_DEF_RATED_VOLT : >> + >> drv260x_calculate_voltage(voltage); >> + >> + error = device_property_read_u32(dev, "vib-overdrive-mv", >> &voltage); >> + haptics->overdrive_voltage = error ? DRV260X_DEF_OD_CLAMP_VOLT : >> + >> drv260x_calculate_voltage(voltage); >> + >> haptics->regulator = devm_regulator_get(dev, "vbat"); >> if (IS_ERR(haptics->regulator)) { >> error = PTR_ERR(haptics->regulator); >> diff --git a/include/linux/platform_data/drv260x-pdata.h >> b/include/linux/platform_data/drv260x-pdata.h >> deleted file mode 100644 >> index 0a03b09..0000000 >> --- a/include/linux/platform_data/drv260x-pdata.h >> +++ /dev/null >> @@ -1,28 +0,0 @@ >> -/* >> - * Platform data for DRV260X haptics driver family >> - * >> - * Author: Dan Murphy <dmurphy@ti.com> >> - * >> - * Copyright: (C) 2014 Texas Instruments, Inc. >> - * >> - * This program is free software; you can redistribute it and/or modify >> - * it under the terms of the GNU General Public License version 2 as >> - * published by the Free Software Foundation. >> - * >> - * This program is distributed in the hope that it will be useful, but >> - * WITHOUT ANY WARRANTY; without even the implied warranty of >> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> - * General Public License for more details. >> - */ >> - >> -#ifndef _LINUX_DRV260X_PDATA_H >> -#define _LINUX_DRV260X_PDATA_H >> - >> -struct drv260x_platform_data { >> - u32 library_selection; >> - u32 mode; >> - u32 vib_rated_voltage; >> - u32 vib_overdrive_voltage; >> -}; >> - >> -#endif > > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-12 19:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-09 21:45 [PATCH v2] drivers: Update drv260x driver Jingkui Wang
2016-12-11 7:22 ` Dmitry Torokhov
[not found] ` <CACMZmvUfkt3Fv4Lr42-mnbzYsUdAuC98XUzz2kg4c9bRLX2rJA@mail.gmail.com>
2016-12-12 19:05 ` Jingkui Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).