From patchwork Mon Jun 18 14:35:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 10471757 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 4CCFB6032A for ; Mon, 18 Jun 2018 14:36:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DA39287F0 for ; Mon, 18 Jun 2018 14:36:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 325FC28A42; Mon, 18 Jun 2018 14:36:24 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 B99B0287F0 for ; Mon, 18 Jun 2018 14:36:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934556AbeFROgV (ORCPT ); Mon, 18 Jun 2018 10:36:21 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:33468 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934711AbeFROgU (ORCPT ); Mon, 18 Jun 2018 10:36:20 -0400 Received: by mail-pg0-f68.google.com with SMTP id e11-v6so7631727pgq.0 for ; Mon, 18 Jun 2018 07:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EPkZc+nDD8WorWc97gJveY1wE318d7gWEoVEFw/ZLJE=; b=Vb7j1L1M6RtU5KrBqAdFI2yZznJqVKph5RW6XLHo4P37y7sPW2hCfR71ZXdeydst0J QjOXvHWQvOZH+myVLgj52R44nZvH4E1vpA8Ht0X7hl4nSJ2j2RY/w8iBwWqgeQW3mXtq oJshjU3sZYmRv4gAyYquawdCF7F/ZEH2OZnW8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EPkZc+nDD8WorWc97gJveY1wE318d7gWEoVEFw/ZLJE=; b=BSU/RgEanwEWZYhfM/r545iKjdXFLWHDKxOZ89iXwBg8KyZyo5R6cZL7nMflF9nNa0 sE17JS7GwbWcdT6mBTBgP8/OjZABCqRMf7yZ8WhVXo3mao9RzAiyqc02F5Ic/Me3Gq6f jZvz5ko43peaHN/CwCT5hnfUQfxzBl8e+T60JmfIR2+T80NjnmFJl/kOMdzRxXVIYn10 1MQJIKdIPanevnOV2yQsfsgeaOkaDREW34fRaY0wkmjUzRR/BHVuNZ+jOL9OyETrusQl s4+7zXj6Ve0YdFyD4S05BudTSeLW9jq/u4qZWuCiE0d9z06B2b8LRPjouLRcUWOMlF/y uYsg== X-Gm-Message-State: APt69E2d0GKM0h8VQjF4al8C5Q/MipC8G0qQ0V7sZg3h1KTMwWTO1aqz HQ/gIvWluq80RCYf7apf32cd2MgghaU= X-Google-Smtp-Source: ADUXVKJrS989kruBMaR+lTvDa9TPPPJO3d+rF5ez9TxvLSic7XeajY8couo1MeynuCh3fAQ4ePTzGQ== X-Received: by 2002:a65:4545:: with SMTP id x5-v6mr11250411pgr.4.1529332579234; Mon, 18 Jun 2018 07:36:19 -0700 (PDT) Received: from localhost.localdomain ([27.59.118.133]) by smtp.gmail.com with ESMTPSA id n10-v6sm28163604pfb.27.2018.06.18.07.36.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 07:36:18 -0700 (PDT) From: Vinod Koul X-Google-Original-From: Vinod Koul To: linux-input@vger.kernel.org, linux-pm@vger.kernel.org Cc: Dmitry Torokhov , Rob Herring , Sebastian Reichel , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org, Vinod Koul Subject: [PATCH 4/5] input: pm8941-pwrkey: Abstract register offsets and event code Date: Mon, 18 Jun 2018 20:05:47 +0530 Message-Id: <20180618143548.29900-5-vkoul@kernel.org> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180618143548.29900-1-vkoul@kernel.org> References: <20180618143548.29900-1-vkoul@kernel.org> 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 In order to support resin thru the pwrkey driver (they are very similar in nature) we need to abstract the handling in this driver. First we abstract pull_up_bit and status_bit along in driver data. The event code sent for key events is quiried from DT. Since the device can be child of pon lookup regmap and reg from parent if lookup fails (we are child). Signed-off-by: Vinod Koul --- drivers/input/misc/pm8941-pwrkey.c | 56 +++++++++++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c index 18ad956454f1..aedb6ea2b50a 100644 --- a/drivers/input/misc/pm8941-pwrkey.c +++ b/drivers/input/misc/pm8941-pwrkey.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -42,6 +43,10 @@ #define PON_DBC_CTL 0x71 #define PON_DBC_DELAY_MASK 0x7 +struct pm8941_data { + unsigned int pull_up_bit; + unsigned int status_bit; +}; struct pm8941_pwrkey { struct device *dev; @@ -52,6 +57,9 @@ struct pm8941_pwrkey { unsigned int revision; struct notifier_block reboot_notifier; + + unsigned int code; + const struct pm8941_data *data; }; static int pm8941_reboot_notify(struct notifier_block *nb, @@ -124,7 +132,8 @@ static irqreturn_t pm8941_pwrkey_irq(int irq, void *_data) if (error) return IRQ_HANDLED; - input_report_key(pwrkey->input, KEY_POWER, !!(sts & PON_KPDPWR_N_SET)); + input_report_key(pwrkey->input, pwrkey->code, + !!(sts & pwrkey->data->status_bit)); input_sync(pwrkey->input); return IRQ_HANDLED; @@ -157,6 +166,7 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) { struct pm8941_pwrkey *pwrkey; bool pull_up; + struct device *parent; u32 req_delay; int error; @@ -175,11 +185,20 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) return -ENOMEM; pwrkey->dev = &pdev->dev; + pwrkey->data = of_device_get_match_data(&pdev->dev); - pwrkey->regmap = dev_get_regmap(pdev->dev.parent, NULL); + parent = pdev->dev.parent; + pwrkey->regmap = dev_get_regmap(parent, NULL); if (!pwrkey->regmap) { - dev_err(&pdev->dev, "failed to locate regmap\n"); - return -ENODEV; + /* + * we failed to get regmap for parent, check if + * parent->parent has it (device would be child of pon) + */ + pwrkey->regmap = dev_get_regmap(parent->parent, NULL); + if (!pwrkey->regmap) { + dev_err(&pdev->dev, "failed to locate regmap\n"); + return -ENODEV; + } } pwrkey->irq = platform_get_irq(pdev, 0); @@ -190,8 +209,13 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) error = of_property_read_u32(pdev->dev.of_node, "reg", &pwrkey->baseaddr); - if (error) - return error; + if (error) { + /* check if parent has reg before bailing */ + error = of_property_read_u32(pdev->dev.parent->of_node, + "reg", &pwrkey->baseaddr); + if (error) + return error; + } error = regmap_read(pwrkey->regmap, pwrkey->baseaddr + PON_REV2, &pwrkey->revision); @@ -200,13 +224,20 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) return error; } + error = of_property_read_u32(pdev->dev.of_node, "linux,code", + &pwrkey->code); + if (error) { + dev_err(&pdev->dev, "no linux,code assuming power%d\n", error); + pwrkey->code = KEY_POWER; + } + pwrkey->input = devm_input_allocate_device(&pdev->dev); if (!pwrkey->input) { dev_dbg(&pdev->dev, "unable to allocate input device\n"); return -ENOMEM; } - input_set_capability(pwrkey->input, EV_KEY, KEY_POWER); + input_set_capability(pwrkey->input, EV_KEY, pwrkey->code); pwrkey->input->name = "pm8941_pwrkey"; pwrkey->input->phys = "pm8941_pwrkey/input0"; @@ -225,8 +256,8 @@ static int pm8941_pwrkey_probe(struct platform_device *pdev) error = regmap_update_bits(pwrkey->regmap, pwrkey->baseaddr + PON_PULL_CTL, - PON_KPDPWR_PULL_UP, - pull_up ? PON_KPDPWR_PULL_UP : 0); + pwrkey->data->pull_up_bit, + pull_up ? pwrkey->data->pull_up_bit : 0); if (error) { dev_err(&pdev->dev, "failed to set pull: %d\n", error); return error; @@ -271,8 +302,13 @@ static int pm8941_pwrkey_remove(struct platform_device *pdev) return 0; } +static const struct pm8941_data pwrkey_data = { + .pull_up_bit = PON_KPDPWR_PULL_UP, + .status_bit = PON_KPDPWR_N_SET, +}; + static const struct of_device_id pm8941_pwr_key_id_table[] = { - { .compatible = "qcom,pm8941-pwrkey" }, + { .compatible = "qcom,pm8941-pwrkey", .data = &pwrkey_data }, { } }; MODULE_DEVICE_TABLE(of, pm8941_pwr_key_id_table);