Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756546AbaDVNvt (ORCPT ); Tue, 22 Apr 2014 09:51:49 -0400 Received: from prifuk.cz ([31.31.77.140]:49390 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756285AbaDVNqY (ORCPT ); Tue, 22 Apr 2014 09:46:24 -0400 From: =?UTF-8?q?Michal=20Mal=C3=BD?= 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 03/24] Port twl4030-vibra to ff-memless-next Date: Tue, 22 Apr 2014 15:45:53 +0200 Message-Id: <1398174374-9501-4-git-send-email-madcatxster@devoid-pointer.net> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398174374-9501-1-git-send-email-madcatxster@devoid-pointer.net> References: <1398174374-9501-1-git-send-email-madcatxster@devoid-pointer.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Michal Malý --- drivers/input/misc/Kconfig | 2 +- drivers/input/misc/twl4030-vibra.c | 31 +++++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 33e0f5d..1016a1b 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -407,7 +407,7 @@ config INPUT_TWL4030_VIBRA tristate "Support for TWL4030 Vibrator" depends on TWL4030_CORE select MFD_TWL4030_AUDIO - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT help This option enables support for TWL4030 Vibrator Driver. diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index 960ef2a..5274ad2 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c @@ -32,9 +32,11 @@ #include #include #include +#include /* MODULE ID2 */ #define LEDEN 0x00 +#define FF_UPDATE_RATE 50 /* ForceFeedback */ #define EFFECT_DIR_180_DEG 0x8000 /* range is 0 - 0xFFFF */ @@ -134,14 +136,31 @@ static void vibra_play_work(struct work_struct *work) /*** Input/ForceFeedback ***/ static int vibra_play(struct input_dev *input, void *data, - struct ff_effect *effect) + const struct mlnx_effect_command *command) { struct vibra_info *info = input_get_drvdata(input); + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; + + switch (command->cmd) { + case MLNX_START_RUMBLE: + if (command->u.rumble_force.strong) { + info->speed = rumble_force->strong >> 8; + info->direction = rumble_force->strong_dir < EFFECT_DIR_180_DEG ? + 0 : 1; + } else { + info->speed = rumble_force->weak >> 9; + info->direction = rumble_force->weak_dir < EFFECT_DIR_180_DEG ? + 0 : 1; + } + break; + case MLNX_STOP_RUMBLE: + info->speed = 0; + info->direction = 0; + break; + default: + return -EINVAL; + } - info->speed = effect->u.rumble.strong_magnitude >> 8; - if (!info->speed) - info->speed = effect->u.rumble.weak_magnitude >> 9; - info->direction = effect->direction < EFFECT_DIR_180_DEG ? 0 : 1; schedule_work(&info->play_work); return 0; } @@ -227,7 +246,7 @@ static int twl4030_vibra_probe(struct platform_device *pdev) info->input_dev->close = twl4030_vibra_close; __set_bit(FF_RUMBLE, info->input_dev->ffbit); - ret = input_ff_create_memless(info->input_dev, NULL, vibra_play); + ret = input_ff_create_mlnx(info->input_dev, NULL, vibra_play, FF_UPDATE_RATE); if (ret < 0) { dev_dbg(&pdev->dev, "couldn't register vibrator to FF\n"); return ret; -- 1.9.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/