From patchwork Wed Nov 26 13:30:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaewon Kim X-Patchwork-Id: 5385311 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E41199F39B for ; Wed, 26 Nov 2014 13:31:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D588201C7 for ; Wed, 26 Nov 2014 13:31:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3EB2E200ED for ; Wed, 26 Nov 2014 13:31:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752640AbaKZNaL (ORCPT ); Wed, 26 Nov 2014 08:30:11 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:57712 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752624AbaKZNaH (ORCPT ); Wed, 26 Nov 2014 08:30:07 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NFN00IALEU5DHD0@mailout3.samsung.com>; Wed, 26 Nov 2014 22:30:05 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.113]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 17.CC.19034.DD5D5745; Wed, 26 Nov 2014 22:30:05 +0900 (KST) X-AuditID: cbfee691-f79b86d000004a5a-d6-5475d5ddacf6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C3.9E.20081.DD5D5745; Wed, 26 Nov 2014 22:30:05 +0900 (KST) Received: from localhost.localdomain ([10.252.83.201]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NFN00EK1EU3G040@mmp1.samsung.com>; Wed, 26 Nov 2014 22:30:05 +0900 (KST) From: Jaewon Kim To: Dmitry Torokhov , Kukjin Kim Cc: linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-input@vger.kernel.org, Chanwoo Choi , Pankaj Dubey , Jaewon Kim , Hyunhee Kim Subject: [PATCH v3 1/2] Input: add regulator haptic driver Date: Wed, 26 Nov 2014 22:30:01 +0900 Message-id: <1417008602-22841-2-git-send-email-jaewon02.kim@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1417008602-22841-1-git-send-email-jaewon02.kim@samsung.com> References: <1417008602-22841-1-git-send-email-jaewon02.kim@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrNLMWRmVeSWpSXmKPExsWyRsSkUPfu1dIQgzd7lS2uf3nOanF40QtG i88fWtgtdjQcYbXoXXCVzeLmp2+sFpd3zWGzmHF+H5PFoq1f2B04PXbOusvu0bdlFaPH501y AcxRXDYpqTmZZalF+nYJXBlrli9gLLgTWbF+cQNrA+NHry5GTg4JAROJfac/MEHYYhIX7q1n 62Lk4hASWMoosa9nHitM0dV1+9ghEosYJdp+bmaCcNqYJCat3MEOUsUmoC3xff1isA4RgVCJ zxdmMYMUMQs0M0lMXHMZbIewgJXEqzf3mEFsFgFVic07F7F0MXJw8Ap4SBxZmw5iSggoSMyZ ZANSwSngKbHp9CGwaiGgiq17L4BdJyEwj11i0qXPrBBjBCS+TT7EAtErK7HpADPE0ZISB1fc YJnAKLyAkWEVo2hqQXJBcVJ6kalecWJucWleul5yfu4mRmCYn/73bOIOxvsHrA8xCnAwKvHw RkqVhgixJpYVV+YeYjQF2jCRWUo0OR8YTXkl8YbGZkYWpiamxkbmlmZK4rw60j+DhQTSE0tS s1NTC1KL4otKc1KLDzEycXBKNTCmLd38UeC1vWvWDAOrKS8j4vc+DH0pZSQWoDBPzTz/Q3zB +6iFly5fVK0Lb7+y89Tb/z/jqjsK13guXjK/aW5c5stXQneWql/cnTT3gLaMF9ukr3sfsfEL v7yb12+fe8Fu3eNdb8/uOSfZHy1yqVqPlVtqyi1GH52VC9Usv5YcUSjxuP5YQLpIiaU4I9FQ i7moOBEAXNziAW4CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsVy+t9jAd27V0tDDLY/l7C4/uU5q8XhRS8Y LT5/aGG32NFwhNWid8FVNoubn76xWlzeNYfNYsb5fUwWi7Z+YXfg9Ng56y67R9+WVYwenzfJ BTBHNTDaZKQmpqQWKaTmJeenZOal2yp5B8c7x5uaGRjqGlpamCsp5CXmptoqufgE6Lpl5gDd oaRQlphTChQKSCwuVtK3wzQhNMRN1wKmMULXNyQIrsfIAA0krGHMWLN8AWPBnciK9YsbWBsY P3p1MXJySAiYSFxdt48dwhaTuHBvPVsXIxeHkMAiRom2n5uZIJw2JolJK3eAVbEJaEt8X7+Y FcQWEQiV+HxhFjNIEbNAM5PExDWXmUASwgJWEq/e3GMGsVkEVCU271zE0sXIwcEr4CFxZG06 iCkhoCAxZ5INSAWngKfEptOHwKqFgCq27r3ANoGRdwEjwypG0dSC5ILipPRcQ73ixNzi0rx0 veT83E2M4Ch6JrWDcWWDxSFGAQ5GJR7eCKnSECHWxLLiytxDjBIczEoivF83AIV4UxIrq1KL 8uOLSnNSiw8xmgLdNJFZSjQ5HxjheSXxhsYmZkaWRuaGFkbG5krivDdu5oYICaQnlqRmp6YW pBbB9DFxcEo1MLqp2gUJLHotu8Xt/L9VggoPP2asCu8K5eAW2VussG7y6qlzl6+YUOxkqXBE 1jhi16Es9cgmjZpYx23/4ty9ZroL5vc/6BF/lHRsTRenUcUSc4tJjRaXJPteZetkHODktc+N 8GMpLe9KWRIosbyU1flR/PLeCo9bq/7o39W/05mcN734lFKfEktxRqKhFnNRcSIARIgw5bgC AAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Signed-off-by: Hyunhee Kim Acked-by: Kyungmin Park Tested-by: Chanwoo Choi Reviewed-by: Chanwoo Choi Reviewed-by: Pankaj Dubey --- .../devicetree/bindings/input/regulator-haptic.txt | 21 ++ drivers/input/misc/Kconfig | 11 + drivers/input/misc/Makefile | 1 + drivers/input/misc/regulator-haptic.c | 247 ++++++++++++++++++++ include/linux/input/regulator-haptic.h | 31 +++ 5 files changed, 311 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..3ed1c7e --- /dev/null +++ b/Documentation/devicetree/bindings/input/regulator-haptic.txt @@ -0,0 +1,21 @@ +* Regulator Haptic Device Tree Bindings + +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 + * Author: Hyunhee Kim + * + * 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 +#include +#include +#include +#include +#include +#include + +#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 "); +MODULE_AUTHOR("Hyunhee Kim "); +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..05ae038 --- /dev/null +++ b/include/linux/input/regulator-haptic.h @@ -0,0 +1,31 @@ +/* + * Regulator Haptic Platform Data + * + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Author: Jaewon Kim + * Author: Hyunhee Kim + * + * 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 +#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. + * + * @min_volt: minimum voltage value supplied to the haptic motor. + * + */ +struct regulator_haptic_data { + struct regulator *regulator; + unsigned int max_volt; + unsigned int min_volt; +}; + +#endif /* _REGULATOR_HAPTIC_H */