From patchwork Wed Apr 9 11:17:10 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: 3954381 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 CDAF69F38C for ; Wed, 9 Apr 2014 11:17:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9BCAC2055C for ; Wed, 9 Apr 2014 11:17:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 674F820555 for ; Wed, 9 Apr 2014 11:17:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932674AbaDILRO (ORCPT ); Wed, 9 Apr 2014 07:17:14 -0400 Received: from prifuk.cz ([31.31.77.140]:52586 "EHLO devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932482AbaDILRO convert rfc822-to-8bit (ORCPT ); Wed, 9 Apr 2014 07:17:14 -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 2201E21062; Wed, 9 Apr 2014 13:17:10 +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 05/24] Port max8997_haptic to ff-memless-next Date: Wed, 09 Apr 2014 13:17:10 +0200 Message-ID: <3882714.y6Chz3cmQm@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 max8997_haptic to ff-memless-next Signed-off-by: Michal Malý --- drivers/input/misc/Kconfig | 2 +- drivers/input/misc/max8997_haptic.c | 25 +++++++++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig index 91dcae8..6ba327f 100644 --- a/drivers/input/misc/Kconfig +++ b/drivers/input/misc/Kconfig @@ -157,7 +157,7 @@ config INPUT_MAX8925_ONKEY config INPUT_MAX8997_HAPTIC tristate "MAXIM MAX8997 haptic controller support" depends on PWM && HAVE_PWM && MFD_MAX8997 - select INPUT_FF_MEMLESS + select INPUT_FF_MEMLESS_NEXT help This option enables device driver support for the haptic controller on MAXIM MAX8997 chip. This driver supports ff-memless interface diff --git a/drivers/input/misc/max8997_haptic.c b/drivers/input/misc/max8997_haptic.c index 1fea548..029ac8b 100644 --- a/drivers/input/misc/max8997_haptic.c +++ b/drivers/input/misc/max8997_haptic.c @@ -31,6 +31,7 @@ #include #include #include +#include /* Haptic configuration 2 register */ #define MAX8997_MOTOR_TYPE_SHIFT 7 @@ -43,6 +44,8 @@ #define MAX8997_SIG_DUTY_SHIFT 2 #define MAX8997_PWM_DUTY_SHIFT 0 +#define FF_UPDATE_RATE 50 + struct max8997_haptic { struct device *dev; struct i2c_client *client; @@ -219,13 +222,23 @@ static void max8997_haptic_play_effect_work(struct work_struct *work) } static int max8997_haptic_play_effect(struct input_dev *dev, void *data, - struct ff_effect *effect) + const struct mlnx_effect_command *command) { struct max8997_haptic *chip = input_get_drvdata(dev); + const struct mlnx_rumble_force *rumble_force = &command->u.rumble_force; - chip->level = effect->u.rumble.strong_magnitude; - if (!chip->level) - chip->level = effect->u.rumble.weak_magnitude; + switch (command->cmd) { + case MLNX_START_RUMBLE: + chip->level = rumble_force->strong; + if (!chip->level) + chip->level = rumble_force->weak; + break; + case MLNX_STOP_RUMBLE: + chip->level = 0; + break; + default: + return -EINVAL; + } schedule_work(&chip->work); @@ -319,8 +332,8 @@ static int max8997_haptic_probe(struct platform_device *pdev) input_set_drvdata(input_dev, chip); input_set_capability(input_dev, EV_FF, FF_RUMBLE); - error = input_ff_create_memless(input_dev, NULL, - max8997_haptic_play_effect); + error = input_ff_create_mlnx(input_dev, NULL, + max8997_haptic_play_effect, FF_UPDATE_RATE); if (error) { dev_err(&pdev->dev, "unable to create FF device, error: %d\n",