From patchwork Wed Apr 9 11:17:55 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: 3954401 Return-Path: X-Original-To: patchwork-linux-input@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 DD6EB9F38C for ; Wed, 9 Apr 2014 11:18:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B91392052D for ; Wed, 9 Apr 2014 11:18:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8039E2052C for ; Wed, 9 Apr 2014 11:18:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932542AbaDILSA (ORCPT ); Wed, 9 Apr 2014 07:18:00 -0400 Received: from devoid-pointer.net ([31.31.77.140]:52589 "EHLO devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932569AbaDILR7 convert rfc822-to-8bit (ORCPT ); Wed, 9 Apr 2014 07:17:59 -0400 Received: from sigyn.localnet (228.123.broadband5.iol.cz [88.100.123.228]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by devoid-pointer.net (Postfix) with ESMTPSA id C1DFD21062; Wed, 9 Apr 2014 13:17:55 +0200 (CEST) From: Michal =?ISO-8859-1?Q?Mal=FD?= To: dmitry.torokhov@gmail.com, jkosina@suse.cz Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Elias Vanderstuyft Subject: [PATCH 06/24] Port pm8xxx-vibrator to ff-memless-next Date: Wed, 09 Apr 2014 13:17:55 +0200 Message-ID: <5798897.DMOHYaxkqk@sigyn> User-Agent: KMail/4.13 rc (Linux/3.14.0-1-ARCHMOD; KDE/4.12.97; x86_64; ; ) In-Reply-To: <1609685.QRL9N9sQvX@sigyn> References: <1609685.QRL9N9sQvX@sigyn> 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.2 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 pm8xxx-vibrator to ff-memless-next Signed-off-by: Michal Malý --- drivers/input/misc/Kconfig | 2 +- drivers/input/misc/pm8xxx-vibrator.c | 28 +++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 6ba327f..300b5a8 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -108,7 +108,7 @@ config INPUT_PCSPKR config INPUT_PM8XXX_VIBRATOR tristate "Qualcomm PM8XXX vibrator support" depends on MFD_PM8XXX - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT help This option enables device driver support for the vibrator on Qualcomm PM8xxx chip. This driver supports ff-memless interface diff --git a/drivers/input/misc/pm8xxx-vibrator.c b/drivers/input/misc/pm8xxx-vibrator.c index b88b7cb..6b0e9eb 100644 --- a/drivers/input/misc/pm8xxx-vibrator.c +++ b/drivers/input/misc/pm8xxx-vibrator.c @@ -17,6 +17,7 @@ #include #include #include +#include #define VIB_DRV 0x4A @@ -29,7 +30,7 @@ #define VIB_MAX_LEVELS (VIB_MAX_LEVEL_mV - VIB_MIN_LEVEL_mV) #define MAX_FF_SPEED 0xff - +#define FF_UPDATE_RATE 50 /** * struct pm8xxx_vib - structure to hold vibrator data * @vib_input_dev: input device supporting force feedback @@ -128,14 +129,23 @@ static void pm8xxx_vib_close(struct input_dev *dev) * Currently this driver supports only rumble effects. */ static int pm8xxx_vib_play_effect(struct input_dev *dev, void *data, - struct ff_effect *effect) + const struct mlnx_command *command) { struct pm8xxx_vib *vib = input_get_drvdata(dev); - - vib->speed = effect->u.rumble.strong_magnitude >> 8; - if (!vib->speed) - vib->speed = effect->u.rumble.weak_magnitude >> 9; - + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; + + switch (command->cmd) { + case MLNX_START_RUMBLE: + vib->speed = rumble_force->strong >> 8; + if (!vib->speed) + vib->speed = rumble_force->weak >> 9; + break; + case MLNX_STOP_RUMBLE: + vib->speed = 0; + break; + default: + return -EINVAL; + } schedule_work(&vib->work); return 0; @@ -182,8 +192,8 @@ static int pm8xxx_vib_probe(struct platform_device *pdev) input_set_drvdata(input_dev, vib); input_set_capability(vib->vib_input_dev, EV_FF, FF_RUMBLE); - error = input_ff_create_memless(input_dev, NULL, - pm8xxx_vib_play_effect); + error = input_ff_create_mlnx(input_dev, NULL, + pm8xxx_vib_play_effect, FF_UPDATE_RATE); if (error) { dev_err(&pdev->dev, "couldn't register vibrator as FF device\n");