From patchwork Mon Jul 17 09:53:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 9844403 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 62CB060212 for ; Mon, 17 Jul 2017 09:54:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 557D326212 for ; Mon, 17 Jul 2017 09:54:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4997327F17; Mon, 17 Jul 2017 09:54:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E086926212 for ; Mon, 17 Jul 2017 09:54:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751320AbdGQJxw (ORCPT ); Mon, 17 Jul 2017 05:53:52 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:45547 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751303AbdGQJxv (ORCPT ); Mon, 17 Jul 2017 05:53:51 -0400 Received: by mail.free-electrons.com (Postfix, from userid 110) id 70410208DE; Mon, 17 Jul 2017 11:53:48 +0200 (CEST) Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 38853208AA; Mon, 17 Jul 2017 11:53:48 +0200 (CEST) From: Quentin Schulz To: dmitry.torokhov@gmail.com, wens@csie.org, lee.jones@linaro.org Cc: Quentin Schulz , hdegoede@redhat.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@free-electrons.com, maxime.ripard@free-electrons.com Subject: [PATCH 1/2] Input: axp20x-pek: add support for AXP221 PEK Date: Mon, 17 Jul 2017 11:53:06 +0200 Message-Id: <20170717095307.15986-2-quentin.schulz@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170717095307.15986-1-quentin.schulz@free-electrons.com> References: <20170717095307.15986-1-quentin.schulz@free-electrons.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The AXP221 has different values for startup time bits from the AXP20X. This patch introduces a different platform_device_id to the driver and adds the necessary code to handle the different platform_device_ids. Signed-off-by: Quentin Schulz --- drivers/input/misc/axp20x-pek.c | 62 ++++++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 10 deletions(-) diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c index 38c79ebff033..3efa1de51569 100644 --- a/drivers/input/misc/axp20x-pek.c +++ b/drivers/input/misc/axp20x-pek.c @@ -32,6 +32,7 @@ struct axp20x_pek { struct axp20x_dev *axp20x; struct input_dev *input; + struct attribute_group *attribute_group; int irq_dbr; int irq_dbf; }; @@ -41,14 +42,21 @@ struct axp20x_time { unsigned int idx; }; -static const struct axp20x_time startup_time[] = { +static const struct axp20x_time axp20x_startup_time[] = { { .time = 128, .idx = 0 }, { .time = 1000, .idx = 2 }, { .time = 3000, .idx = 1 }, { .time = 2000, .idx = 3 }, }; -static const struct axp20x_time shutdown_time[] = { +static const struct axp20x_time axp221_startup_time[] = { + { .time = 128, .idx = 0 }, + { .time = 1000, .idx = 1 }, + { .time = 2000, .idx = 2 }, + { .time = 3000, .idx = 3 }, +}; + +static const struct axp20x_time axp20x_shutdown_time[] = { { .time = 4000, .idx = 0 }, { .time = 6000, .idx = 1 }, { .time = 8000, .idx = 2 }, @@ -61,15 +69,20 @@ struct axp20x_pek_ext_attr { }; static struct axp20x_pek_ext_attr axp20x_pek_startup_ext_attr = { - .p_time = startup_time, + .p_time = axp20x_startup_time, .mask = AXP20X_PEK_STARTUP_MASK, }; static struct axp20x_pek_ext_attr axp20x_pek_shutdown_ext_attr = { - .p_time = shutdown_time, + .p_time = axp20x_shutdown_time, .mask = AXP20X_PEK_SHUTDOWN_MASK, }; +static struct axp20x_pek_ext_attr axp221_pek_startup_ext_attr = { + .p_time = axp221_startup_time, + .mask = AXP20X_PEK_STARTUP_MASK, +}; + static struct axp20x_pek_ext_attr *get_axp_ext_attr(struct device_attribute *attr) { return container_of(attr, struct dev_ext_attribute, attr)->var; @@ -148,6 +161,11 @@ static struct dev_ext_attribute axp20x_dev_attr_startup = { .var = &axp20x_pek_startup_ext_attr, }; +static struct dev_ext_attribute axp221_dev_attr_startup = { + .attr = __ATTR(startup, 0644, axp20x_show_ext_attr, axp20x_store_ext_attr), + .var = &axp221_pek_startup_ext_attr, +}; + static struct dev_ext_attribute axp20x_dev_attr_shutdown = { .attr = __ATTR(shutdown, 0644, axp20x_show_ext_attr, axp20x_store_ext_attr), .var = &axp20x_pek_shutdown_ext_attr, @@ -159,10 +177,20 @@ static struct attribute *axp20x_attributes[] = { NULL, }; +static struct attribute *axp221_attributes[] = { + &axp221_dev_attr_startup.attr.attr, + &axp20x_dev_attr_shutdown.attr.attr, + NULL, +}; + static const struct attribute_group axp20x_attribute_group = { .attrs = axp20x_attributes, }; +static const struct attribute_group axp221_attribute_group = { + .attrs = axp221_attributes, +}; + static irqreturn_t axp20x_pek_irq(int irq, void *pwr) { struct input_dev *idev = pwr; @@ -184,9 +212,10 @@ static irqreturn_t axp20x_pek_irq(int irq, void *pwr) static void axp20x_remove_sysfs_group(void *_data) { - struct device *dev = _data; + struct platform_device *pdev = _data; + struct axp20x_pek *axp_pek = platform_get_drvdata(pdev); - sysfs_remove_group(&dev->kobj, &axp20x_attribute_group); + sysfs_remove_group(&pdev->dev.kobj, axp_pek->attribute_group); } static int axp20x_pek_probe_input_device(struct axp20x_pek *axp20x_pek, @@ -313,17 +342,19 @@ static int axp20x_pek_probe(struct platform_device *pdev) return error; } - error = sysfs_create_group(&pdev->dev.kobj, &axp20x_attribute_group); + axp20x_pek->attribute_group = (struct attribute_group *)platform_get_device_id(pdev)->driver_data; + + error = sysfs_create_group(&pdev->dev.kobj, + axp20x_pek->attribute_group); if (error) { dev_err(&pdev->dev, "Failed to create sysfs attributes: %d\n", error); return error; } - error = devm_add_action(&pdev->dev, - axp20x_remove_sysfs_group, &pdev->dev); + error = devm_add_action(&pdev->dev, axp20x_remove_sysfs_group, pdev); if (error) { - axp20x_remove_sysfs_group(&pdev->dev); + axp20x_remove_sysfs_group(pdev); dev_err(&pdev->dev, "Failed to add sysfs cleanup action: %d\n", error); return error; @@ -358,8 +389,19 @@ static const struct dev_pm_ops axp20x_pek_pm_ops = { #endif }; +static const struct platform_device_id axp_pek_id_match[] = { + { + .name = "axp20x-pek", + .driver_data = (kernel_ulong_t)&axp20x_attribute_group, + }, { + .name = "axp221-pek", + .driver_data = (kernel_ulong_t)&axp221_attribute_group, + }, +}; + static struct platform_driver axp20x_pek_driver = { .probe = axp20x_pek_probe, + .id_table = axp_pek_id_match, .driver = { .name = "axp20x-pek", .pm = &axp20x_pek_pm_ops,