Input: add regulator haptic driver
Subsystems (2)
PATCH 1/1 Input: add regulator haptic driver
From: Hyunhee Kim <[email protected]>
Date: Wed, 9 Oct 2013 16:21:36 +0900
Subject: [PATCH] Input: add regulator haptic driver
The regulator haptic driver function can be used to control motor by on/off regulator.
User can control the haptic driver by using force feedback framework.
--- drivers/input/misc/Kconfig | 6 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/regulator-haptic.c | 185 +++++++++++++++++++++++++++++++++ 3 files changed, 192 insertions(+) create mode 100644 drivers/input/misc/regulator-haptic.c
drivers/input/misc/Kconfig +6 -0
@@ -82,6 +82,12 @@ config INPUT_ARIZONA_HAPTICS To compile this driver as a module, choose M here: the module will be called arizona-haptics. +config INPUT_REGULATOR_HAPTIC + tristate "regulator haptics support" + select INPUT_FF_MEMLESS + help + Say Y to enable support for the haptics module for regulator. + config INPUT_BMA150 tristate "BMA150/SMB380 acceleration sensor support" depends on I2C
drivers/input/misc/Makefile +0 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_INPUT_ADXL34X_I2C) +=
adxl34x-i2c.o
obj-$(CONFIG_INPUT_ADXL34X_SPI) += adxl34x-spi.o
obj-$(CONFIG_INPUT_APANEL) += apanel.o
obj-$(CONFIG_INPUT_ARIZONA_HAPTICS) += arizona-haptics.o
+obj-$(CONFIG_INPUT_REGULATOR_HAPTIC) += regulator-haptic.o
obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o
obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
obj-$(CONFIG_INPUT_BFIN_ROTARY) += bfin_rotary.o
(quoted diff) +0 -0
b/drivers/input/misc/regulator-haptic.c
new file mode 100644
index 0000000..29f57ea
drivers/input/misc/regulator-haptic.c new file +29 -0
@@ -0,0 +1,185 @@ +/* +* Regulator haptic driver +* +* Copyright (c) 2013 Samsung Electronics Co., Ltd. +* +* Author: Hyunhee Kim <[email protected]> +* +* 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/module.h> +#include <linux/platform_device.h> +#include <linux/input.h> +#include <linux/slab.h> +#include <linux/regulator/driver.h> + +struct regulator_haptic { +struct device *dev; +struct input_dev *input_dev; +struct work_struct work; +bool enabled; +struct regulator *regulator; +struct mutex mutex; +int level; +}; + +static void regulator_haptic_enable(struct regulator_haptic *haptic, bool
enable)
+{
+ int ret;
+
+ mutex_lock(&haptic->mutex);
+ if (enable && !haptic->enabled) {
+ haptic->enabled = true;
+ ret = regulator_enable(haptic->regulator);
+ if (ret)
+ pr_err("haptic: %s failed to enable regulator\n",
+ __func__);
+ } else if (!enable && haptic->enabled) {
+ haptic->enabled = false;
+ ret = regulator_disable(haptic->regulator);
+ if (ret)
+ pr_err("haptic: %s failed to disable regulator\n",
+ __func__);
+ }
+ mutex_unlock(&haptic->mutex);
+}
+
+static void regulator_haptic_work(struct work_struct *work) +{
+ struct regulator_haptic *haptic = container_of(work,
+ structregulator_haptic,
+ work);
+ if (haptic->level)
+ regulator_haptic_enable(haptic, true);
+ else
+ regulator_haptic_enable(haptic, false);
+
+}
+
+static int regulator_haptic_play(struct input_dev *input, void *data,
+ struct ff_effect *effect)
+{
+ struct regulator_haptic *haptic = input_get_drvdata(input);
+
+ haptic->level = effect->u.rumble.strong_magnitude;
+ if (!haptic->level)
+ haptic->level = effect->u.rumble.weak_magnitude;
+ 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);
+}
+
+static int regulator_haptic_probe(struct platform_device *pdev) +{
+ struct regulator_haptic *haptic;
+ struct input_dev *input_dev;
+ int error;
+
+ haptic = kzalloc(sizeof(*haptic), GFP_KERNEL);
+ if (!haptic) {
+ dev_err(&pdev->dev, "unable to allocate memory for
haptic\n");
+ return -ENOMEM;
+ }
+
+ input_dev = input_allocate_device();
+
+ if (!input_dev) {
+ dev_err(&pdev->dev, "unable to allocate memory\n");
+ error = -ENOMEM;
+ goto err_kfree_mem;
+ }
+
+ INIT_WORK(&haptic->work, regulator_haptic_work);
+ mutex_init(&haptic->mutex);
+ haptic->input_dev = input_dev;
+ haptic->dev = &pdev->dev;
+ haptic->regulator = regulator_get(&pdev->dev, "haptic");
+
+ if (IS_ERR(haptic->regulator)) {
+ error = PTR_ERR(haptic->regulator);
+ dev_err(&pdev->dev, "unable to get regulator, err: %d\n",
+ error);
+ goto err_ifree_mem;
+ }
+
+ haptic->input_dev->name = "regulator:haptic";
+ haptic->input_dev->dev.parent = &pdev->dev;
+ haptic->input_dev->close = regulator_haptic_close;
+ haptic->enabled = false;
+ 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);
+ if (error) {
+ dev_err(&pdev->dev,
+ "input_ff_create_memless() failed: %d\n",
+ error);
+ goto err_put_regulator;
+ }
+
+ error = input_register_device(haptic->input_dev);
+ if (error) {
+ dev_err(&pdev->dev,
+ "couldn't register input device: %d\n",
+ error);
+ goto err_destroy_ff;
+ }
+
+ platform_set_drvdata(pdev, haptic);
+
+ return 0;
+
+err_destroy_ff:
+ input_ff_destroy(haptic->input_dev);
+err_put_regulator:
+ regulator_put(haptic->regulator);
+err_ifree_mem:
+ input_free_device(haptic->input_dev);
+err_kfree_mem:
+ kfree(haptic);
+
+ return error;
+}
+
+static int regulator_haptic_remove(struct platform_device *pdev) +{
+ struct regulator_haptic *haptic = platform_get_drvdata(pdev);
+
+ input_unregister_device(haptic->input_dev);
+
+ return 0;
+}
+
+static struct of_device_id regulator_haptic_dt_match[] = {
+ { .compatible = "linux,regulator-haptic" },
+ {},
+};
+
+static struct platform_driver regulator_haptic_driver = {
+ .driver = {
+ .name = "regulator-haptic",
+ .owner = THIS_MODULE,
+ .of_match_table = regulator_haptic_dt_match,
+ },
+
+ .probe = regulator_haptic_probe,
+ .remove = regulator_haptic_remove,
+};
+module_platform_driver(regulator_haptic_driver);
+
+MODULE_ALIAS("platform:regulator-haptic"); +MODULE_DESCRIPTION("Regulator haptic driver"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Hyunhee Kim <[email protected]>");
Signature · 1 line
1.7.9.5
Review
Quoted 6 lines · hyunhee.kim
(quoted diff) +6
-0+ if (enable && !haptic->enabled) { + haptic->enabled = true; + ret = regulator_enable(haptic->regulator); + if (ret) + pr_err("haptic: %s failed to enable regulator\n", + __func__);
These should probably set the flag after the regulator API call has succeeded, otherwise if the call fails the driver will incorrectly remember that the regulator is enabled and never disable it (or vice versa on disable).
Review
Quoted 12 lines
(quoted diff) +4
-0+static void regulator_haptic_work(struct work_struct *work) +{ + struct regulator_haptic *haptic = container_of(work, + struct
regulator_haptic,(quoted diff) +7
-0+ work); + if (haptic->level) + regulator_haptic_enable(haptic, true); + else + regulator_haptic_enable(haptic, false); + +}
Should the mutex for the level be at this level rather than in the subfunctions? Though it'd probably be just as well to inline the true and false cases since there's basically two equivalent forks in the enable function anyway.
Review
Quoted 7 lines
(quoted diff) +4
-0+ + haptic = kzalloc(sizeof(*haptic), GFP_KERNEL); + if (!haptic) { + dev_err(&pdev->dev, "unable to allocate memory forhaptic\n");
(quoted diff) +2
-0+ return -ENOMEM; + }
Might be better to use devm_ functions throughout here, saves error handling and cleanup code...
Review
Quoted 7 lines
(quoted diff) +7
-0+static int regulator_haptic_remove(struct platform_device *pdev) +{ + struct regulator_haptic *haptic = platform_get_drvdata(pdev); + + input_unregister_device(haptic->input_dev); + + return 0;
...which is currently missing.
PATCH v4 1/1 Input: add regulator haptic driver
From: Hyunhee Kim <[email protected]>
Date: Wed, 9 Oct 2013 16:21:36 +0900
Subject: [PATCH] Input: add regulator haptic driver
--- drivers/input/misc/Kconfig | 10 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/regulator-haptic.c | 187 +++++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+) create mode 100644 drivers/input/misc/regulator-haptic.c
drivers/input/misc/Kconfig +10 -0
@@ -82,6 +82,16 @@ config INPUT_ARIZONA_HAPTICS To compile this driver as a module, choose M here: the module will be called arizona-haptics. +config INPUT_REGULATOR_HAPTIC + tristate "support haptics on/off using regulator" + select INPUT_FF_MEMLESS + help + Say Y to enable support for the haptic module. Haptic can be + enabled/disabled by regulator. + + To compile this driver as a module, choose M here: the + module will be called regulator-haptic. + config INPUT_BMA150 tristate "BMA150/SMB380 acceleration sensor support" depends on I2C
drivers/input/misc/Makefile +0 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_INPUT_ADXL34X_I2C) +=
adxl34x-i2c.o
obj-$(CONFIG_INPUT_ADXL34X_SPI) += adxl34x-spi.o
obj-$(CONFIG_INPUT_APANEL) += apanel.o
obj-$(CONFIG_INPUT_ARIZONA_HAPTICS) += arizona-haptics.o
+obj-$(CONFIG_INPUT_REGULATOR_HAPTIC) += regulator-haptic.o
obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o
obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
obj-$(CONFIG_INPUT_BFIN_ROTARY) += bfin_rotary.o
(quoted diff) +0 -0
b/drivers/input/misc/regulator-haptic.c
new file mode 100644
index 0000000..bab2ad9
drivers/input/misc/regulator-haptic.c new file +36 -0
@@ -0,0 +1,187 @@ +/* +* Regulator haptic driver +* +* Copyright (c) 2013 Samsung Electronics Co., Ltd. +* +* Author: Hyunhee Kim <[email protected]> +* +* 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/module.h> +#include <linux/platform_device.h> +#include <linux/input.h> +#include <linux/slab.h> +#include <linux/regulator/driver.h> + +struct regulator_haptic { +struct device *dev; +struct input_dev *input_dev; +struct work_struct work; +bool enabled; +struct regulator *regulator; +struct mutex mutex; +int level; +}; + +static void regulator_haptic_enable (struct regulator_haptic *haptic) +{ +int ret; + +if (!haptic->enabled) { + ret =regulator_enable (haptic->regulator); +if (ret) + dev_err(haptic->dev, "failed to enable
regulator\n");
+ haptic->enabled = true;
+ }
+}
+
+static void regulator_haptic_disable(struct regulator_haptic *haptic) +{
+ int ret;
+
+ if (haptic->enabled) {
+ ret = regulator_disable(haptic->regulator);
+ if (ret)
+ dev_err(haptic->dev, "failed to disable
regulator\n");
+ haptic->enabled = false;
+ }
+}
+
+static void regulator_haptic_work(struct work_struct *work) +{
+ struct regulator_haptic *haptic = container_of(work,
+ structregulator_haptic,
+ work);
+ mutex_lock(&haptic->mutex);
+ if (haptic->level)
+ regulator_haptic_enable(haptic);
+ else
+ regulator_haptic_disable(haptic);
+ mutex_unlock(&haptic->mutex);
+}
+
+static int regulator_haptic_play(struct input_dev *input, void *data,
+ struct ff_effect *effect)
+{
+ struct regulator_haptic *haptic = input_get_drvdata(input);
+
+ haptic->level = effect->u.rumble.strong_magnitude;
+ if (!haptic->level)
+ haptic->level = effect->u.rumble.weak_magnitude;
+ 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_disable(haptic);
+}
+
+static int regulator_haptic_probe(struct platform_device *pdev) +{
+ struct regulator_haptic *haptic;
+ struct input_dev *input_dev;
+ int error;
+
+ haptic = devm_kzalloc(&pdev->dev, sizeof(*haptic), GFP_KERNEL);
+ if (!haptic) {
+ dev_err(&pdev->dev, "unable to allocate memory for
haptic\n");
+ return -ENOMEM;
+ }
+
+ input_dev = input_allocate_device();
+
+ if (!input_dev) {
+ dev_err(&pdev->dev, "unable to allocate memory\n");
+ return -ENOMEM;
+ }
+
+ INIT_WORK(&haptic->work, regulator_haptic_work);
+ mutex_init(&haptic->mutex);
+ haptic->input_dev = input_dev;
+ haptic->dev = &pdev->dev;
+ haptic->regulator = regulator_get(&pdev->dev, "haptic");
+
+ if (IS_ERR(haptic->regulator)) {
+ error = PTR_ERR(haptic->regulator);
+ dev_err(&pdev->dev, "unable to get regulator, err: %d\n",
+ error);
+ goto err_ifree_mem;
+ }
+
+ haptic->input_dev->name = "regulator:haptic";
+ haptic->input_dev->dev.parent = &pdev->dev;
+ haptic->input_dev->close = regulator_haptic_close;
+ haptic->enabled = false;
+ 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);
+ if (error) {
+ dev_err(&pdev->dev,
+ "input_ff_create_memless() failed: %d\n",
+ error);
+ goto err_put_regulator;
+ }
+
+ error = input_register_device(haptic->input_dev);
+ if (error) {
+ dev_err(&pdev->dev,
+ "couldn't register input device: %d\n",
+ error);
+ goto err_destroy_ff;
+ }
+
+ platform_set_drvdata(pdev, haptic);
+
+ return 0;
+
+err_destroy_ff:
+ input_ff_destroy(haptic->input_dev);
+err_put_regulator:
+ regulator_put(haptic->regulator);
+err_ifree_mem:
+ input_free_device(haptic->input_dev);
+
+ return error;
+}
+
+static int regulator_haptic_remove(struct platform_device *pdev) +{
+ struct regulator_haptic *haptic = platform_get_drvdata(pdev);
+
+ input_unregister_device(haptic->input_dev);
+ regulator_put(haptic->regulator);
+
+ return 0;
+}
+
+static struct of_device_id regulator_haptic_dt_match[] = {
+ { .compatible = "linux,regulator-haptic" },
+ {},
+};
+
+static struct platform_driver regulator_haptic_driver = {
+ .driver = {
+ .name = "regulator-haptic",
+ .owner = THIS_MODULE,
+ .of_match_table = regulator_haptic_dt_match,
+ },
+
+ .probe = regulator_haptic_probe,
+ .remove = regulator_haptic_remove,
+};
+module_platform_driver(regulator_haptic_driver);
+
+MODULE_ALIAS("platform:regulator-haptic"); +MODULE_DESCRIPTION("Regulator haptic driver"); +MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Hyunhee Kim <[email protected]>");
Signature · 1 line
1.7.9.5
Quoted 3 lines · Hyunhee Kim
From: Hyunhee Kim <[email protected]>
Date: Wed, 9 Oct 2013 16:21:36 +0900
Subject: [PATCH] Input: add regulator haptic driver
This is OK from a regulator point of view though there's still a lot of use of regulator devm_ and input devm_ that could happen - it wasn't just the kzalloc(), it was most of the allocations in the driver.
You also have some word wrapping in your e-mail so the patch probably won't apply.
PATCH v5 1/1 Input: add regulator haptic driver
From: Hyunhee Kim <[email protected]>
Date: Wed, 9 Oct 2013 16:21:36 +0900
Subject: [PATCH] Input: add regulator haptic driver
--- drivers/input/misc/Kconfig | 10 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/regulator-haptic.c | 187 +++++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+) create mode 100644 drivers/input/misc/regulator-haptic.c
drivers/input/misc/Kconfig +10 -0
@@ -82,6 +82,16 @@ config INPUT_ARIZONA_HAPTICS To compile this driver as a module, choose M here: the module will be called arizona-haptics. +config INPUT_REGULATOR_HAPTIC + tristate "support haptics on/off using regulator" + select INPUT_FF_MEMLESS + help + Say Y to enable support for the haptic module. Haptic can be + enabled/disabled by regulator. + + To compile this driver as a module, choose M here: the + module will be called regulator-haptic. + config INPUT_BMA150 tristate "BMA150/SMB380 acceleration sensor support" depends on I2C
drivers/input/misc/Makefile +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_INPUT_ADXL34X_I2C) += adxl34x-i2c.o obj-$(CONFIG_INPUT_ADXL34X_SPI) += adxl34x-spi.o obj-$(CONFIG_INPUT_APANEL) += apanel.o obj-$(CONFIG_INPUT_ARIZONA_HAPTICS) += arizona-haptics.o +obj-$(CONFIG_INPUT_REGULATOR_HAPTIC) += regulator-haptic.o obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o obj-$(CONFIG_INPUT_BFIN_ROTARY) += bfin_rotary.o
drivers/input/misc/regulator-haptic.c new file +187 -0
187 lines not on this page · raw message
--
1.7.9.5