From patchwork Tue Apr 22 13:59:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Michal_Mal=C3=BD?= X-Patchwork-Id: 4032251 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BCDBBBFF02 for ; Tue, 22 Apr 2014 14:01:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C63DF2022D for ; Tue, 22 Apr 2014 14:01:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B392220211 for ; Tue, 22 Apr 2014 14:00:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756267AbaDVOAg (ORCPT ); Tue, 22 Apr 2014 10:00:36 -0400 Received: from devoid-pointer.net ([31.31.77.140]:49459 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756194AbaDVOAU (ORCPT ); Tue, 22 Apr 2014 10:00:20 -0400 Received: from localhost (nat-prf72.natur.cuni.cz [195.113.58.72]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.devoid-pointer.net (Postfix) with ESMTPSA id F2F9820B73; Tue, 22 Apr 2014 16:00:16 +0200 (CEST) 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 v2 03/24] input: Port twl4030-vibra to ff-memless-next Date: Tue, 22 Apr 2014 15:59:48 +0200 Message-Id: <1398175209-9565-4-git-send-email-madcatxster@devoid-pointer.net> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1398175209-9565-1-git-send-email-madcatxster@devoid-pointer.net> References: <1398175209-9565-1-git-send-email-madcatxster@devoid-pointer.net> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Port twl4030-vibra to ff-memless-next 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;