From patchwork Thu Jul 30 01:36:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 6897931 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 178119F39D for ; Thu, 30 Jul 2015 01:38:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 31A392051D for ; Thu, 30 Jul 2015 01:38:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B9AA2051C for ; Thu, 30 Jul 2015 01:38:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754320AbbG3Bi3 (ORCPT ); Wed, 29 Jul 2015 21:38:29 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:48829 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754458AbbG3BhB (ORCPT ); Wed, 29 Jul 2015 21:37:01 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NSA008GL1TNNV20@mailout4.w1.samsung.com>; Thu, 30 Jul 2015 02:36:59 +0100 (BST) X-AuditID: cbfec7f5-f794b6d000001495-a3-55b97fbb0891 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 49.A1.05269.BBF79B55; Thu, 30 Jul 2015 02:36:59 +0100 (BST) Received: from localhost.localdomain ([10.252.80.64]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NSA00C2W1TAJX10@eusync3.samsung.com>; Thu, 30 Jul 2015 02:36:59 +0100 (BST) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , linux-kernel@vger.kernel.org, Dmitry Torokhov , Dan Murphy , Jaewon Kim , linux-input@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 2/4] Input: max77693: Prepare for adding support for Maxim 77843 Date: Thu, 30 Jul 2015 10:36:42 +0900 Message-id: <1438220204-377-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1438220204-377-1-git-send-email-k.kozlowski@samsung.com> References: <1438220204-377-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprJLMWRmVeSWpSXmKPExsVy+t/xq7q763eGGmx4JGcx9eETNovDi14w WnSf3sJqsaPhCKvF6xeGFt+udDBZ3Pz0jdXi8q45bA4cHjtn3WX32LSqk82jb8sqRo/jN7Yz eXzeJBfAGsVlk5Kak1mWWqRvl8CVMf37P+aCWVIVTQ/2MzUwPhPtYuTkkBAwkZj4biUjhC0m ceHeerYuRi4OIYGljBK7VlyBcv4zSvxcdpoFpIpNwFhi8/IlYAkRgV+MElu/T2AFSTALGEr8 fPeHHcQWFgiV6Dx9Cmwsi4CqRMukQ2DNvAKuEo/2dUKtk5M4eWwyWC+ngJtE9/HTTCC2EFBN 14r9bBMYeRcwMqxiFE0tTS4oTkrPNdIrTswtLs1L10vOz93ECAmwrzsYlx6zOsQowMGoxMM7 Q2dHqBBrYllxZe4hRgkOZiURXlufnaFCvCmJlVWpRfnxRaU5qcWHGKU5WJTEeWfueh8iJJCe WJKanZpakFoEk2Xi4JRqYJzi9y2tb8+iqRqfTpnH56iWWCdtSz6XvDsprvnou+3z98qGK59Z m7ti8v8GXe6ON9WTi9qeMSxVTV0yqeXruiXzC/KvPFii91jvzIKNyZ8sy/lyl+1r38jCx5m+ XHHVtU0ahgUVLU/sBd8elGH7ua+r8Ijr1VONIVnuKafm8Cq2tDFciL2icUqJpTgj0VCLuag4 EQBh4R7sLAIAAA== Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-8.3 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 Prepare the driver for supporting two devices: Maxim 77693 and 77843: 1. Add table of device ids and store current device type for later usage. 2. Differentiate the haptic device configuration. Signed-off-by: Krzysztof Kozlowski Acked-by: Dmitry Torokhov --- drivers/input/misc/max77693-haptic.c | 41 ++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/input/misc/max77693-haptic.c b/drivers/input/misc/max77693-haptic.c index 8dc43c1ebf0e..4c0f67ab66d9 100644 --- a/drivers/input/misc/max77693-haptic.c +++ b/drivers/input/misc/max77693-haptic.c @@ -47,6 +47,8 @@ enum max77693_haptic_pwm_divisor { }; struct max77693_haptic { + enum max77693_types dev_type; + struct regmap *regmap_pmic; struct regmap *regmap_haptic; struct device *dev; @@ -81,16 +83,23 @@ static int max77693_haptic_set_duty_cycle(struct max77693_haptic *haptic) static int max77693_haptic_configure(struct max77693_haptic *haptic, bool enable) { - unsigned int value; + unsigned int value, config_reg; int error; - value = ((haptic->type << MAX77693_CONFIG2_MODE) | - (enable << MAX77693_CONFIG2_MEN) | - (haptic->mode << MAX77693_CONFIG2_HTYP) | - MAX77693_HAPTIC_PWM_DIVISOR_128); + switch (haptic->dev_type) { + case TYPE_MAX77693: + value = ((haptic->type << MAX77693_CONFIG2_MODE) | + (enable << MAX77693_CONFIG2_MEN) | + (haptic->mode << MAX77693_CONFIG2_HTYP) | + MAX77693_HAPTIC_PWM_DIVISOR_128); + config_reg = MAX77693_HAPTIC_REG_CONFIG2; + break; + default: + return -EINVAL; + } error = regmap_write(haptic->regmap_haptic, - MAX77693_HAPTIC_REG_CONFIG2, value); + config_reg, value); if (error) { dev_err(haptic->dev, "failed to update haptic config: %d\n", error); @@ -254,12 +263,23 @@ static int max77693_haptic_probe(struct platform_device *pdev) return -ENOMEM; haptic->regmap_pmic = max77693->regmap; - haptic->regmap_haptic = max77693->regmap_haptic; haptic->dev = &pdev->dev; haptic->type = MAX77693_HAPTIC_LRA; haptic->mode = MAX77693_HAPTIC_EXTERNAL_MODE; haptic->suspend_state = false; + /* Variant-specific init */ + haptic->dev_type = platform_get_device_id(pdev)->driver_data; + switch (haptic->dev_type) { + case TYPE_MAX77693: + haptic->regmap_haptic = max77693->regmap_haptic; + break; + default: + dev_err(&pdev->dev, "unsupported device type: %u\n", + haptic->dev_type); + return -EINVAL; + } + INIT_WORK(&haptic->work, max77693_haptic_play_work); /* Get pwm and regulatot for haptic device */ @@ -337,12 +357,19 @@ static int __maybe_unused max77693_haptic_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(max77693_haptic_pm_ops, max77693_haptic_suspend, max77693_haptic_resume); +static const struct platform_device_id max77693_haptic_id[] = { + { "max77693-haptic", TYPE_MAX77693 }, + {}, +}; +MODULE_DEVICE_TABLE(platform, max77693_haptic_id); + static struct platform_driver max77693_haptic_driver = { .driver = { .name = "max77693-haptic", .pm = &max77693_haptic_pm_ops, }, .probe = max77693_haptic_probe, + .id_table = max77693_haptic_id, }; module_platform_driver(max77693_haptic_driver);