From patchwork Tue Apr 22 13:59:47 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: 4032711 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 95E039F1F4 for ; Tue, 22 Apr 2014 14:12:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BC34920211 for ; Tue, 22 Apr 2014 14:12:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC1DE200DC for ; Tue, 22 Apr 2014 14:12:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756210AbaDVOA3 (ORCPT ); Tue, 22 Apr 2014 10:00:29 -0400 Received: from transparentnimenzy.cz ([31.31.77.140]:49454 "EHLO smtp.devoid-pointer.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756027AbaDVOAT (ORCPT ); Tue, 22 Apr 2014 10:00:19 -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 DCE0220B70; Tue, 22 Apr 2014 16:00:14 +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 02/24] input: Port arizona-haptics to ff-memless-next Date: Tue, 22 Apr 2014 15:59:47 +0200 Message-Id: <1398175209-9565-3-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=unavailable 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 arizona-haptics to ff-memless-next Signed-off-by: Michal Malý --- 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 #include #include +#include #include #include @@ -22,6 +23,8 @@ #include #include +#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; }