* [PATCH v2 0/2] Add regulator-haptic driver @ 2014-11-24 14:50 Jaewon Kim 2014-11-24 14:50 ` [PATCH v2 1/2] Input: add regulator haptic driver Jaewon Kim 2014-11-24 14:50 ` [PATCH v2 2/2] ARM: dts: Add regulator-haptic device node for exynos3250-rinato Jaewon Kim 0 siblings, 2 replies; 6+ messages in thread From: Jaewon Kim @ 2014-11-24 14:50 UTC (permalink / raw) To: Kukjin Kim, Dmitry Torokhov, Pankaj Dubey, Dan Murphy, Chanwoo Choi, Hyunhee Kim Cc: linux-kernel, linux-input, linux-samsung-soc, Jaewon Kim This patch series adds regulator-haptic driver. The regulator-haptic has haptic motor and it is controlled by voltage of regulator via force feedback framework. Changes in v2: - remove driver owner - merge enable/disable function - support platform data - fix wrong suspends_state check in regulator_haptic_resume() Jaewon Kim (2): Input: add regulator haptic driver ARM: dts: Add regulator-haptic device node for exynos3250-rinato .../devicetree/bindings/input/regulator-haptic.txt | 24 ++ arch/arm/boot/dts/exynos3250-rinato.dts | 7 + drivers/input/misc/Kconfig | 11 + drivers/input/misc/Makefile | 1 + drivers/input/misc/regulator-haptic.c | 247 ++++++++++++++++++++ include/linux/input/regulator-haptic.h | 30 +++ 6 files changed, 320 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt create mode 100644 drivers/input/misc/regulator-haptic.c create mode 100644 include/linux/input/regulator-haptic.h -- 1.7.9.5 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/2] Input: add regulator haptic driver 2014-11-24 14:50 [PATCH v2 0/2] Add regulator-haptic driver Jaewon Kim @ 2014-11-24 14:50 ` Jaewon Kim 2014-11-25 1:04 ` Chanwoo Choi 2014-11-26 5:31 ` Pankaj Dubey 2014-11-24 14:50 ` [PATCH v2 2/2] ARM: dts: Add regulator-haptic device node for exynos3250-rinato Jaewon Kim 1 sibling, 2 replies; 6+ messages in thread From: Jaewon Kim @ 2014-11-24 14:50 UTC (permalink / raw) To: Kukjin Kim, Dmitry Torokhov, Pankaj Dubey, Dan Murphy, Chanwoo Choi, Hyunhee Kim Cc: linux-kernel, linux-input, linux-samsung-soc, Jaewon Kim This patch adds support for haptic driver controlled by voltage of regulator. And this driver support for Force Feedback interface from input framework Signed-off-by: Jaewon Kim <jaewon02.kim@samsung.com> Signed-off-by: Hyunhee Kim <hyunhee.kim@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> --- .../devicetree/bindings/input/regulator-haptic.txt | 24 ++ drivers/input/misc/Kconfig | 11 + drivers/input/misc/Makefile | 1 + drivers/input/misc/regulator-haptic.c | 247 ++++++++++++++++++++ include/linux/input/regulator-haptic.h | 30 +++ 5 files changed, 313 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt create mode 100644 drivers/input/misc/regulator-haptic.c create mode 100644 include/linux/input/regulator-haptic.h diff --git a/Documentation/devicetree/bindings/input/regulator-haptic.txt b/Documentation/devicetree/bindings/input/regulator-haptic.txt new file mode 100644 index 0000000..5a44e8f --- /dev/null +++ b/Documentation/devicetree/bindings/input/regulator-haptic.txt @@ -0,0 +1,24 @@ +* Requlator Haptic Device Tree Bindings + +The regulator haptic driver controlled by voltage of regulator. +This driver implemented via Force Feedback interface. + +Required Properties: + - compatible : Should be "regulator-haptic" + - haptic-supply : Power supply to the haptic motor. + [*] refer Documentation/devicetree/bindings/regulator/regulator.txt + + - max-microvolt : The maximum voltage value supplied to the haptic motor. + [The unit of the voltage is a micro] + + - min-microvolt : The minimum voltage value supplied to the haptic motor. + [The unit of the voltage is a micro] + +Example: + + haptics { + compatible = "regulator-haptic"; + haptic-supply = <&motor_regulator>; + max-microvolt = <2700000>; + min-microvolt = <1100000>; + }; diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 23297ab..e5e556d 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -394,6 +394,17 @@ config INPUT_CM109 To compile this driver as a module, choose M here: the module will be called cm109. +config INPUT_REGULATOR_HAPTIC + tristate "regulator haptics support" + select INPUT_FF_MEMLESS + help + This option enables device driver support for the haptic controlled + by regulator. This driver supports ff-memless interface + from input framework. + + To compile this driver as a module, choose M here: the + module will be called regulator-haptic. + config INPUT_RETU_PWRBUTTON tristate "Retu Power button Driver" depends on MFD_RETU diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile index 19c7603..1f135af 100644 --- a/drivers/input/misc/Makefile +++ b/drivers/input/misc/Makefile @@ -53,6 +53,7 @@ obj-$(CONFIG_INPUT_PMIC8XXX_PWRKEY) += pmic8xxx-pwrkey.o obj-$(CONFIG_INPUT_POWERMATE) += powermate.o obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o obj-$(CONFIG_INPUT_RB532_BUTTON) += rb532_button.o +obj-$(CONFIG_INPUT_REGULATOR_HAPTIC) += regulator-haptic.o obj-$(CONFIG_INPUT_RETU_PWRBUTTON) += retu-pwrbutton.o obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o diff --git a/drivers/input/misc/regulator-haptic.c b/drivers/input/misc/regulator-haptic.c new file mode 100644 index 0000000..c61dd99 --- /dev/null +++ b/drivers/input/misc/regulator-haptic.c @@ -0,0 +1,247 @@ +/* + * Regulator haptic driver + * + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Author: Jaewon Kim <jaewon02.kim@samsung.com> + * Author: Hyunhee Kim <hyunhee.kim@samsung.com> + * + * 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. + */ + +#include <linux/input.h> +#include <linux/input/regulator-haptic.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> + +#define MAX_MAGNITUDE_SHIFT 16 + +struct regulator_haptic { + struct device *dev; + struct input_dev *input_dev; + struct regulator *regulator; + struct work_struct work; + + bool enabled; + bool suspend_state; + unsigned int max_volt; + unsigned int min_volt; + unsigned int intensity; + unsigned int magnitude; +}; + +static void regulator_haptic_enable(struct regulator_haptic *haptic, bool state) +{ + int error; + + if (haptic->enabled == state) + return; + + if (state) + error = regulator_enable(haptic->regulator); + else + error = regulator_disable(haptic->regulator); + if (error) { + dev_err(haptic->dev, "cannot enable regulator\n"); + return; + } + + haptic->enabled = state; +} + +static void regulator_haptic_work(struct work_struct *work) +{ + struct regulator_haptic *haptic = container_of(work, + struct regulator_haptic, work); + int error; + + error = regulator_set_voltage(haptic->regulator, + haptic->intensity + haptic->min_volt, haptic->max_volt); + if (error) { + dev_err(haptic->dev, "cannot set regulator voltage\n"); + return; + } + + if (haptic->magnitude) + regulator_haptic_enable(haptic, true); + else + regulator_haptic_enable(haptic, false); +} + +static int regulator_haptic_play_effect(struct input_dev *input, void *data, + struct ff_effect *effect) +{ + struct regulator_haptic *haptic = input_get_drvdata(input); + u64 volt_mag_multi; + + haptic->magnitude = effect->u.rumble.strong_magnitude; + if (!haptic->magnitude) + haptic->magnitude = effect->u.rumble.weak_magnitude; + + + volt_mag_multi = (u64)(haptic->max_volt - haptic->min_volt) * + haptic->magnitude; + haptic->intensity = (unsigned int)(volt_mag_multi >> + MAX_MAGNITUDE_SHIFT); + + schedule_work(&haptic->work); + + return 0; +} + +static void regulator_haptic_close(struct input_dev *input) +{ + struct regulator_haptic *haptic = input_get_drvdata(input); + + cancel_work_sync(&haptic->work); + regulator_haptic_enable(haptic, false); +} + +#ifdef CONFIG_OF +static int regulator_haptic_parse_dt(struct regulator_haptic *haptic) +{ + struct device_node *node = haptic->dev->of_node; + int error; + + error = of_property_read_u32(node, "max-microvolt", &haptic->max_volt); + if (error) { + dev_err(haptic->dev, "cannot parse max-microvolt\n"); + return error; + } + + error = of_property_read_u32(node, "min-microvolt", &haptic->min_volt); + if (error) { + dev_err(haptic->dev, "cannot parse min-microvolt\n"); + return error; + } + + return 0; +} +#else +static int regulator_haptic_parse_dt(struct regulator_haptic *haptic) +{ + return 0; +} +#endif /* CONFIG_OF */ + +static int regulator_haptic_probe(struct platform_device *pdev) +{ + struct regulator_haptic *haptic; + struct regulator_haptic_data *data; + struct input_dev *input_dev; + int error; + + haptic = devm_kzalloc(&pdev->dev, sizeof(*haptic), GFP_KERNEL); + if (!haptic) + return -ENOMEM; + + haptic->dev = &pdev->dev; + haptic->enabled = false; + haptic->suspend_state = false; + INIT_WORK(&haptic->work, regulator_haptic_work); + + if (pdev->dev.of_node) { + error = regulator_haptic_parse_dt(haptic); + if (error) { + dev_err(&pdev->dev, "failed to parse device tree\n"); + return error; + } + } else { + data = dev_get_platdata(&pdev->dev); + if (data) { + dev_err(&pdev->dev, "failed to get platdata\n"); + return -EINVAL; + } + + haptic->regulator = data->regulator; + haptic->max_volt = data->max_volt; + haptic->min_volt = data->min_volt; + } + + haptic->regulator = devm_regulator_get(&pdev->dev, "haptic"); + if (IS_ERR(haptic->regulator)) { + dev_err(&pdev->dev, "failed to get regulator\n"); + return PTR_ERR(haptic->regulator); + } + + input_dev = devm_input_allocate_device(&pdev->dev); + if (!input_dev) + return -ENOMEM; + + haptic->input_dev = input_dev; + haptic->input_dev->name = "regulator-haptic"; + haptic->input_dev->dev.parent = &pdev->dev; + haptic->input_dev->close = regulator_haptic_close; + input_set_drvdata(haptic->input_dev, haptic); + input_set_capability(haptic->input_dev, EV_FF, FF_RUMBLE); + + error = input_ff_create_memless(input_dev, NULL, + regulator_haptic_play_effect); + if (error) { + dev_err(&pdev->dev, "failed to create force-feedback\n"); + return error; + } + + error = input_register_device(haptic->input_dev); + if (error) { + dev_err(&pdev->dev, "failed to register input device\n"); + return error; + } + + platform_set_drvdata(pdev, haptic); + + return 0; +} + +static int __maybe_unused regulator_haptic_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct regulator_haptic *haptic = platform_get_drvdata(pdev); + + if (haptic->enabled) { + regulator_haptic_enable(haptic, false); + haptic->suspend_state = true; + } + + return 0; +} + +static int __maybe_unused regulator_haptic_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct regulator_haptic *haptic = platform_get_drvdata(pdev); + + if (haptic->suspend_state) { + regulator_haptic_enable(haptic, true); + haptic->suspend_state = false; + } + + return 0; +} + +static SIMPLE_DEV_PM_OPS(regulator_haptic_pm_ops, + regulator_haptic_suspend, regulator_haptic_resume); + +static struct of_device_id regulator_haptic_dt_match[] = { + { .compatible = "regulator-haptic" }, + {}, +}; + +static struct platform_driver regulator_haptic_driver = { + .probe = regulator_haptic_probe, + .driver = { + .name = "regulator-haptic", + .of_match_table = regulator_haptic_dt_match, + .pm = ®ulator_haptic_pm_ops, + }, +}; +module_platform_driver(regulator_haptic_driver); + +MODULE_AUTHOR("Jaewon Kim <jaewon02.kim@samsung.com>"); +MODULE_AUTHOR("Hyunhee Kim <hyunhee.kim@samsung.com>"); +MODULE_DESCRIPTION("Regulator haptic driver"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/input/regulator-haptic.h b/include/linux/input/regulator-haptic.h new file mode 100644 index 0000000..15a629c --- /dev/null +++ b/include/linux/input/regulator-haptic.h @@ -0,0 +1,30 @@ +/* + * Regulator Haptic Platform Data + * + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Author: Jaewon Kim <jaewon02.kim@samsung.com> + * Author: Hyunhee Kim <hyunhee.kim@samsung.com> + * + * 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. + */ + +#ifndef _REGULATOR_HAPTIC_H + +/* + * struct regulator_haptic_data - Platform device data + * + * @regulator: Power supply to the haptic motor + * @max_volt: maximum voltage value supplied to the haptic motor. + * <The unit of the voltage is a micro> + * @min_volt: minimum voltage value supplied to the haptic motor. + * <The unit of the voltage is a micro> + */ +struct regulator_haptic_data { + struct regulator *regulator; + unsigned int max_volt; + unsigned int min_volt; +}; + +#endif /* _REGULATOR_HAPTIC_H */ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] Input: add regulator haptic driver 2014-11-24 14:50 ` [PATCH v2 1/2] Input: add regulator haptic driver Jaewon Kim @ 2014-11-25 1:04 ` Chanwoo Choi 2014-11-26 5:31 ` Pankaj Dubey 1 sibling, 0 replies; 6+ messages in thread From: Chanwoo Choi @ 2014-11-25 1:04 UTC (permalink / raw) To: Jaewon Kim Cc: Kukjin Kim, Dmitry Torokhov, Pankaj Dubey, Dan Murphy, Hyunhee Kim, linux-kernel, linux-input, linux-samsung-soc On 11/24/2014 11:50 PM, Jaewon Kim wrote: > This patch adds support for haptic driver controlled by > voltage of regulator. And this driver support for > Force Feedback interface from input framework > > Signed-off-by: Jaewon Kim <jaewon02.kim@samsung.com> > Signed-off-by: Hyunhee Kim <hyunhee.kim@samsung.com> > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Looks good to me. I tested this patch on Exynos3250-based Rinato (Samsung Gear2) board. Tested-by: Chanwoo Choi <cw00.choi@samsung.com> Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Thanks, Chanwoo Choi > --- > .../devicetree/bindings/input/regulator-haptic.txt | 24 ++ > drivers/input/misc/Kconfig | 11 + > drivers/input/misc/Makefile | 1 + > drivers/input/misc/regulator-haptic.c | 247 ++++++++++++++++++++ > include/linux/input/regulator-haptic.h | 30 +++ > 5 files changed, 313 insertions(+) > create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt > create mode 100644 drivers/input/misc/regulator-haptic.c > create mode 100644 include/linux/input/regulator-haptic.h > > diff --git a/Documentation/devicetree/bindings/input/regulator-haptic.txt b/Documentation/devicetree/bindings/input/regulator-haptic.txt > new file mode 100644 > index 0000000..5a44e8f > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/regulator-haptic.txt > @@ -0,0 +1,24 @@ > +* Requlator Haptic Device Tree Bindings > + > +The regulator haptic driver controlled by voltage of regulator. > +This driver implemented via Force Feedback interface. > + > +Required Properties: > + - compatible : Should be "regulator-haptic" > + - haptic-supply : Power supply to the haptic motor. > + [*] refer Documentation/devicetree/bindings/regulator/regulator.txt > + > + - max-microvolt : The maximum voltage value supplied to the haptic motor. > + [The unit of the voltage is a micro] > + > + - min-microvolt : The minimum voltage value supplied to the haptic motor. > + [The unit of the voltage is a micro] > + > +Example: > + > + haptics { > + compatible = "regulator-haptic"; > + haptic-supply = <&motor_regulator>; > + max-microvolt = <2700000>; > + min-microvolt = <1100000>; > + }; > diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig > index 23297ab..e5e556d 100644 > --- a/drivers/input/misc/Kconfig > +++ b/drivers/input/misc/Kconfig > @@ -394,6 +394,17 @@ config INPUT_CM109 > To compile this driver as a module, choose M here: the module will be > called cm109. > > +config INPUT_REGULATOR_HAPTIC > + tristate "regulator haptics support" > + select INPUT_FF_MEMLESS > + help > + This option enables device driver support for the haptic controlled > + by regulator. This driver supports ff-memless interface > + from input framework. > + > + To compile this driver as a module, choose M here: the > + module will be called regulator-haptic. > + > config INPUT_RETU_PWRBUTTON > tristate "Retu Power button Driver" > depends on MFD_RETU > diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile > index 19c7603..1f135af 100644 > --- a/drivers/input/misc/Makefile > +++ b/drivers/input/misc/Makefile > @@ -53,6 +53,7 @@ obj-$(CONFIG_INPUT_PMIC8XXX_PWRKEY) += pmic8xxx-pwrkey.o > obj-$(CONFIG_INPUT_POWERMATE) += powermate.o > obj-$(CONFIG_INPUT_PWM_BEEPER) += pwm-beeper.o > obj-$(CONFIG_INPUT_RB532_BUTTON) += rb532_button.o > +obj-$(CONFIG_INPUT_REGULATOR_HAPTIC) += regulator-haptic.o > obj-$(CONFIG_INPUT_RETU_PWRBUTTON) += retu-pwrbutton.o > obj-$(CONFIG_INPUT_GPIO_ROTARY_ENCODER) += rotary_encoder.o > obj-$(CONFIG_INPUT_SGI_BTNS) += sgi_btns.o > diff --git a/drivers/input/misc/regulator-haptic.c b/drivers/input/misc/regulator-haptic.c > new file mode 100644 > index 0000000..c61dd99 > --- /dev/null > +++ b/drivers/input/misc/regulator-haptic.c > @@ -0,0 +1,247 @@ > +/* > + * Regulator haptic driver > + * > + * Copyright (c) 2014 Samsung Electronics Co., Ltd. > + * Author: Jaewon Kim <jaewon02.kim@samsung.com> > + * Author: Hyunhee Kim <hyunhee.kim@samsung.com> > + * > + * 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. > + */ > + > +#include <linux/input.h> > +#include <linux/input/regulator-haptic.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/platform_device.h> > +#include <linux/regulator/consumer.h> > +#include <linux/slab.h> > + > +#define MAX_MAGNITUDE_SHIFT 16 > + > +struct regulator_haptic { > + struct device *dev; > + struct input_dev *input_dev; > + struct regulator *regulator; > + struct work_struct work; > + > + bool enabled; > + bool suspend_state; > + unsigned int max_volt; > + unsigned int min_volt; > + unsigned int intensity; > + unsigned int magnitude; > +}; > + > +static void regulator_haptic_enable(struct regulator_haptic *haptic, bool state) > +{ > + int error; > + > + if (haptic->enabled == state) > + return; > + > + if (state) > + error = regulator_enable(haptic->regulator); > + else > + error = regulator_disable(haptic->regulator); > + if (error) { > + dev_err(haptic->dev, "cannot enable regulator\n"); > + return; > + } > + > + haptic->enabled = state; > +} > + > +static void regulator_haptic_work(struct work_struct *work) > +{ > + struct regulator_haptic *haptic = container_of(work, > + struct regulator_haptic, work); > + int error; > + > + error = regulator_set_voltage(haptic->regulator, > + haptic->intensity + haptic->min_volt, haptic->max_volt); > + if (error) { > + dev_err(haptic->dev, "cannot set regulator voltage\n"); > + return; > + } > + > + if (haptic->magnitude) > + regulator_haptic_enable(haptic, true); > + else > + regulator_haptic_enable(haptic, false); > +} > + > +static int regulator_haptic_play_effect(struct input_dev *input, void *data, > + struct ff_effect *effect) > +{ > + struct regulator_haptic *haptic = input_get_drvdata(input); > + u64 volt_mag_multi; > + > + haptic->magnitude = effect->u.rumble.strong_magnitude; > + if (!haptic->magnitude) > + haptic->magnitude = effect->u.rumble.weak_magnitude; > + > + > + volt_mag_multi = (u64)(haptic->max_volt - haptic->min_volt) * > + haptic->magnitude; > + haptic->intensity = (unsigned int)(volt_mag_multi >> > + MAX_MAGNITUDE_SHIFT); > + > + schedule_work(&haptic->work); > + > + return 0; > +} > + > +static void regulator_haptic_close(struct input_dev *input) > +{ > + struct regulator_haptic *haptic = input_get_drvdata(input); > + > + cancel_work_sync(&haptic->work); > + regulator_haptic_enable(haptic, false); > +} > + > +#ifdef CONFIG_OF > +static int regulator_haptic_parse_dt(struct regulator_haptic *haptic) > +{ > + struct device_node *node = haptic->dev->of_node; > + int error; > + > + error = of_property_read_u32(node, "max-microvolt", &haptic->max_volt); > + if (error) { > + dev_err(haptic->dev, "cannot parse max-microvolt\n"); > + return error; > + } > + > + error = of_property_read_u32(node, "min-microvolt", &haptic->min_volt); > + if (error) { > + dev_err(haptic->dev, "cannot parse min-microvolt\n"); > + return error; > + } > + > + return 0; > +} > +#else > +static int regulator_haptic_parse_dt(struct regulator_haptic *haptic) > +{ > + return 0; > +} > +#endif /* CONFIG_OF */ > + > +static int regulator_haptic_probe(struct platform_device *pdev) > +{ > + struct regulator_haptic *haptic; > + struct regulator_haptic_data *data; > + struct input_dev *input_dev; > + int error; > + > + haptic = devm_kzalloc(&pdev->dev, sizeof(*haptic), GFP_KERNEL); > + if (!haptic) > + return -ENOMEM; > + > + haptic->dev = &pdev->dev; > + haptic->enabled = false; > + haptic->suspend_state = false; > + INIT_WORK(&haptic->work, regulator_haptic_work); > + > + if (pdev->dev.of_node) { > + error = regulator_haptic_parse_dt(haptic); > + if (error) { > + dev_err(&pdev->dev, "failed to parse device tree\n"); > + return error; > + } > + } else { > + data = dev_get_platdata(&pdev->dev); > + if (data) { > + dev_err(&pdev->dev, "failed to get platdata\n"); > + return -EINVAL; > + } > + > + haptic->regulator = data->regulator; > + haptic->max_volt = data->max_volt; > + haptic->min_volt = data->min_volt; > + } > + > + haptic->regulator = devm_regulator_get(&pdev->dev, "haptic"); > + if (IS_ERR(haptic->regulator)) { > + dev_err(&pdev->dev, "failed to get regulator\n"); > + return PTR_ERR(haptic->regulator); > + } > + > + input_dev = devm_input_allocate_device(&pdev->dev); > + if (!input_dev) > + return -ENOMEM; > + > + haptic->input_dev = input_dev; > + haptic->input_dev->name = "regulator-haptic"; > + haptic->input_dev->dev.parent = &pdev->dev; > + haptic->input_dev->close = regulator_haptic_close; > + input_set_drvdata(haptic->input_dev, haptic); > + input_set_capability(haptic->input_dev, EV_FF, FF_RUMBLE); > + > + error = input_ff_create_memless(input_dev, NULL, > + regulator_haptic_play_effect); > + if (error) { > + dev_err(&pdev->dev, "failed to create force-feedback\n"); > + return error; > + } > + > + error = input_register_device(haptic->input_dev); > + if (error) { > + dev_err(&pdev->dev, "failed to register input device\n"); > + return error; > + } > + > + platform_set_drvdata(pdev, haptic); > + > + return 0; > +} > + > +static int __maybe_unused regulator_haptic_suspend(struct device *dev) > +{ > + struct platform_device *pdev = to_platform_device(dev); > + struct regulator_haptic *haptic = platform_get_drvdata(pdev); > + > + if (haptic->enabled) { > + regulator_haptic_enable(haptic, false); > + haptic->suspend_state = true; > + } > + > + return 0; > +} > + > +static int __maybe_unused regulator_haptic_resume(struct device *dev) > +{ > + struct platform_device *pdev = to_platform_device(dev); > + struct regulator_haptic *haptic = platform_get_drvdata(pdev); > + > + if (haptic->suspend_state) { > + regulator_haptic_enable(haptic, true); > + haptic->suspend_state = false; > + } > + > + return 0; > +} > + > +static SIMPLE_DEV_PM_OPS(regulator_haptic_pm_ops, > + regulator_haptic_suspend, regulator_haptic_resume); > + > +static struct of_device_id regulator_haptic_dt_match[] = { > + { .compatible = "regulator-haptic" }, > + {}, > +}; > + > +static struct platform_driver regulator_haptic_driver = { > + .probe = regulator_haptic_probe, > + .driver = { > + .name = "regulator-haptic", > + .of_match_table = regulator_haptic_dt_match, > + .pm = ®ulator_haptic_pm_ops, > + }, > +}; > +module_platform_driver(regulator_haptic_driver); > + > +MODULE_AUTHOR("Jaewon Kim <jaewon02.kim@samsung.com>"); > +MODULE_AUTHOR("Hyunhee Kim <hyunhee.kim@samsung.com>"); > +MODULE_DESCRIPTION("Regulator haptic driver"); > +MODULE_LICENSE("GPL"); > diff --git a/include/linux/input/regulator-haptic.h b/include/linux/input/regulator-haptic.h > new file mode 100644 > index 0000000..15a629c > --- /dev/null > +++ b/include/linux/input/regulator-haptic.h > @@ -0,0 +1,30 @@ > +/* > + * Regulator Haptic Platform Data > + * > + * Copyright (c) 2014 Samsung Electronics Co., Ltd. > + * Author: Jaewon Kim <jaewon02.kim@samsung.com> > + * Author: Hyunhee Kim <hyunhee.kim@samsung.com> > + * > + * 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. > + */ > + > +#ifndef _REGULATOR_HAPTIC_H > + > +/* > + * struct regulator_haptic_data - Platform device data > + * > + * @regulator: Power supply to the haptic motor > + * @max_volt: maximum voltage value supplied to the haptic motor. > + * <The unit of the voltage is a micro> > + * @min_volt: minimum voltage value supplied to the haptic motor. > + * <The unit of the voltage is a micro> > + */ > +struct regulator_haptic_data { > + struct regulator *regulator; > + unsigned int max_volt; > + unsigned int min_volt; > +}; > + > +#endif /* _REGULATOR_HAPTIC_H */ > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/2] Input: add regulator haptic driver 2014-11-24 14:50 ` [PATCH v2 1/2] Input: add regulator haptic driver Jaewon Kim 2014-11-25 1:04 ` Chanwoo Choi @ 2014-11-26 5:31 ` Pankaj Dubey 1 sibling, 0 replies; 6+ messages in thread From: Pankaj Dubey @ 2014-11-26 5:31 UTC (permalink / raw) To: Jaewon Kim, Kukjin Kim, Dmitry Torokhov, Dan Murphy, Chanwoo Choi, Hyunhee Kim Cc: linux-kernel, linux-input, linux-samsung-soc Hi Jaewon, On Monday 24 November 2014 08:20 PM, Jaewon Kim wrote: > This patch adds support for haptic driver controlled by > voltage of regulator. And this driver support for > Force Feedback interface from input framework > > Signed-off-by: Jaewon Kim <jaewon02.kim@samsung.com> > Signed-off-by: Hyunhee Kim <hyunhee.kim@samsung.com> > Acked-by: Kyungmin Park <kyungmin.park@samsung.com> > --- > .../devicetree/bindings/input/regulator-haptic.txt | 24 ++ > drivers/input/misc/Kconfig | 11 + > drivers/input/misc/Makefile | 1 + > drivers/input/misc/regulator-haptic.c | 247 ++++++++++++++++++++ > include/linux/input/regulator-haptic.h | 30 +++ > 5 files changed, 313 insertions(+) > create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt > create mode 100644 drivers/input/misc/regulator-haptic.c > create mode 100644 include/linux/input/regulator-haptic.h > > diff --git a/Documentation/devicetree/bindings/input/regulator-haptic.txt b/Documentation/devicetree/bindings/input/regulator-haptic.txt > new file mode 100644 > index 0000000..5a44e8f > --- /dev/null > +++ b/Documentation/devicetree/bindings/input/regulator-haptic.txt > @@ -0,0 +1,24 @@ > +* Requlator Haptic Device Tree Bindings Nit: %s/Requlator/Regulator > + > +The regulator haptic driver controlled by voltage of regulator. > +This driver implemented via Force Feedback interface. > + [Snip] > diff --git a/include/linux/input/regulator-haptic.h b/include/linux/input/regulator-haptic.h > new file mode 100644 > index 0000000..15a629c > --- /dev/null > +++ b/include/linux/input/regulator-haptic.h > @@ -0,0 +1,30 @@ > +/* > + * Regulator Haptic Platform Data > + * > + * Copyright (c) 2014 Samsung Electronics Co., Ltd. > + * Author: Jaewon Kim <jaewon02.kim@samsung.com> > + * Author: Hyunhee Kim <hyunhee.kim@samsung.com> > + * > + * 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. > + */ > + > +#ifndef _REGULATOR_HAPTIC_H > + Please define _REGULATOR_HAPTIC_H here as: #define _REGULATOR_HAPTIC_H > +/* > + * struct regulator_haptic_data - Platform device data > + * > + * @regulator: Power supply to the haptic motor > + * @max_volt: maximum voltage value supplied to the haptic motor. > + * <The unit of the voltage is a micro> > + * @min_volt: minimum voltage value supplied to the haptic motor. > + * <The unit of the voltage is a micro> > + */ > +struct regulator_haptic_data { > + struct regulator *regulator; > + unsigned int max_volt; > + unsigned int min_volt; > +}; > + > +#endif /* _REGULATOR_HAPTIC_H */ > With these two minor fixes please feel free to add: Reviewed-by: Pankaj Dubey <pankaj.dubey@samsung.com> Thanks, Pankaj Dubey ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] ARM: dts: Add regulator-haptic device node for exynos3250-rinato 2014-11-24 14:50 [PATCH v2 0/2] Add regulator-haptic driver Jaewon Kim 2014-11-24 14:50 ` [PATCH v2 1/2] Input: add regulator haptic driver Jaewon Kim @ 2014-11-24 14:50 ` Jaewon Kim 2014-11-25 1:02 ` Chanwoo Choi 1 sibling, 1 reply; 6+ messages in thread From: Jaewon Kim @ 2014-11-24 14:50 UTC (permalink / raw) To: Kukjin Kim, Dmitry Torokhov, Pankaj Dubey, Dan Murphy, Chanwoo Choi, Hyunhee Kim Cc: linux-kernel, linux-input, linux-samsung-soc, Jaewon Kim This patch adds regulator-haptic device node controlled by regulator. Signed-off-by: Jaewon Kim <jaewon02.kim@samsung.com> --- arch/arm/boot/dts/exynos3250-rinato.dts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts index 84380fa..da03005 100644 --- a/arch/arm/boot/dts/exynos3250-rinato.dts +++ b/arch/arm/boot/dts/exynos3250-rinato.dts @@ -104,6 +104,13 @@ }; }; }; + + haptics { + compatible = "regulator-haptic"; + haptic-supply = <&motor_reg>; + min-microvolt = <1100000>; + max-microvolt = <2700000>; + }; }; &adc { -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: Add regulator-haptic device node for exynos3250-rinato 2014-11-24 14:50 ` [PATCH v2 2/2] ARM: dts: Add regulator-haptic device node for exynos3250-rinato Jaewon Kim @ 2014-11-25 1:02 ` Chanwoo Choi 0 siblings, 0 replies; 6+ messages in thread From: Chanwoo Choi @ 2014-11-25 1:02 UTC (permalink / raw) To: Jaewon Kim Cc: Kukjin Kim, Dmitry Torokhov, Pankaj Dubey, Dan Murphy, Hyunhee Kim, linux-kernel, linux-input, linux-samsung-soc On 11/24/2014 11:50 PM, Jaewon Kim wrote: > This patch adds regulator-haptic device node controlled by regulator. > > Signed-off-by: Jaewon Kim <jaewon02.kim@samsung.com> > --- > arch/arm/boot/dts/exynos3250-rinato.dts | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts > index 84380fa..da03005 100644 > --- a/arch/arm/boot/dts/exynos3250-rinato.dts > +++ b/arch/arm/boot/dts/exynos3250-rinato.dts > @@ -104,6 +104,13 @@ > }; > }; > }; > + > + haptics { > + compatible = "regulator-haptic"; > + haptic-supply = <&motor_reg>; > + min-microvolt = <1100000>; > + max-microvolt = <2700000>; > + }; > }; > > &adc { > Looks good to me. Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com> Thanks, Chanwoo Choi ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-26 5:32 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-11-24 14:50 [PATCH v2 0/2] Add regulator-haptic driver Jaewon Kim 2014-11-24 14:50 ` [PATCH v2 1/2] Input: add regulator haptic driver Jaewon Kim 2014-11-25 1:04 ` Chanwoo Choi 2014-11-26 5:31 ` Pankaj Dubey 2014-11-24 14:50 ` [PATCH v2 2/2] ARM: dts: Add regulator-haptic device node for exynos3250-rinato Jaewon Kim 2014-11-25 1:02 ` Chanwoo Choi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox