From patchwork Sat May 9 02:04:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fengping Yu X-Patchwork-Id: 11537867 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7349114C0 for ; Sat, 9 May 2020 02:20:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 50DE321655 for ; Sat, 9 May 2020 02:20:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="EcVg8k21"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="ZCfjx8+m" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50DE321655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aPbKAuiJfJ+fdTjeegN5vGrvVkWyor+Mm9tmXeG4e+8=; b=EcVg8k21wIx5+O VLxOta4RvlZklk/OBBRMk/G4qoamhhQD88Q4tzZfzXekAPctwOw/07H8OKR+joJTGW+dI2PoPc/8D C+jOofjAr9mBZBpcEwqRko59MvDWPJCg1dn7lZboa+3UA4LSIQ6SSDWhFXZP4wx9wYOthgbHs3d9h Rx8XS9dN3L+eu+WIxni7PQy1SSzwDqJEVB9lQ4uH95Yz+zLzALq1SvxKw9/UJh8a8+jyhmbqtDvRs C8yS5y0ao1ptxNSB0YsL45IsMpC1RsawLPUkcTK8Dy/4Pl4NWHHMCZ05lulUblNjvWeVDuMo+bZTm /HSijnq2PZp8wl/ZgK5g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jXF6C-00025C-K5; Sat, 09 May 2020 02:20:20 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jXF5w-0008TP-10; Sat, 09 May 2020 02:20:06 +0000 X-UUID: e2d48d213ec649c58c6592b17d48c408-20200508 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=NQ4Pb0x5/UXRB48kOzeFnv0h5Ut4Y2l+aTUUIM6e5EQ=; b=ZCfjx8+mM0iIShk0+Eq6ME1K0DYOucEiU2cgPgAmF5/ILpe46bqkNj50z9sc+xV46wZXaIBmRkG2n/eXIH+p99K0VxxVVsmdqjlYJ2zp+qPsUqk87siXiSHjK+fF4u9mU2x4yne9tpVl/VKkEb1/O8Wq/Xei/UAcxN13XysEIJM=; X-UUID: e2d48d213ec649c58c6592b17d48c408-20200508 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1936767380; Fri, 08 May 2020 18:19:56 -0800 Received: from MTKMBS02N2.mediatek.inc (172.21.101.101) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 8 May 2020 19:09:56 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 9 May 2020 10:09:53 +0800 Received: from localhost.localdomain (10.15.20.246) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sat, 9 May 2020 10:09:49 +0800 From: Fengping Yu To: Marco Felsch , Andy Shevchenko , Dmitry Torokhov , Yingjoe Chen Subject: [PATCH v6 1/3] dt-bindings: Change keypad documentation schema Date: Sat, 9 May 2020 10:04:59 +0800 Message-ID: <20200509020458.8359-2-fengping.yu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200509020458.8359-1-fengping.yu@mediatek.com> References: <20200509020458.8359-1-fengping.yu@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: D2C1052DCD8F07E6C954DA3FD14A1A5834520A776BC93C6B5DD1C47EBB8092012000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200508_192004_093544_18AB5913 X-CRM114-Status: GOOD ( 13.87 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 MIME_BASE64_TEXT RAW: Message text disguised using base64 encoding 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "fengping.yu" , linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org From: "fengping.yu" Change Mediatek matrix keypad dt-bindings doc to yaml schema. Signed-off-by: fengping.yu --- .../devicetree/bindings/input/mtk-kpd.txt | 61 ------------ .../devicetree/bindings/input/mtk-kpd.yaml | 93 +++++++++++++++++++ 2 files changed, 93 insertions(+), 61 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml diff --git a/Documentation/devicetree/bindings/input/mtk-kpd.txt b/Documentation/devicetree/bindings/input/mtk-kpd.txt deleted file mode 100644 index 8b154a5e2f7d..000000000000 --- a/Documentation/devicetree/bindings/input/mtk-kpd.txt +++ /dev/null @@ -1,61 +0,0 @@ -* Mediatek's Keypad Controller device tree binding - -Mediatek's Keypad controller is used to interface a SoC with a matrix-type -keypad device. The keypad controller supports multiple row and column lines. -A key can be placed at each intersection of a unique row and a unique column. -The keypad controller can sense a key-press and key-release and report the -event using a interrupt to the cpu. - -Required properties: -- compatible should contain: - * "mediatek,kp" for common keypad - * "mediatek,mt6779-keypad" for specific keypad chip - -- reg: The base address of the Keypad register bank. - -- interrupts: A single interrupt specifier. - -- mediatek,debounce-us: Debounce interval in microseconds, maximum value - is 256000 microseconds. - -- keypad,num-rows: Number of row lines connected to the keypad controller, it is - not equal to PCB rows number, instead you should add required value for each IC. - -- keypad,num-columns: Number of column lines connected to the keypad controller, - it is not equal to PCB columns number, instead you should add required value - for each IC. - -- linux,keymap: The keymap for keys as described in the binding document - devicetree/bindings/input/matrix-keymap.txt. - -- pinctrl: Should specify pin control groups used for this controller. - See ../pinctrl/pinctrl-bindings.txt for details. - -- clocks: Must contain one entry, for the module clock. - See ../clocks/clock-bindings.txt for details. - -- clock-names: Names of the clocks listed in clocks property in the same order. - -Optional Properties: -- wakeup-source: use any event on keypad as wakeup event. - -Example: - - keypad: kp@10010000 { - compatible = "mediatek,kp"; - reg = <0 0x10010000 0 0x1000>; - wakeup-source; - interrupts = ; - clocks = <&clk26m>; - clock-names = "kpd"; - }; - - &keypad { - mediatek,debounce-us = <32000>; - keypad,num-rows = <8>; - keypad,num-columns = <9>; - linux,keymap = < MATRIX_KEY(0x00, 0x00, KEY_VOLUMEDOWN) >; - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&kpd_gpios_def_cfg>; - }; diff --git a/Documentation/devicetree/bindings/input/mtk-kpd.yaml b/Documentation/devicetree/bindings/input/mtk-kpd.yaml new file mode 100644 index 000000000000..bd4247322e3c --- /dev/null +++ b/Documentation/devicetree/bindings/input/mtk-kpd.yaml @@ -0,0 +1,93 @@ +%YAML 1.2 +--- +version: 1 + +id: mtk-keypad + +title: Mediatek's Keypad Controller device tree bindings + +maintainer: + - name: Fengping Yu + +description: > + TODO + +properties: + - name: "compatible" + constraint: | + "mediatek,mt6779-keypad" + "mediatek, kp" + clock-names: + clocks: + interrupts: + linux,keymap + pinctrl-0: + pinctrl-names: + reg: + wakeup-source: + keypad,num-columns: + keypad,num-rows: + mediatek,debounce-us + status: +... +# * Mediatek's Keypad Controller device tree binding +# +# Mediatek's Keypad controller is used to interface a SoC with a matrix-type +# keypad device. The keypad controller supports multiple row and column lines. +# A key can be placed at each intersection of a unique row and a unique column. +# The keypad controller can sense a key-press and key-release and report the +# event using a interrupt to the cpu. +# +# Required properties: +# - compatible should contain: +# * "mediatek,kp" for common keypad +# * "mediatek,mt6779-keypad" for specific keypad chip +# +# - reg: The base address of the Keypad register bank. +# +# - interrupts: A single interrupt specifier. +# +# - mediatek,debounce-us: Debounce interval in microseconds, maximum value +# is 256000 microseconds. +# +# - keypad,num-rows: Number of row lines connected to the keypad controller, it is +# not equal to PCB rows number, instead you should add required value for each IC. +# +# - keypad,num-columns: Number of column lines connected to the keypad controller, +# it is not equal to PCB columns number, instead you should add required value +# for each IC. +# +# - linux,keymap: The keymap for keys as described in the binding document +# devicetree/bindings/input/matrix-keymap.txt. +# +# - pinctrl: Should specify pin control groups used for this controller. +# See ../pinctrl/pinctrl-bindings.txt for details. +# +# - clocks: Must contain one entry, for the module clock. +# See ../clocks/clock-bindings.txt for details. +# +# - clock-names: Names of the clocks listed in clocks property in the same order. +# +# Optional Properties: +# - wakeup-source: use any event on keypad as wakeup event. +# +# Example: +# +# keypad: kp@10010000 { +# compatible = "mediatek,kp"; +# reg = <0 0x10010000 0 0x1000>; +# wakeup-source; +# interrupts = ; +# clocks = <&clk26m>; +# clock-names = "kpd"; +# }; +# +# &keypad { +# mediatek,debounce-us = <32000>; +# keypad,num-rows = <8>; +# keypad,num-columns = <9>; +# linux,keymap = < MATRIX_KEY(0x00, 0x00, KEY_VOLUMEDOWN) >; +# status = "okay"; +# pinctrl-names = "default"; +# pinctrl-0 = <&kpd_gpios_def_cfg>; +# }; From patchwork Sat May 9 02:05:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fengping Yu X-Patchwork-Id: 11537871 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 077AB15AB for ; Sat, 9 May 2020 02:20:37 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D7EF521655 for ; Sat, 9 May 2020 02:20:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gRV4B9Ak"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Vz+kHNaY" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D7EF521655 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8vYUqDQqODf2jDPVu7mELmylviKqkUnulRsYv6VDN54=; b=gRV4B9AkSlgW1/ aLRsH4jl1YJViKjSpJV2b1kWnb4NgxNm0Y4sQYTTsae8M6KO51bLlSXnrjXC8QxBibPBjb2iWc3jn rqEudgOzgafWB1bF4XTMH7cmQ21iZ77GwdgNVwHYeL4abw2cbqkvQDQIwjeB/XA4OfokNjJhIfPg4 FarDuRDgct9B9Y4I/G5nNgAwUs3AT9f75d1QhWS28Pbv8A0RkYYMrOR8rwCzYfVG5z2tgV/n7JQ1c 7GM1i789GudtWaRyQuSglheNRLoEB/oVElMvoprhjyvULz9izjOmKNitXOm76MNjlHPi1i6ZNBFGG 1RtqdTlG2IAk+SAZ6H7w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jXF6R-0002NU-AQ; Sat, 09 May 2020 02:20:35 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jXF5w-0000HP-PZ; Sat, 09 May 2020 02:20:07 +0000 X-UUID: e8eec0de03a843ac8f38c68eb3278e60-20200508 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=81xNTuoRWHQ1E+Co+6xQL3nZR4fkw6v75tZFfgWakrM=; b=Vz+kHNaYTQjYWmHI0DxDyThW21MQ+UxOEddIbfobzU/tGAvWwsD+LzvhJH7ikCMY55tqiudoGy3TJLMdYMxzcteiBsoWJneApRDavAkN+LyYSg9m50nu16RCO9qcIklz7Mx84t4pcu+8pwrsBNOO2saOpqivV4XYkf92U2FdzBU=; X-UUID: e8eec0de03a843ac8f38c68eb3278e60-20200508 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1409651018; Fri, 08 May 2020 18:19:56 -0800 Received: from MTKMBS02N1.mediatek.inc (172.21.101.77) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 8 May 2020 19:10:19 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n1.mediatek.inc (172.21.101.77) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 9 May 2020 10:10:19 +0800 Received: from localhost.localdomain (10.15.20.246) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sat, 9 May 2020 10:10:06 +0800 From: Fengping Yu To: Marco Felsch , Andy Shevchenko , Dmitry Torokhov , Yingjoe Chen Subject: [PATCH v6 2/3] drivers: input: keyboard: Add mtk keypad driver Date: Sat, 9 May 2020 10:05:01 +0800 Message-ID: <20200509020458.8359-3-fengping.yu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200509020458.8359-1-fengping.yu@mediatek.com> References: <20200509020458.8359-1-fengping.yu@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200508_192004_894699_9E6C750B X-CRM114-Status: GOOD ( 17.07 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 MIME_BASE64_TEXT RAW: Message text disguised using base64 encoding 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "fengping.yu" , linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org From: "fengping.yu" This adds matrix keypad support for Mediatek SoCs. Signed-off-by: fengping.yu --- drivers/input/keyboard/Kconfig | 5 +- drivers/input/keyboard/mtk-kpd.c | 151 ++++++++++++++----------------- 2 files changed, 69 insertions(+), 87 deletions(-) diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 4a387d8683b1..4ed9eff681f1 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -774,9 +774,10 @@ config KEYBOARD_BCM config KEYBOARD_MTK_KPD tristate "MediaTek Keypad Support" + depends on OF && HAVE_CLK help - Say Y here if you want to use the keypad. - If unuse, say N. + 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. diff --git a/drivers/input/keyboard/mtk-kpd.c b/drivers/input/keyboard/mtk-kpd.c index 7f8f091b2734..a538f89d6696 100644 --- a/drivers/input/keyboard/mtk-kpd.c +++ b/drivers/input/keyboard/mtk-kpd.c @@ -4,16 +4,14 @@ * Author Terry Chang */ #include -#include -#include #include #include -#include #include -#include -#include +#include #include #include +#include +#include #define KPD_NAME "mtk-kpd" @@ -21,26 +19,30 @@ #define KP_DEBOUNCE 0x0018 #define KPD_DEBOUNCE_MASK GENMASK(13, 0) -#define KPD_DEBOUNCE_MAX 256000 +#define KPD_DEBOUNCE_MAX_US 256000 /*256ms */ #define KPD_NUM_MEMS 5 #define KPD_NUM_BITS 136 /* 4 * 32 + 8 MEM5 only use 8 BITS */ -#define BITS_TO_U32(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32)) struct mtk_keypad { + struct regmap *regmap; struct input_dev *input_dev; struct clk *clk; void __iomem *base; - unsigned int irqnr; bool wakeup; - u32 key_debounce; u32 n_rows; u32 n_cols; DECLARE_BITMAP(keymap_state, KPD_NUM_BITS); }; +static const struct regmap_config keypad_regmap_cfg = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = sizeof(u32), + .max_register = 0x0024, +}; + static irqreturn_t kpd_irq_handler(int irq, void *dev_id) { - /* use _nosync to avoid deadlock */ struct mtk_keypad *keypad = dev_id; unsigned short *keycode = keypad->input_dev->keycode; DECLARE_BITMAP(new_state, KPD_NUM_BITS); @@ -49,16 +51,17 @@ static irqreturn_t kpd_irq_handler(int irq, void *dev_id) int pressed; unsigned short code; - memcpy_fromio(new_state, keypad->base + KP_MEM, KPD_NUM_MEMS); + regmap_raw_read(keypad->regmap, KP_MEM, new_state, KPD_NUM_MEMS); bitmap_xor(change, new_state, keypad->keymap_state, KPD_NUM_BITS); for_each_set_bit(bit_nr, change, KPD_NUM_BITS) { - pressed = test_bit(bit_nr, new_state) == 0U; + /* 1: not pressed, 0: pressed */ + pressed = !test_bit(bit_nr, new_state); dev_dbg(&keypad->input_dev->dev, "%s", pressed ? "pressed" : "released"); - /* per 32bit register only use low 16bit as keypad mem register */ + /* 32bit register only use low 16bit as keypad mem register */ code = keycode[bit_nr - 16 * (BITS_TO_U32(bit_nr) - 1)]; input_report_key(keypad->input_dev, code, pressed); @@ -73,51 +76,29 @@ static irqreturn_t kpd_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } -static int kpd_get_dts_info(struct mtk_keypad *keypad) -{ - int ret; - struct device *dev = keypad->input_dev->dev.parent; - struct device_node *node = dev->of_node; - - ret = matrix_keypad_parse_properties(dev, &keypad->n_rows, - &keypad->n_cols); - - if (ret) { - dev_err(dev, "Failed to parse keypad params\n"); - return ret; - } - - ret = device_property_read_u32(dev, "mediatek,debounce-us", - &keypad->key_debounce); - if (ret) { - dev_err(dev, "Failed to read mediatek debounce time\n"); - return ret; - } - - if (keypad->key_debounce > KPD_DEBOUNCE_MAX) { - dev_err(dev, "Debounce time exceeds the maximum allowed time 256ms\n"); - return -EINVAL; - } - - keypad->wakeup = device_property_read_bool(node, "wakeup-source"); - - dev_dbg(dev, "n_row=%d n_col=%d debounce=%d\n", - keypad->n_rows, keypad->n_cols, - keypad->key_debounce); - - return 0; -} - static int kpd_pdrv_probe(struct platform_device *pdev) { struct mtk_keypad *keypad; struct pinctrl *keypad_pinctrl; struct pinctrl_state *kpd_default; + unsigned int irqnr; + u32 debounce; int ret; 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_clk(&pdev->dev, NULL, + keypad->base, &keypad_regmap_cfg); + if (IS_ERR(keypad->regmap)) { + dev_err(&pdev->dev, + "regmap init failed:%ld\n", PTR_ERR(keypad->regmap)); + return PTR_ERR(keypad->regmap); + } bitmap_fill(keypad->keymap_state, KPD_NUM_BITS); @@ -130,18 +111,35 @@ static int kpd_pdrv_probe(struct platform_device *pdev) keypad->input_dev->name = KPD_NAME; keypad->input_dev->id.bustype = BUS_HOST; - ret = kpd_get_dts_info(keypad); + 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; + } + + ret = device_property_read_u32(&pdev->dev, "mediatek,debounce-us", + &debounce); if (ret) { - dev_err(&pdev->dev, "Failed to get dts info\n"); + dev_err(&pdev->dev, "Failed to read mediatek debounce time\n"); return ret; } + if (debounce > KPD_DEBOUNCE_MAX_US) { + dev_err(&pdev->dev, "Debounce time exceeds the maximum allowed time 256ms\n"); + return -EINVAL; + } + + keypad->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; @@ -149,19 +147,8 @@ static int kpd_pdrv_probe(struct platform_device *pdev) input_set_drvdata(keypad->input_dev, keypad); - keypad->base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(keypad->base)) { - dev_err(&pdev->dev, "Failed to get resource and iomap keypad\n"); - return PTR_ERR(keypad->base); - } - - if (keypad->key_debounce > KPD_DEBOUNCE_MAX) { - dev_err(&pdev->dev, "Invalid debounce time value.\n"); - return -EINVAL; - } - - writew(keypad->key_debounce * 32 / 1000 & KPD_DEBOUNCE_MASK, - keypad->base + KP_DEBOUNCE); + regmap_write(keypad->regmap, KP_DEBOUNCE, + debounce * 32 / 1000 & KPD_DEBOUNCE_MASK); keypad->clk = devm_clk_get(&pdev->dev, "kpd"); if (IS_ERR(keypad->clk)) { @@ -174,57 +161,52 @@ static int kpd_pdrv_probe(struct platform_device *pdev) return ret; } + devm_add_action_or_reset(&pdev->dev, + (void (*)(void *))clk_disable_unprepare, + keypad->clk); + keypad_pinctrl = devm_pinctrl_get(&pdev->dev); if (IS_ERR(keypad_pinctrl)) { - ret = PTR_ERR(keypad_pinctrl); - goto disable_kpd_clk; + return PTR_ERR(keypad_pinctrl); } kpd_default = pinctrl_lookup_state(keypad_pinctrl, "default"); if (IS_ERR(kpd_default)) { dev_err(&pdev->dev, "No default pinctrl state\n"); - ret = PTR_ERR(kpd_default); - goto disable_kpd_clk; + return PTR_ERR(kpd_default); } pinctrl_select_state(keypad_pinctrl, kpd_default); - keypad->irqnr = platform_get_irq(pdev, 0); - if (keypad->irqnr < 0) { + irqnr = platform_get_irq(pdev, 0); + if (irqnr < 0) { dev_err(&pdev->dev, "Failed to get irq\n"); - ret = -keypad->irqnr; - goto disable_kpd_clk; + return -irqnr; } - ret = devm_request_irq(&pdev->dev, keypad->irqnr, - kpd_irq_handler, 0, + ret = devm_request_threaded_irq(&pdev->dev, irqnr, + NULL, kpd_irq_handler, 0, KPD_NAME, keypad); if (ret) { dev_err(&pdev->dev, "Failed to request IRQ#%d:%d\n", - keypad->irqnr, ret); - goto disable_kpd_clk; + irqnr, ret); + return ret; } ret = input_register_device(keypad->input_dev); if (ret) { dev_err(&pdev->dev, "Failed to register device\n"); - goto disable_kpd_clk; + return ret; } device_init_wakeup(&pdev->dev, keypad->wakeup); - platform_set_drvdata(pdev, keypad); - return 0; - -disable_kpd_clk: - clk_disable_unprepare(keypad->clk); - return ret; } static const struct of_device_id kpd_of_match[] = { {.compatible = "mediatek,kp"}, - {} + {/*sentinel*/} }; static struct platform_driver kpd_pdrv = { @@ -234,7 +216,6 @@ static struct platform_driver kpd_pdrv = { .of_match_table = kpd_of_match, }, }; - module_platform_driver(kpd_pdrv); MODULE_AUTHOR("Mediatek Corporation"); From patchwork Sat May 9 02:05:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fengping Yu X-Patchwork-Id: 11537863 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 87F1A92A for ; Sat, 9 May 2020 02:11:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 4D471218AC for ; Sat, 9 May 2020 02:11:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="udt7a7Xc"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="P/v6ztqm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4D471218AC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ai7oRg2V3AwpyR2dxridBfNh37VNykcituZ6DoNHdFQ=; b=udt7a7Xcbk7TZU CrQyBe0NNf+z1A6JNvEyLLUAFCRGp5W5buAgnPb7BI8c045wSk1NfQ+PGGVHNH03f+hIwzGeUGZJ6 4ve5+2LzBwrtcPexBCuUfz1ch2Exlr35VSilELGHG8JDMYVrhM7I9nlrgAhGXDbgHOfmS4gc3lslc xR2/Z7uPGWcoFAiPiykqI69HGT3BdyGsF7QUCBX4M7sh7NZxzhNSnlSq1h4v3bXhKNGs56BFrgoc3 9BYNt4lxRHJ1Fmz55PqP4cmkM5SsF5rPydyM0HrkX1SkysfH3hmTnbM8ZaCX84i3tHNTvI/+kl7U/ xPmkwTKxhKLHvKg9KTIw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jXExf-00040g-Oo; Sat, 09 May 2020 02:11:31 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jXExW-0003s2-SX; Sat, 09 May 2020 02:11:24 +0000 X-UUID: 75704eff49934046887191641b39f049-20200508 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=HTuAwQCBdXgvzm3xbEDiwOqzl1HXsQN9gZyGP3iYBws=; b=P/v6ztqmbV0uHqZl/Zs6t2c63tZRJ1IhuEMWnccLwGGXLdBLBXfNjzwnI/XQuZjpzaNLDL6x634NfeYymu6D/g3R48VPYzj2VMlP9Ru+xhQE3CnSNiBvCHW3AgdQDzMHJxbdYSZz9Gu7pPKEMjLGdyoUkxTZOR9BfNGL31OJ3jQ=; X-UUID: 75704eff49934046887191641b39f049-20200508 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 101874581; Fri, 08 May 2020 18:11:15 -0800 Received: from MTKMBS02N2.mediatek.inc (172.21.101.101) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 8 May 2020 19:10:43 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs02n2.mediatek.inc (172.21.101.101) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sat, 9 May 2020 10:10:40 +0800 Received: from localhost.localdomain (10.15.20.246) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sat, 9 May 2020 10:10:36 +0800 From: Fengping Yu To: Marco Felsch , Andy Shevchenko , Dmitry Torokhov , Yingjoe Chen Subject: [PATCH v6 3/3] configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y Date: Sat, 9 May 2020 10:05:03 +0800 Message-ID: <20200509020458.8359-4-fengping.yu@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20200509020458.8359-1-fengping.yu@mediatek.com> References: <20200509020458.8359-1-fengping.yu@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: CF2C098CE9B34A2263C5666380456D08079DD07514599DAB651C0E9BD794A0782000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200508_191122_928688_7A23872F X-CRM114-Status: UNSURE ( 7.18 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 MIME_BASE64_TEXT RAW: Message text disguised using base64 encoding 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "fengping.yu" , linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org From: "fengping.yu" Add Mediatek matrix keypad support in defconfig. Signed-off-by: fengping.yu --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7863352521e5..140c7a5832f7 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -317,6 +317,7 @@ CONFIG_KEYBOARD_SNVS_PWRKEY=m CONFIG_KEYBOARD_IMX_SC_KEY=m CONFIG_KEYBOARD_CROS_EC=y CONFIG_KEYBOARD_MTK_KPD=y +# CONFIG_KEYBOARD_MTK_PMIC is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_INPUT_MISC=y