From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B322C433DF for ; Thu, 13 Aug 2020 00:56:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EA52420774 for ; Thu, 13 Aug 2020 00:56:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="kNTAZ5NI"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sZ9TH9eQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EA52420774 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=oHdGpw71TUYpixMBAlHVxdvqYmRTMmMKqCFzJhoeiVQ=; b=kNTAZ5NI7dPS+uanvAugvoTpY E5gPYr3evf4SaULIfsLPfP+PBD/wRr2G8OmJL4z0zkHnpKRcNb9BUXywt1m540e7fQHcHl46f6mnQ baVZ2Xv2Ivm8FulPx+2z9/G/JQFPoYsRD0zYzY0PUfHUA0JDRaHZucpZLSep1JdHc1jvAuqvCBID9 ybXkMTqvOX6a6Gau0vuBwZvrKRJqCzsdcC5I59Irq8yfMsk5A3fkdr4a7LSAjS1pIgpeV3mHFHng6 psgXBzhyb95BtEzn3Xa62M6zZKX+kCni26O0+UyeFY4jsKKA7xudnP+v962FBhPuYI0syHdEs31sh uvHv/4sJg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k61WY-0004GJ-1l; Thu, 13 Aug 2020 00:55:18 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k61WU-0004FA-Vo; Thu, 13 Aug 2020 00:55:15 +0000 Received: by mail-pl1-x643.google.com with SMTP id bh1so1863183plb.12; Wed, 12 Aug 2020 17:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=L72AixCjmIL5nTmTYWBqEVGjNBVygWMA6aC5X+fGUQg=; b=sZ9TH9eQbB30KGwF/1m6APTfHpivFvCrS29509/UKJ1ZyLdwwO39FO+8ZHyTLjoc2K bvoEWCl/KPIB8uJl+wS4Ye6l119GxmtS/O4LGDfdfpd/YKHgIHdRExDaLPlNllgQkieK 2+MUHAi2kqU4x4EIptTMdIm0ZaDkfOvgcyOpBL8lwW0vTb88eSQQCQnCkxaSgT39DTB7 AI2iBO+3TFhvHwjflmx6zx1kTPM9FiLj/xsBS4r/4U4p8Fbl5AGQBRzdvnzzxh2jyaPA Vf+H5qqmwrAMyzfq2P8rtN+VzimQbnuDvvuSWkq9K73hlXwBMFojMTQLm3FJX1dV23bd 8kyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=L72AixCjmIL5nTmTYWBqEVGjNBVygWMA6aC5X+fGUQg=; b=Tsx3c7dzaNL8Rb91LpQGaxApYJeAE4rx8rNW9/qCxNVTHEQnnR/QmE5/Ia2RyFU6BL 8CSy208iM+kLrqeAAxFpOlN+N/gmzinOaOm6YrbW1qapNyS3NnW1f7L6vxXCVIHj9ytP KSkR2ieee5KZ73GrGzVJAvPx3G+pYXPtiyaoZMgKnRmgHPF9r5O4gwCRsJFEFJ26o5RX 68uUVM3+dBGWIi/5dHmpEasZyqbqCdNM7TvNQNDIMC5+9zHqeFzht7q2V+WirWKfzpe1 43uoP9eTUkrU/sSeVPjnC0XSdi2I/9WN9FxFs+pC1togfPqet6Fvw2+xaQISopCfaF3d dhrw== X-Gm-Message-State: AOAM532pXtmaHQWnzLSAyoXABB0QV+sO2bMKABUYhCmx+pn7VqiqMR+F Eo+WQLSUx8vX+c/BZVarYkA= X-Google-Smtp-Source: ABdhPJw0GZ9/sb6W+cfplAXSHIBjU73nMYp8L7xjKLPlNkDwJuYwtVA8Cvx8pFGhtgSrX5IjvCN++A== X-Received: by 2002:a17:90a:1f8c:: with SMTP id x12mr2566640pja.186.1597280112671; Wed, 12 Aug 2020 17:55:12 -0700 (PDT) Received: from dtor-ws ([2620:15c:202:201:a6ae:11ff:fe11:fcc3]) by smtp.gmail.com with ESMTPSA id j10sm3571681pff.171.2020.08.12.17.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2020 17:55:12 -0700 (PDT) Date: Wed, 12 Aug 2020 17:55:09 -0700 From: Dmitry Torokhov To: Fengping Yu Subject: Re: [PATCH v17 2/3] drivers: input: keyboard: Add mtk keypad driver Message-ID: <20200813005509.GU1665100@dtor-ws> References: <20200810065128.3324-3-fengping.yu@mediatek.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200810065128.3324-3-fengping.yu@mediatek.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200812_205515_074012_B2DE0805 X-CRM114-Status: GOOD ( 33.68 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Marco Felsch , linux-kernel@vger.kernel.org, Rob Herring , linux-mediatek@lists.infradead.org, linux-input@vger.kernel.org, Yingjoe Chen , Andy Shevchenko , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Aug 10, 2020 at 02:51:28PM +0800, Fengping Yu wrote: > From: "fengping.yu" > > This patch adds matrix keypad support for Mediatek SoCs. > > Signed-off-by: fengping.yu > Reviewed-by: Marco Felsch > Reviewed-by: Andy Shevchenko > Reviewed-by: Mattijs Korpershoek > --- > drivers/input/keyboard/Kconfig | 11 ++ > drivers/input/keyboard/Makefile | 1 + > drivers/input/keyboard/mtk-kpd.c | 209 +++++++++++++++++++++++++++++++ > 3 files changed, 221 insertions(+) > create mode 100644 drivers/input/keyboard/mtk-kpd.c > > diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig > index 793ecbbda32c..1ee845c292c6 100644 > --- a/drivers/input/keyboard/Kconfig > +++ b/drivers/input/keyboard/Kconfig > @@ -782,6 +782,17 @@ config KEYBOARD_BCM > To compile this driver as a module, choose M here: the > module will be called bcm-keypad. > > +config KEYBOARD_MTK_KPD > + tristate "MediaTek Keypad Support" > + depends on ARCH_MEDIATEK || COMPILE_TEST > + select REGMAP_MMIO > + select INPUT_MATRIXKMAP > + help > + Say Y here if you want to use the keypad on MediaTek SoCs. > + If unsure, say N. > + To compile this driver as a module, choose M here: the > + module will be called mtk-kpd. > + > config KEYBOARD_MTK_PMIC > tristate "MediaTek PMIC keys support" > depends on MFD_MT6397 > diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile > index 1d689fdd5c00..6c9d852c377e 100644 > --- a/drivers/input/keyboard/Makefile > +++ b/drivers/input/keyboard/Makefile > @@ -43,6 +43,7 @@ obj-$(CONFIG_KEYBOARD_MATRIX) += matrix_keypad.o > obj-$(CONFIG_KEYBOARD_MAX7359) += max7359_keypad.o > obj-$(CONFIG_KEYBOARD_MCS) += mcs_touchkey.o > obj-$(CONFIG_KEYBOARD_MPR121) += mpr121_touchkey.o > +obj-$(CONFIG_KEYBOARD_MTK_KPD) += mtk-kpd.o > obj-$(CONFIG_KEYBOARD_MTK_PMIC) += mtk-pmic-keys.o > obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o > obj-$(CONFIG_KEYBOARD_NOMADIK) += nomadik-ske-keypad.o > diff --git a/drivers/input/keyboard/mtk-kpd.c b/drivers/input/keyboard/mtk-kpd.c > new file mode 100644 > index 000000000000..451b3bc61c6f > --- /dev/null > +++ b/drivers/input/keyboard/mtk-kpd.c > @@ -0,0 +1,209 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2019 MediaTek Inc. > + * Author Fengping Yu > + */ > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#define MTK_KPD_NAME "mtk-kpd" > +#define MTK_KPD_MEM 0x0004 > +#define MTK_KPD_DEBOUNCE 0x0018 > +#define MTK_KPD_DEBOUNCE_MASK GENMASK(13, 0) > +#define MTK_KPD_DEBOUNCE_MAX_US 256000 > +#define MTK_KPD_NUM_MEMS 5 > +#define MTK_KPD_NUM_BITS 136 /* 4*32+8 MEM5 only use 8 BITS */ > + > +struct mtk_keypad { > + struct regmap *regmap; > + struct input_dev *input_dev; > + struct clk *clk; > + void __iomem *base; > + u32 n_rows; > + u32 n_cols; > + DECLARE_BITMAP(keymap_state, MTK_KPD_NUM_BITS); > +}; > + > +static const struct regmap_config keypad_regmap_cfg = { > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = sizeof(u32), > + .max_register = 36, > +}; > + > +static irqreturn_t kpd_irq_handler(int irq, void *dev_id) > +{ > + struct mtk_keypad *keypad = dev_id; > + unsigned short *keycode = keypad->input_dev->keycode; > + DECLARE_BITMAP(new_state, MTK_KPD_NUM_BITS); > + DECLARE_BITMAP(change, MTK_KPD_NUM_BITS); > + int bit_nr; > + int pressed; > + unsigned short code; > + > + regmap_bulk_read(keypad->regmap, MTK_KPD_MEM, > + new_state, MTK_KPD_NUM_MEMS); > + > + bitmap_xor(change, new_state, keypad->keymap_state, MTK_KPD_NUM_BITS); > + > + for_each_set_bit(bit_nr, change, MTK_KPD_NUM_BITS) { Should we be explicit: if (bit_nr % 32 >= 16) // or "if ((bit_nr / 16) % 2)" continue; so that we sure we do not trip over garbage (if any) in the unused bits? > + /* 1: not pressed, 0: pressed */ > + pressed = !test_bit(bit_nr, new_state); > + dev_dbg(&keypad->input_dev->dev, "%s", > + pressed ? "pressed" : "released"); > + > + /* 32bit register only use low 16bit as keypad mem register */ > + code = keycode[bit_nr - 16 * (BITS_TO_U32(bit_nr) - 1)]; This will give index of 16 for (0,0). Is this what we want? Hmm, this is all weird... I think we need: row = bit_nr / 32; col = bit_nr % 32; if (col > 15) continue; // set row_shift in probe() as: // keypad_data->row_shift = // get_count_order(keypad_data->n_cols); code = keycode[MATRIX_SCAN_CODE(row, col, keypad_data->row_shift)]; This will properly unpack the keymap built by matrix_keypad_build_keymap(). > + > + input_report_key(keypad->input_dev, code, pressed); > + input_sync(keypad->input_dev); > + > + dev_dbg(&keypad->input_dev->dev, > + "report Linux keycode = %d\n", code); > + } > + > + bitmap_copy(keypad->keymap_state, new_state, MTK_KPD_NUM_BITS); > + > + return IRQ_HANDLED; > +} > + > +static void kpd_clk_disable(void *data) > +{ > + clk_disable_unprepare(data); > +} > + > +static int kpd_pdrv_probe(struct platform_device *pdev) > +{ > + struct mtk_keypad *keypad; > + unsigned int irq; > + u32 debounce; > + bool wakeup; > + int ret; Can we call this variable "error" please? > + > + keypad = devm_kzalloc(&pdev->dev, sizeof(*keypad), GFP_KERNEL); > + if (!keypad) > + return -ENOMEM; > + > + keypad->base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(keypad->base)) > + return PTR_ERR(keypad->base); > + > + keypad->regmap = devm_regmap_init_mmio(&pdev->dev, > + keypad->base, > + &keypad_regmap_cfg); > + if (IS_ERR(keypad->regmap)) { > + dev_err(&pdev->dev, > + "regmap init failed:%pe\n", keypad->regmap); > + return PTR_ERR(keypad->regmap); > + } > + > + bitmap_fill(keypad->keymap_state, MTK_KPD_NUM_BITS); > + > + keypad->input_dev = devm_input_allocate_device(&pdev->dev); > + if (!keypad->input_dev) { > + dev_err(&pdev->dev, "Failed to allocate input dev\n"); > + return -ENOMEM; > + } > + > + keypad->input_dev->name = MTK_KPD_NAME; > + keypad->input_dev->id.bustype = BUS_HOST; > + > + ret = matrix_keypad_parse_properties(&pdev->dev, &keypad->n_rows, > + &keypad->n_cols); > + if (ret) { > + dev_err(&pdev->dev, "Failed to parse keypad params\n"); > + return ret; > + } > + > + if (device_property_read_u32(&pdev->dev, "mediatek,debounce-us", > + &debounce)) > + debounce = 16000; > + > + if (debounce > MTK_KPD_DEBOUNCE_MAX_US) { > + dev_err(&pdev->dev, "Debounce time exceeds the maximum allowed time %dus\n", > + MTK_KPD_DEBOUNCE_MAX_US); > + return -EINVAL; > + } > + > + wakeup = device_property_read_bool(&pdev->dev, "wakeup-source"); > + > + dev_dbg(&pdev->dev, "n_row=%d n_col=%d debounce=%d\n", > + keypad->n_rows, keypad->n_cols, debounce); > + > + ret = matrix_keypad_build_keymap(NULL, NULL, > + keypad->n_rows, > + keypad->n_cols, > + NULL, > + keypad->input_dev); > + if (ret) { > + dev_err(&pdev->dev, "Failed to build keymap\n"); > + return ret; > + } > + > + regmap_write(keypad->regmap, MTK_KPD_DEBOUNCE, > + debounce * 32 / 1000 & MTK_KPD_DEBOUNCE_MASK); > + > + keypad->clk = devm_clk_get(&pdev->dev, "kpd"); > + if (IS_ERR(keypad->clk)) > + return PTR_ERR(keypad->clk); > + > + ret = clk_prepare_enable(keypad->clk); > + if (ret) { > + dev_err(&pdev->dev, "cannot prepare/enable keypad clock\n"); > + return ret; > + } > + > + ret = devm_add_action_or_reset(&pdev->dev, kpd_clk_disable, keypad->clk); > + if (ret) > + return ret; > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) > + return irq; > + > + ret = devm_request_threaded_irq(&pdev->dev, irq, > + NULL, kpd_irq_handler, IRQF_ONESHOT, > + MTK_KPD_NAME, keypad); > + if (ret) { > + dev_err(&pdev->dev, "Failed to request IRQ#%d:%d\n", > + irq, ret); > + return ret; > + } > + > + ret = input_register_device(keypad->input_dev); > + if (ret) { > + dev_err(&pdev->dev, "Failed to register device\n"); > + return ret; > + } > + > + ret = device_init_wakeup(&pdev->dev, wakeup); > + if (ret) > + dev_warn(&pdev->dev, "device_init_wakeup fail\n"); > + > + return 0; > +} > + > +static const struct of_device_id kpd_of_match[] = { > + { .compatible = "mediatek,mt6779-keypad" }, > + { .compatible = "mediatek,mt6873-keypad" }, > + { /* sentinel */ } > +}; > + > +static struct platform_driver kpd_pdrv = { > + .probe = kpd_pdrv_probe, > + .driver = { > + .name = MTK_KPD_NAME, > + .of_match_table = kpd_of_match, > + }, > +}; > +module_platform_driver(kpd_pdrv); > + > +MODULE_AUTHOR("Mediatek Corporation"); > +MODULE_DESCRIPTION("MTK Keypad (KPD) Driver"); > +MODULE_LICENSE("GPL"); > -- > 2.18.0 Thanks. -- Dmitry _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel