From: "Michal Malý" <madcatxster@devoid-pointer.net>
To: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: dmitry.torokhov@gmail.com, jkosina@suse.cz, elias.vds@gmail.com,
anssi.hannula@iki.fi, simon@mungewell.org
Subject: [PATCH v2 02/24] input: Port arizona-haptics to ff-memless-next
Date: Tue, 22 Apr 2014 15:59:47 +0200 [thread overview]
Message-ID: <1398175209-9565-3-git-send-email-madcatxster@devoid-pointer.net> (raw)
In-Reply-To: <1398175209-9565-1-git-send-email-madcatxster@devoid-pointer.net>
Port arizona-haptics to ff-memless-next
Signed-off-by: Michal Malý <madcatxster@devoid-pointer.net>
---
drivers/input/misc/Kconfig | 2 +-
drivers/input/misc/arizona-haptics.c | 39 +++++++++++++++++++++++-------------
2 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 7904ab0..33e0f5d 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -75,7 +75,7 @@ config INPUT_AD714X_SPI
config INPUT_ARIZONA_HAPTICS
tristate "Arizona haptics support"
depends on MFD_ARIZONA && SND_SOC
- select INPUT_FF_MEMLESS
+ select INPUT_FF_MEMLESS_NEXT
help
Say Y to enable support for the haptics module in Arizona CODECs.
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index ef2e281..b4707cc 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/input.h>
+#include <linux/input/ff-memless-next.h>
#include <linux/slab.h>
#include <sound/soc.h>
@@ -22,6 +23,8 @@
#include <linux/mfd/arizona/pdata.h>
#include <linux/mfd/arizona/registers.h>
+#define FF_UPDATE_RATE 50
+
struct arizona_haptics {
struct arizona *arizona;
struct input_dev *input_dev;
@@ -108,29 +111,37 @@ static void arizona_haptics_work(struct work_struct *work)
}
static int arizona_haptics_play(struct input_dev *input, void *data,
- struct ff_effect *effect)
+ const struct mlnx_effect_command *command)
{
struct arizona_haptics *haptics = input_get_drvdata(input);
struct arizona *arizona = haptics->arizona;
+ const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force;
if (!arizona->dapm) {
dev_err(arizona->dev, "No DAPM context\n");
return -EBUSY;
}
- if (effect->u.rumble.strong_magnitude) {
- /* Scale the magnitude into the range the device supports */
- if (arizona->pdata.hap_act) {
- haptics->intensity =
- effect->u.rumble.strong_magnitude >> 9;
- if (effect->direction < 0x8000)
- haptics->intensity += 0x7f;
+ switch (command->cmd) {
+ case MLNX_START_RUMBLE:
+ if (rumble_force->strong) {
+ /* Scale the magnitude into the range the device supports */
+ if (arizona->pdata.hap_act) {
+ haptics->intensity = rumble_force->strong >> 9;
+ if (rumble_force->strong_dir < 0x8000)
+ haptics->intensity += 0x7f;
+ } else {
+ haptics->intensity = rumble_force->strong >> 8;
+ }
} else {
- haptics->intensity =
- effect->u.rumble.strong_magnitude >> 8;
+ haptics->intensity = 0;
}
- } else {
+ break;
+ case MLNX_STOP_RUMBLE:
haptics->intensity = 0;
+ break;
+ default:
+ return -EINVAL;
}
schedule_work(&haptics->work);
@@ -183,10 +194,10 @@ static int arizona_haptics_probe(struct platform_device *pdev)
haptics->input_dev->close = arizona_haptics_close;
__set_bit(FF_RUMBLE, haptics->input_dev->ffbit);
- ret = input_ff_create_memless(haptics->input_dev, NULL,
- arizona_haptics_play);
+ ret = input_ff_create_mlnx(haptics->input_dev, NULL,
+ arizona_haptics_play, FF_UPDATE_RATE);
if (ret < 0) {
- dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
+ dev_err(arizona->dev, "input_ff_create_mlnx() failed: %d\n",
ret);
goto err_ialloc;
}
--
1.9.2
next prev parent reply other threads:[~2014-04-22 14:00 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-22 13:59 [PATCH v2 00/24] input: Introduce ff-memless-next as an improved replacement for ff-memless Michal Malý
2014-04-22 13:59 ` [PATCH v2 01/24] input: Add ff-memless-next module Michal Malý
2014-04-23 12:12 ` Oliver Neukum
2014-04-23 12:30 ` Michal Malý
2014-04-23 13:31 ` Oliver Neukum
2014-04-23 15:59 ` Dmitry Torokhov
2014-04-23 17:06 ` Oliver Neukum
2014-04-23 17:24 ` Dmitry Torokhov
2014-04-22 13:59 ` Michal Malý [this message]
2014-04-22 13:59 ` [PATCH v2 03/24] input: Port twl4030-vibra to ff-memless-next Michal Malý
2014-04-22 13:59 ` [PATCH v2 04/24] input: Port twl6040-vibra " Michal Malý
2014-04-22 13:59 ` [PATCH v2 05/24] input: Port max8997_haptic " Michal Malý
2014-04-22 13:59 ` [PATCH v2 06/24] input: Port pm8xxx-vibrator " Michal Malý
2014-04-22 13:59 ` [PATCH v2 07/24] input: Port hid-axff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 08/24] input: Port hid-emsff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 09/24] input: Port hid-dr " Michal Malý
2014-04-23 13:41 ` Oliver Neukum
[not found] ` <5sjip0.n4hp0o.2szhuh-qmf@smtp.devoid-pointer.net>
[not found] ` <20140423154201.GA10531@core.coreip.homeip.net>
2014-04-23 15:47 ` simon
2014-04-23 15:57 ` Michal Malý
2014-04-24 10:32 ` Michal Malý
2014-04-27 8:22 ` Oliver Neukum
2014-04-22 13:59 ` [PATCH v2 10/24] input: Port hid-gaff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 11/24] input: Port hid-holtekff " Michal Malý
2014-04-23 12:17 ` Oliver Neukum
2014-04-23 12:31 ` Michal Malý
2014-04-23 16:02 ` Dmitry Torokhov
2014-04-22 13:59 ` [PATCH v2 12/24] input: Port hid-lgff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 13/24] input: Port hid-lg3ff " Michal Malý
2014-04-22 13:59 ` [PATCH v2 14/24] input: Port hid-pl " Michal Malý
2014-04-22 14:00 ` [PATCH v2 15/24] input: Port hid-sjoy " Michal Malý
2014-04-22 14:00 ` [PATCH v2 16/24] input: Port hid-sony " Michal Malý
2014-04-22 14:00 ` [PATCH v2 17/24] input: Port hid-tmff " Michal Malý
2014-04-22 14:00 ` [PATCH v2 18/24] input: Port hid-wiimote-modules " Michal Malý
2014-04-22 14:00 ` [PATCH v2 19/24] input: Port hid-zpff " Michal Malý
2014-04-22 14:00 ` [PATCH v2 20/24] input: Port gamecon " Michal Malý
2014-04-22 14:00 ` [PATCH v2 21/24] input: Port xpad " Michal Malý
2014-04-22 14:00 ` [PATCH v2 22/24] input: Port hid-lg2ff " Michal Malý
2014-04-22 14:00 ` [PATCH v2 23/24] input: Port hid-lg4ff " Michal Malý
2014-04-22 14:00 ` [PATCH v2 24/24] input: Replace ff-memless with ff-memless-next Michal Malý
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398175209-9565-3-git-send-email-madcatxster@devoid-pointer.net \
--to=madcatxster@devoid-pointer.net \
--cc=anssi.hannula@iki.fi \
--cc=dmitry.torokhov@gmail.com \
--cc=elias.vds@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=simon@mungewell.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).