Skip to contentSkip to conversation

Resend [PATCH V2] dt-bindings:input:keyboard:add MediaTek keypad controller binding

PATCH In review fengping yu 6 participants 13 messages Jan 8, 2020 – Jan 10, 2020

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

fengping.yu (2):
Documentation: devicetree: bindings: input
drivers: input: keyboard

 .../devicetree/bindings/input/mtk-kpd.txt     |  52 +++
 arch/arm64/configs/defconfig                  |   1 +
 drivers/input/keyboard/Kconfig                |   8 +
 drivers/input/keyboard/Makefile               |   1 +
 drivers/input/keyboard/mtk-kpd.c              | 357 ++++++++++++++++++
 5 files changed, 419 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt
 create mode 100644 drivers/input/keyboard/mtk-kpd.c
#1 lore raw

PATCH v2 1/2 Documentation: devicetree: bindings: input

From: "fengping.yu" <[email protected]>

Add mtk keypad device tree documentation.

Change-Id I415b76ee980784992763c768829b2dda76699dea
---
 .../devicetree/bindings/input/mtk-kpd.txt     | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt
Documentation/devicetree/bindings/input/mtk-kpd.txt new file +45 -0
new file mode 100644
index 000000000000..2af81e696159
@@ -0,0 +1,45 @@
+* 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,mt6779-keypad" for MT6779 keypad
+	* "mediatek,kp" for common keypad
+
+- reg: The base address of the Keypad register bank.
+
+- interrupts: A single interrupt specifier.
+
+- mediatek,key-debounce-ms: Debounce interval in milliseconds, maximum value
+  is 256ms
+
+- mediatek,hw-map-num: Number of entries of keycode in mediatek,hw-init-map
+
+- mediatek,hw-init-map: An array of packed 1-cell entries containing the
+  equivalent of hw-map-num linux key-code. Each cell is Linux keymap of
+  corresponding row/col, arrange like this:
+
+  row0col0, row0col1, row0col2,...row0col8,
+  row1col0, row1col1, row1col2,...row1col8,
+  ...
+  row7col0, row7col1, row7col2,...row7col8.
+
+Example:
+
+	keypad: kp@10010000 {
+		compatible = "mediatek,mt6779-keypad", "mediatek,kp";
+		reg = <0 0x10010000 0 0x1000>;
+		interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_FALLING>;
+	};
+
+	&keypad {
+		mediatek,key-debounce-ms = <1024>;
+		/*HW Keycode [0~71] -> Linux Keycode*/
+		mediatek,khw-map-num = <72>;
+		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 >;
+	};
Signature · 5 lines
2.18.0
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
maintainer
#2 lore raw

Re: [PATCH V2 1/2] Documentation: devicetree: bindings: input

Hi Fengping,

Quoted 37 lines · fengping yu

From: "fengping.yu" <[email protected]>

Add mtk keypad device tree documentation.

Change-Id I415b76ee980784992763c768829b2dda76699dea
---
 .../devicetree/bindings/input/mtk-kpd.txt     | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt
Documentation/devicetree/bindings/input/mtk-kpd.txt new file +20 -0
new file mode 100644
index 000000000000..2af81e696159
@@ -0,0 +1,45 @@
+* 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,mt6779-keypad" for MT6779 keypad
+	* "mediatek,kp" for common keypad
+
+- reg: The base address of the Keypad register bank.
+
+- interrupts: A single interrupt specifier.
+
+- mediatek,key-debounce-ms: Debounce interval in milliseconds, maximum value
+  is 256ms
+

Documentation/devicetree/bindings/input/mtk-kpd.txt line 30

Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt new file +10 -0
+- mediatek,hw-map-num: Number of entries of keycode in mediatek,hw-init-map
+
+- mediatek,hw-init-map: An array of packed 1-cell entries containing the
+  equivalent of hw-map-num linux key-code. Each cell is Linux keymap of
+  corresponding row/col, arrange like this:
+
+  row0col0, row0col1, row0col2,...row0col8,
+  row1col0, row1col1, row1col2,...row1col8,
+  ...
+  row7col0, row7col1, row7col2,...row7col8.

Please use standard "linux,keymap" property as defined in Documentation/devicetree/bindings/input/matrix-keymap.txt. You can use API from drivers/input/matrix-keymap.c to handle the property.

Thanks.

Signature · 1 line
Dmitry
#3 lore raw
In reply to fengping yu

Hi,

thanks for your patches. Please can you write something into the cover letter if you use it?

Regards,
Marco

Quoted 13 lines · fengping yu

fengping.yu (2):
Documentation: devicetree: bindings: input
drivers: input: keyboard

 .../devicetree/bindings/input/mtk-kpd.txt     |  52 +++
 arch/arm64/configs/defconfig                  |   1 +
 drivers/input/keyboard/Kconfig                |   8 +
 drivers/input/keyboard/Makefile               |   1 +
 drivers/input/keyboard/mtk-kpd.c              | 357 ++++++++++++++++++
 5 files changed, 419 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt
 create mode 100644 drivers/input/keyboard/mtk-kpd.c
Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#4 lore raw

PATCH v2 2/2 drivers: input: keyboard

In reply to fengping yu

From: "fengping.yu" <[email protected]>

add mtk keypad driver

Change-Id I20bb26ee4112f51f60476b7ff7d6e42b43f729dc
---
 .../devicetree/bindings/input/mtk-kpd.txt     |  13 +-
 arch/arm64/configs/defconfig                  |   1 +
 drivers/input/keyboard/Kconfig                |   8 +
 drivers/input/keyboard/Makefile               |   1 +
 drivers/input/keyboard/mtk-kpd.c              | 357 ++++++++++++++++++
 5 files changed, 377 insertions(+), 3 deletions(-)
 create mode 100644 drivers/input/keyboard/mtk-kpd.c
Documentation/devicetree/bindings/input/mtk-kpd.txt +10 -3
index 2af81e696159..e3c17513c02c 100644
@@ -38,8 +38,15 @@ Example:
 	};
 
 	&keypad {
-		mediatek,key-debounce-ms = <1024>;
+		mediatek,key-debounce-ms = <32>;
 		/*HW Keycode [0~71] -> Linux Keycode*/
-		mediatek,khw-map-num = <72>;
-		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 >;
+		mediatek,hw-map-num = <72>;
+		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0 >;
 	};
arch/arm64/configs/defconfig +1 -0
index 8e05c39eab08..62bed77ec127 100644
@@ -315,6 +315,7 @@ CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_SNVS_PWRKEY=m
 CONFIG_KEYBOARD_CROS_EC=y
+CONFIG_KEYBOARD_MTK=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_INPUT_MISC=y
drivers/input/keyboard/Kconfig +8 -0
index 8911bc2ec42a..01747a97536b 100644
@@ -775,4 +775,12 @@ config KEYBOARD_MTK_PMIC
 	  To compile this driver as a module, choose M here: the
 	  module will be called pmic-keys.
 
+config KEYBOARD_MTK
+	tristate "MediaTek Keypad Support"
+	help
+	  Say Y here if you want to use the keypad.
+	  If unuse, say N.
+	  To compile this driver as a module, choose M here: the
+	  module will be called mtk-kpd.
+
 endif
drivers/input/keyboard/Makefile +1 -0
index 9510325c0c5d..daa654bcce6e 100644
@@ -41,6 +41,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) 		+= 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
drivers/input/keyboard/mtk-kpd.c new file +357 -0

357 lines not on this page · raw message

Signature · 5 lines
2.18.0
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#5 lore raw

Re: [PATCH V2 2/2] drivers: input: keyboard

Hi,

this is just a short review I did not check all details. Since this is a v2 you should say what you changed.

Regards,
Marco

Quoted 3 lines · fengping yu

From: "fengping.yu" <[email protected]>

add mtk keypad driver

Hm.. can you explain it a bit more?

Quoted 24 lines
Change-Id I20bb26ee4112f51f60476b7ff7d6e42b43f729dc
---
 .../devicetree/bindings/input/mtk-kpd.txt     |  13 +-
 arch/arm64/configs/defconfig                  |   1 +
 drivers/input/keyboard/Kconfig                |   8 +
 drivers/input/keyboard/Makefile               |   1 +
 drivers/input/keyboard/mtk-kpd.c              | 357 ++++++++++++++++++
 5 files changed, 377 insertions(+), 3 deletions(-)
 create mode 100644 drivers/input/keyboard/mtk-kpd.c
Documentation/devicetree/bindings/input/mtk-kpd.txt +1 -3
index 2af81e696159..e3c17513c02c 100644
@@ -38,8 +38,15 @@ Example:
 	};
 
 	&keypad {
-		mediatek,key-debounce-ms = <1024>;
+		mediatek,key-debounce-ms = <32>;
 		/*HW Keycode [0~71] -> Linux Keycode*/
-		mediatek,khw-map-num = <72>;
-		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 >;

Documentation/devicetree/bindings/input/mtk-kpd.txt Example: · line 52

Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +9 -0
+		mediatek,hw-map-num = <72>;
+		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0 >;
 	};

This should be part of patch 1.

arch/arm64/configs/defconfig CONFIG_KEYBOARD_ADC=m · line 321

Quoted 12 lines
arch/arm64/configs/defconfig +1 -0
index 8e05c39eab08..62bed77ec127 100644
@@ -315,6 +315,7 @@ CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_SNVS_PWRKEY=m
 CONFIG_KEYBOARD_CROS_EC=y
+CONFIG_KEYBOARD_MTK=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_INPUT_MISC=y

This should be a extra patch.

Quoted 53 lines
drivers/input/keyboard/Kconfig +8 -0
index 8911bc2ec42a..01747a97536b 100644
@@ -775,4 +775,12 @@ config KEYBOARD_MTK_PMIC
 	  To compile this driver as a module, choose M here: the
 	  module will be called pmic-keys.
 
+config KEYBOARD_MTK
+	tristate "MediaTek Keypad Support"
+	help
+	  Say Y here if you want to use the keypad.
+	  If unuse, say N.
+	  To compile this driver as a module, choose M here: the
+	  module will be called mtk-kpd.
+
 endif
drivers/input/keyboard/Makefile +1 -0
index 9510325c0c5d..daa654bcce6e 100644
@@ -41,6 +41,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) 		+= 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
drivers/input/keyboard/mtk-kpd.c new file +18 -0
new file mode 100644
index 000000000000..740a58b44dac
@@ -0,0 +1,357 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 MediaTek Inc.
+ * Author Terry Chang <[email protected]>
+ */
+#include <linux/atomic.h>
+#include <linux/clk.h>
+#include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioctl.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>

drivers/input/keyboard/mtk-kpd.c line 28

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/platform_device.h>
+#include <linux/pm_wakeup.h>
+#include <linux/regmap.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>

Please check if you need all these includes at least the workqueue isn't required.

Quoted 17 lines
drivers/input/keyboard/mtk-kpd.c new file +17 -0
+#define KPD_NAME	"mtk-kpd"
+
+#define KP_STA			(0x0000)
+#define KP_MEM1			(0x0004)
+#define KP_MEM2			(0x0008)
+#define KP_MEM3			(0x000c)
+#define KP_MEM4			(0x0010)
+#define KP_MEM5			(0x0014)
+#define KP_DEBOUNCE		(0x0018)
+#define KP_SEL			(0x0020)
+#define KP_EN			(0x0024)
+
+#define KP_COL0_SEL		(1 << 10)
+#define KP_COL1_SEL		(1 << 11)
+#define KP_COL2_SEL		(1 << 12)
+
+#define KPD_DEBOUNCE_MASK	((1U << 14) - 1)

drivers/input/keyboard/mtk-kpd.c line 56

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+#define KPD_DOUBLE_KEY_MASK	(1U << 0)
+
+#define KPD_NUM_MEMS	5
+#define KPD_MEM5_BITS	8
+#define KPD_NUM_KEYS	72	/* 4 * 16 + KPD_MEM5_BITS */
+
+struct mtk_keypad {
+	struct input_dev *input_dev;
+	struct wakeup_source *suspend_lock;
+	struct tasklet_struct tasklet;

Why do you use a tasklet instead of a simple softirq?

drivers/input/keyboard/mtk-kpd.c line 69

Quoted 13 lines
drivers/input/keyboard/mtk-kpd.c new file +13 -0
+	struct clk *clk;
+	void __iomem *base;
+	unsigned int irqnr;
+	u32 key_debounce;
+	u32 hw_map_num;
+	u32 hw_init_map[KPD_NUM_KEYS];
+	u16 keymap_state[KPD_NUM_MEMS];
+};
+
+/* for keymap handling */
+static void kpd_keymap_handler(unsigned long data);
+
+static int kpd_pdrv_probe(struct platform_device *pdev);

Why do you delcare these functions here?

Quoted 136 lines
drivers/input/keyboard/mtk-kpd.c new file +136 -0
+static void kpd_get_keymap_state(void __iomem *kp_base, u16 state[])
+{
+	state[0] = readw(kp_base + KP_MEM1);
+	state[1] = readw(kp_base + KP_MEM2);
+	state[2] = readw(kp_base + KP_MEM3);
+	state[3] = readw(kp_base + KP_MEM4);
+	state[4] = readw(kp_base + KP_MEM5);
+	pr_debug("kpd register = %x %x %x %x %x\n",
+		 state[0], state[1], state[2], state[3], state[4]);
+}
+
+static void kpd_keymap_handler(unsigned long data)
+{
+	int i, j;
+	int pressed;
+	u16 new_state[KPD_NUM_MEMS], change, mask;
+	u16 hw_keycode, keycode;
+	void *dest;
+	struct mtk_keypad *keypad = (struct mtk_keypad *)data;
+
+	kpd_get_keymap_state(keypad->base, new_state);
+
+	__pm_wakeup_event(keypad->suspend_lock, 500);
+
+	for (i = 0; i < KPD_NUM_MEMS; i++) {
+		change = new_state[i] ^ keypad->keymap_state[i];
+		if (!change)
+			continue;
+
+		for (j = 0; j < 16U; j++) {
+			mask = (u16)1 << j;
+			if (!(change & mask))
+				continue;
+
+			hw_keycode = (i << 4) + j;
+
+			if (hw_keycode >= KPD_NUM_KEYS)
+				continue;
+
+			/* bit is 1: not pressed, 0: pressed */
+			pressed = (new_state[i] & mask) == 0U;
+			pr_debug("(%s) HW keycode = %d\n",
+				 (pressed) ? "pressed" : "released",
+				 hw_keycode);
+
+			keycode = keypad->hw_init_map[hw_keycode];
+			if (!keycode)
+				continue;
+			input_report_key(keypad->input_dev, keycode, pressed);
+			input_sync(keypad->input_dev);
+			pr_debug("report Linux keycode = %d\n", keycode);
+		}
+	}
+
+	dest = memcpy(keypad->keymap_state, new_state, sizeof(new_state));
+	enable_irq(keypad->irqnr);
+}
+
+static irqreturn_t kpd_irq_handler(int irq, void *dev_id)
+{
+	/* use _nosync to avoid deadlock */
+	struct mtk_keypad *keypad = dev_id;
+
+	disable_irq_nosync(keypad->irqnr);
+	tasklet_schedule(&keypad->tasklet);
+	return IRQ_HANDLED;
+}
+
+static int kpd_get_dts_info(struct mtk_keypad *keypad,
+			    struct device_node *node)
+{
+	int ret;
+
+	ret = of_property_read_u32(node, "mediatek,key-debounce-ms",
+				   &keypad->key_debounce);
+	if (ret) {
+		pr_debug("read mediatek,key-debounce-ms error.\n");
+		return ret;
+	}
+
+	ret = of_property_read_u32(node, "mediatek,hw-map-num",
+				   &keypad->hw_map_num);
+	if (ret) {
+		pr_debug("read mediatek,hw-map-num error.\n");
+		return ret;
+	}
+
+	if (keypad->hw_map_num > KPD_NUM_KEYS) {
+		pr_debug("hw-map-num error, it cannot bigger than %d.\n",
+			 KPD_NUM_KEYS);
+		return -EINVAL;
+	}
+
+	ret = of_property_read_u32_array(node, "mediatek,hw-init-map",
+					 keypad->hw_init_map,
+					 keypad->hw_map_num);
+
+	if (ret) {
+		pr_debug("hw-init-map was not defined in dts.\n");
+		return ret;
+	}
+
+	pr_debug("deb= %d\n", keypad->key_debounce);
+
+	return 0;
+}
+
+static int kpd_gpio_init(struct device *dev)
+{
+	struct pinctrl *keypad_pinctrl;
+	struct pinctrl_state *kpd_default;
+
+	keypad_pinctrl = devm_pinctrl_get(dev);
+	if (IS_ERR(keypad_pinctrl)) {
+		pr_debug("Cannot find keypad_pinctrl!\n");
+
+		return (int)PTR_ERR(keypad_pinctrl);
+	}
+
+	kpd_default = pinctrl_lookup_state(keypad_pinctrl, "default");
+	if (IS_ERR(kpd_default)) {
+		pr_debug("Cannot find ecall_state!\n");
+
+		return (int)PTR_ERR(kpd_default);
+	}
+
+	return pinctrl_select_state(keypad_pinctrl,
+				kpd_default);
+}
+
+static int kpd_pdrv_probe(struct platform_device *pdev)
+{
+	struct mtk_keypad *keypad;
+	struct resource *res;
+	int i;
+	int err;

drivers/input/keyboard/mtk-kpd.c line 216

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+
+	keypad = devm_kzalloc(&pdev->dev, sizeof(*keypad), GFP_KERNEL);
+	if (!keypad)
+		return -ENOMEM;
+
+	keypad->clk = devm_clk_get(&pdev->dev, "kpd");
+	if (IS_ERR(keypad->clk)) {
+		pr_notice("get kpd-clk fail: %d\n", (int)PTR_ERR(keypad->clk));
+		return (int)PTR_ERR(keypad->clk);
+	}

There is no need to cast it to (int).

Quoted 20 lines
drivers/input/keyboard/mtk-kpd.c new file +20 -0
+
+	err = clk_prepare_enable(keypad->clk);
+	if (err) {
+		pr_notice("kpd-clk prepare enable failed.\n");
+		return err;
+	}
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		err = -ENODEV;
+		goto err_unprepare_clk;
+	}
+
+	keypad->base = devm_ioremap(&pdev->dev, res->start,
+				    resource_size(res));
+	if (!keypad->base) {
+		pr_notice("KP iomap failed\n");
+		err = -EBUSY;
+		goto err_unprepare_clk;
+	}

drivers/input/keyboard/mtk-kpd.c line 246

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+
+	keypad->irqnr = irq_of_parse_and_map(pdev->dev.of_node, 0);
+	if (!keypad->irqnr) {
+		pr_notice("KP get irqnr failed\n");
+		err = -ENODEV;
+		goto err_unprepare_clk;
+	}
+
+	pr_info("kp base: 0x%p, addr:0x%p,  kp irq: %d\n",
+		keypad->base, &keypad->base, keypad->irqnr);

Can we move that to pr_info.

drivers/input/keyboard/mtk-kpd.c line 247

Quoted 1 line
drivers/input/keyboard/mtk-kpd.c new file +1 -0
+	err = kpd_gpio_init(&pdev->dev);

This can be done here too but is jsut a nitpick.

Quoted 36 lines
drivers/input/keyboard/mtk-kpd.c new file +36 -0
+	if (err) {
+		pr_debug("gpio init failed\n");
+		goto err_unprepare_clk;
+	}
+
+	err = kpd_get_dts_info(keypad, pdev->dev.of_node);
+	if (err) {
+		pr_debug("get dts info failed.\n");
+		goto err_unprepare_clk;
+	}
+
+	memset(keypad->keymap_state, 0xff, sizeof(keypad->keymap_state));
+
+	keypad->input_dev = devm_input_allocate_device(&pdev->dev);
+	if (!keypad->input_dev) {
+		pr_notice("input allocate device fail.\n");
+		err = -ENOMEM;
+		goto err_unprepare_clk;
+	}
+
+	keypad->input_dev->name = KPD_NAME;
+	keypad->input_dev->id.bustype = BUS_HOST;
+	keypad->input_dev->dev.parent = &pdev->dev;
+
+	__set_bit(EV_KEY, keypad->input_dev->evbit);
+
+	for (i = 0; i < KPD_NUM_KEYS; i++) {
+		if (keypad->hw_init_map[i])
+			__set_bit(keypad->hw_init_map[i],
+				  keypad->input_dev->keybit);
+	}
+
+	err = input_register_device(keypad->input_dev);
+	if (err) {
+		pr_notice("register input device failed (%d)\n", err);
+		goto err_unprepare_clk;

drivers/input/keyboard/mtk-kpd.c line 293

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+	}
+
+	input_set_drvdata(keypad->input_dev, keypad);
+
+	keypad->suspend_lock = wakeup_source_register(NULL, "kpd wakelock");
+	if (!keypad->suspend_lock) {
+		pr_notice("wakeup source init failed.\n");
+		err = -ENOMEM;
+		goto err_unregister_device;
+	}

What if someone won't use this device as wakeup source?

Quoted 46 lines
drivers/input/keyboard/mtk-kpd.c new file +46 -0
+	tasklet_init(&keypad->tasklet, kpd_keymap_handler,
+		     (unsigned long)keypad);
+
+	writew((u16)(keypad->key_debounce & KPD_DEBOUNCE_MASK),
+		     keypad->base + KP_DEBOUNCE);
+
+	/* register IRQ */
+	err = request_irq(keypad->irqnr, kpd_irq_handler, IRQF_TRIGGER_NONE,
+			  KPD_NAME, keypad);
+	if (err) {
+		pr_notice("register IRQ failed (%d)\n", err);
+		goto err_irq;
+	}
+
+	pr_info("kpd_probe OK.\n");
+
+	return 0;
+
+err_irq:
+	tasklet_kill(&keypad->tasklet);
+	wakeup_source_unregister(keypad->suspend_lock);
+
+err_unregister_device:
+	input_unregister_device(keypad->input_dev);
+
+err_unprepare_clk:
+	clk_disable_unprepare(keypad->clk);
+
+	return err;
+}
+
+static int kpd_pdrv_remove(struct platform_device *pdev)
+{
+	struct mtk_keypad *keypad = platform_get_drvdata(pdev);
+
+	tasklet_kill(&keypad->tasklet);
+	wakeup_source_unregister(keypad->suspend_lock);
+	input_unregister_device(keypad->input_dev);
+	clk_disable_unprepare(keypad->clk);
+
+	return 0;
+}
+
+static const struct of_device_id kpd_of_match[] = {
+	{.compatible = "mediatek,mt6779-keypad"},
+	{.compatible = "mediatek,kp"},

drivers/input/keyboard/mtk-kpd.c line 350

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+	{},
+};
+
+static struct platform_driver kpd_pdrv = {
+	.probe = kpd_pdrv_probe,
+	.remove = kpd_pdrv_remove,
+	.driver = {
+		   .name = KPD_NAME,
+		   .of_match_table = kpd_of_match,
+		   },

Please align this correct.

Quoted 9 lines
drivers/input/keyboard/mtk-kpd.c new file +7 -0
+};
+
+module_platform_driver(kpd_pdrv);
+
+MODULE_AUTHOR("Mediatek Corporation");
+MODULE_DESCRIPTION("MTK Keypad (KPD) Driver");
+MODULE_LICENSE("GPL");
Signature · 1 line
2.18.0
Signature · 4 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#6 lore raw

Re: [PATCH V2 2/2] drivers: input: keyboard

Hi,

On 20-01-08 08:11, Marco Felsch wrote:

...

Quoted 6 lines

drivers/input/keyboard/mtk-kpd.c line 56

Quoted 4 lines
drivers/input/keyboard/mtk-kpd.c new file +4 -0
+struct mtk_keypad {
+	struct input_dev *input_dev;
+	struct wakeup_source *suspend_lock;
+	struct tasklet_struct tasklet;

Why do you use a tasklet instead of a simple softirq?

Sorry, what I mean was a threaded_irq.

Regards,
Marco

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#7 lore raw

Re: [PATCH V2 2/2] drivers: input: keyboard

In reply to fengping yu

Hi, Fengping,

Macro already left some comments, I'll skip those.

The summary for this patch is not complete. Maybe you can use:

drivers: input: keyboard: add mtk-kpd driver

Quoted 5 lines · fengping yu

From: "fengping.yu" <[email protected]>

add mtk keypad driver

Change-Id: I20bb26ee4112f51f60476b7ff7d6e42b43f729dc

Please remove Change-Id

Quoted 50 lines
---
 .../devicetree/bindings/input/mtk-kpd.txt     |  13 +-
 arch/arm64/configs/defconfig                  |   1 +
 drivers/input/keyboard/Kconfig                |   8 +
 drivers/input/keyboard/Makefile               |   1 +
 drivers/input/keyboard/mtk-kpd.c              | 357 ++++++++++++++++++
 5 files changed, 377 insertions(+), 3 deletions(-)
 create mode 100644 drivers/input/keyboard/mtk-kpd.c
Documentation/devicetree/bindings/input/mtk-kpd.txt +10 -3
index 2af81e696159..e3c17513c02c 100644
@@ -38,8 +38,15 @@ Example:
 	};
 
 	&keypad {
-		mediatek,key-debounce-ms = <1024>;
+		mediatek,key-debounce-ms = <32>;
 		/*HW Keycode [0~71] -> Linux Keycode*/
-		mediatek,khw-map-num = <72>;
-		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 >;
+		mediatek,hw-map-num = <72>;
+		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0 >;
 	};
arch/arm64/configs/defconfig +1 -0
index 8e05c39eab08..62bed77ec127 100644
@@ -315,6 +315,7 @@ CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_SNVS_PWRKEY=m
 CONFIG_KEYBOARD_CROS_EC=y
+CONFIG_KEYBOARD_MTK=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_INPUT_MISC=y
drivers/input/keyboard/Kconfig +0 -0
index 8911bc2ec42a..01747a97536b 100644

drivers/input/keyboard/Kconfig config KEYBOARD_MTK_PMIC · line 778

Quoted 4 lines
drivers/input/keyboard/Kconfig +1 -0
@@ -775,4 +775,12 @@ config KEYBOARD_MTK_PMIC
 	  To compile this driver as a module, choose M here: the
 	  module will be called pmic-keys.
 
+config KEYBOARD_MTK

We already have KEYBOARD_MTK_PMIC, I think it make sense to call this KEYBOARD_MTK_KPD to avoid confusion.
Please move this before KEYBOARD_MTK_PMIC.

Quoted 56 lines
drivers/input/keyboard/Kconfig +7 -0
+	tristate "MediaTek Keypad Support"
+	help
+	  Say Y here if you want to use the keypad.
+	  If unuse, say N.
+	  To compile this driver as a module, choose M here: the
+	  module will be called mtk-kpd.
+
 endif
drivers/input/keyboard/Makefile +1 -0
index 9510325c0c5d..daa654bcce6e 100644
@@ -41,6 +41,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) 		+= 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
drivers/input/keyboard/mtk-kpd.c new file +30 -0
new file mode 100644
index 000000000000..740a58b44dac
@@ -0,0 +1,357 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 MediaTek Inc.
+ * Author Terry Chang <[email protected]>
+ */
+#include <linux/atomic.h>
+#include <linux/clk.h>
+#include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioctl.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/platform_device.h>
+#include <linux/pm_wakeup.h>
+#include <linux/regmap.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
+
+#define KPD_NAME	"mtk-kpd"

drivers/input/keyboard/mtk-kpd.c line 40

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+
+#define KP_STA			(0x0000)
+#define KP_MEM1			(0x0004)
+#define KP_MEM2			(0x0008)
+#define KP_MEM3			(0x000c)
+#define KP_MEM4			(0x0010)
+#define KP_MEM5			(0x0014)
+#define KP_DEBOUNCE		(0x0018)
+#define KP_SEL			(0x0020)
+#define KP_EN			(0x0024)

KP_STA/KP_SEL/KP_EN/KP_COL*_SEL is not used, please remove unused items

drivers/input/keyboard/mtk-kpd.c line 47

Quoted 7 lines
drivers/input/keyboard/mtk-kpd.c new file +7 -0
+
+#define KP_COL0_SEL		(1 << 10)
+#define KP_COL1_SEL		(1 << 11)
+#define KP_COL2_SEL		(1 << 12)
+
+#define KPD_DEBOUNCE_MASK	((1U << 14) - 1)
+#define KPD_DOUBLE_KEY_MASK	(1U << 0)

Same here. Please add this when add double key support.

Quoted 88 lines
drivers/input/keyboard/mtk-kpd.c new file +88 -0
+
+#define KPD_NUM_MEMS	5
+#define KPD_MEM5_BITS	8
+#define KPD_NUM_KEYS	72	/* 4 * 16 + KPD_MEM5_BITS */
+
+struct mtk_keypad {
+	struct input_dev *input_dev;
+	struct wakeup_source *suspend_lock;
+	struct tasklet_struct tasklet;
+	struct clk *clk;
+	void __iomem *base;
+	unsigned int irqnr;
+	u32 key_debounce;
+	u32 hw_map_num;
+	u32 hw_init_map[KPD_NUM_KEYS];
+	u16 keymap_state[KPD_NUM_MEMS];
+};
+
+/* for keymap handling */
+static void kpd_keymap_handler(unsigned long data);
+
+static int kpd_pdrv_probe(struct platform_device *pdev);
+
+static void kpd_get_keymap_state(void __iomem *kp_base, u16 state[])
+{
+	state[0] = readw(kp_base + KP_MEM1);
+	state[1] = readw(kp_base + KP_MEM2);
+	state[2] = readw(kp_base + KP_MEM3);
+	state[3] = readw(kp_base + KP_MEM4);
+	state[4] = readw(kp_base + KP_MEM5);
+	pr_debug("kpd register = %x %x %x %x %x\n",
+		 state[0], state[1], state[2], state[3], state[4]);
+}
+
+static void kpd_keymap_handler(unsigned long data)
+{
+	int i, j;
+	int pressed;
+	u16 new_state[KPD_NUM_MEMS], change, mask;
+	u16 hw_keycode, keycode;
+	void *dest;
+	struct mtk_keypad *keypad = (struct mtk_keypad *)data;
+
+	kpd_get_keymap_state(keypad->base, new_state);
+
+	__pm_wakeup_event(keypad->suspend_lock, 500);
+
+	for (i = 0; i < KPD_NUM_MEMS; i++) {
+		change = new_state[i] ^ keypad->keymap_state[i];
+		if (!change)
+			continue;
+
+		for (j = 0; j < 16U; j++) {
+			mask = (u16)1 << j;
+			if (!(change & mask))
+				continue;
+
+			hw_keycode = (i << 4) + j;
+
+			if (hw_keycode >= KPD_NUM_KEYS)
+				continue;
+
+			/* bit is 1: not pressed, 0: pressed */
+			pressed = (new_state[i] & mask) == 0U;
+			pr_debug("(%s) HW keycode = %d\n",
+				 (pressed) ? "pressed" : "released",
+				 hw_keycode);
+
+			keycode = keypad->hw_init_map[hw_keycode];
+			if (!keycode)
+				continue;
+			input_report_key(keypad->input_dev, keycode, pressed);
+			input_sync(keypad->input_dev);
+			pr_debug("report Linux keycode = %d\n", keycode);
+		}
+	}
+
+	dest = memcpy(keypad->keymap_state, new_state, sizeof(new_state));
+	enable_irq(keypad->irqnr);
+}
+
+static irqreturn_t kpd_irq_handler(int irq, void *dev_id)
+{
+	/* use _nosync to avoid deadlock */
+	struct mtk_keypad *keypad = dev_id;
+
+	disable_irq_nosync(keypad->irqnr);
+	tasklet_schedule(&keypad->tasklet);

drivers/input/keyboard/mtk-kpd.c line 145

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+	return IRQ_HANDLED;
+}
+
+static int kpd_get_dts_info(struct mtk_keypad *keypad,
+			    struct device_node *node)
+{
+	int ret;
+
+	ret = of_property_read_u32(node, "mediatek,key-debounce-ms",
+				   &keypad->key_debounce);

according to binding, maximum is 256ms.
Please add range check here.

Quoted 57 lines
drivers/input/keyboard/mtk-kpd.c new file +57 -0
+	if (ret) {
+		pr_debug("read mediatek,key-debounce-ms error.\n");
+		return ret;
+	}
+
+	ret = of_property_read_u32(node, "mediatek,hw-map-num",
+				   &keypad->hw_map_num);
+	if (ret) {
+		pr_debug("read mediatek,hw-map-num error.\n");
+		return ret;
+	}
+
+	if (keypad->hw_map_num > KPD_NUM_KEYS) {
+		pr_debug("hw-map-num error, it cannot bigger than %d.\n",
+			 KPD_NUM_KEYS);
+		return -EINVAL;
+	}
+
+	ret = of_property_read_u32_array(node, "mediatek,hw-init-map",
+					 keypad->hw_init_map,
+					 keypad->hw_map_num);
+
+	if (ret) {
+		pr_debug("hw-init-map was not defined in dts.\n");
+		return ret;
+	}
+
+	pr_debug("deb= %d\n", keypad->key_debounce);
+
+	return 0;
+}
+
+static int kpd_gpio_init(struct device *dev)
+{
+	struct pinctrl *keypad_pinctrl;
+	struct pinctrl_state *kpd_default;
+
+	keypad_pinctrl = devm_pinctrl_get(dev);
+	if (IS_ERR(keypad_pinctrl)) {
+		pr_debug("Cannot find keypad_pinctrl!\n");
+
+		return (int)PTR_ERR(keypad_pinctrl);
+	}
+
+	kpd_default = pinctrl_lookup_state(keypad_pinctrl, "default");
+	if (IS_ERR(kpd_default)) {
+		pr_debug("Cannot find ecall_state!\n");
+
+		return (int)PTR_ERR(kpd_default);
+	}
+
+	return pinctrl_select_state(keypad_pinctrl,
+				kpd_default);
+}
+
+static int kpd_pdrv_probe(struct platform_device *pdev)
+{

drivers/input/keyboard/mtk-kpd.c line 212

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+	struct mtk_keypad *keypad;
+	struct resource *res;
+	int i;
+	int err;
+
+	keypad = devm_kzalloc(&pdev->dev, sizeof(*keypad), GFP_KERNEL);
+	if (!keypad)
+		return -ENOMEM;
+
+	keypad->clk = devm_clk_get(&pdev->dev, "kpd");

this clk is not mentioned in dt binding. Please add it to binding.

Quoted 9 lines
drivers/input/keyboard/mtk-kpd.c new file +9 -0
+	if (IS_ERR(keypad->clk)) {
+		pr_notice("get kpd-clk fail: %d\n", (int)PTR_ERR(keypad->clk));
+		return (int)PTR_ERR(keypad->clk);
+	}
+
+	err = clk_prepare_enable(keypad->clk);
+	if (err) {
+		pr_notice("kpd-clk prepare enable failed.\n");
+		return err;

drivers/input/keyboard/mtk-kpd.c line 231

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+	}
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		err = -ENODEV;
+		goto err_unprepare_clk;
+	}
+
+	keypad->base = devm_ioremap(&pdev->dev, res->start,
+				    resource_size(res));

please use devm_platform_ioremap_resource instead of using platform_get_resource+devm_ioremap

Quoted 5 lines
drivers/input/keyboard/mtk-kpd.c new file +5 -0
+	if (!keypad->base) {
+		pr_notice("KP iomap failed\n");
+		err = -EBUSY;
+		goto err_unprepare_clk;
+	}

drivers/input/keyboard/mtk-kpd.c line 246

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+
+	keypad->irqnr = irq_of_parse_and_map(pdev->dev.of_node, 0);
+	if (!keypad->irqnr) {
+		pr_notice("KP get irqnr failed\n");
+		err = -ENODEV;
+		goto err_unprepare_clk;
+	}
+
+	pr_info("kp base: 0x%p, addr:0x%p,  kp irq: %d\n",
+		keypad->base, &keypad->base, keypad->irqnr);

don't need 0x when you are using %p
But, I think we don't need this information

drivers/input/keyboard/mtk-kpd.c line 247

Quoted 1 line
drivers/input/keyboard/mtk-kpd.c new file +1 -0
+	err = kpd_gpio_init(&pdev->dev);

This init only set pinmux. Maybe you could just add code it here.

Quoted 42 lines
drivers/input/keyboard/mtk-kpd.c new file +42 -0
+	if (err) {
+		pr_debug("gpio init failed\n");
+		goto err_unprepare_clk;
+	}
+
+	err = kpd_get_dts_info(keypad, pdev->dev.of_node);
+	if (err) {
+		pr_debug("get dts info failed.\n");
+		goto err_unprepare_clk;
+	}
+
+	memset(keypad->keymap_state, 0xff, sizeof(keypad->keymap_state));
+
+	keypad->input_dev = devm_input_allocate_device(&pdev->dev);
+	if (!keypad->input_dev) {
+		pr_notice("input allocate device fail.\n");
+		err = -ENOMEM;
+		goto err_unprepare_clk;
+	}
+
+	keypad->input_dev->name = KPD_NAME;
+	keypad->input_dev->id.bustype = BUS_HOST;
+	keypad->input_dev->dev.parent = &pdev->dev;
+
+	__set_bit(EV_KEY, keypad->input_dev->evbit);
+
+	for (i = 0; i < KPD_NUM_KEYS; i++) {
+		if (keypad->hw_init_map[i])
+			__set_bit(keypad->hw_init_map[i],
+				  keypad->input_dev->keybit);
+	}
+
+	err = input_register_device(keypad->input_dev);
+	if (err) {
+		pr_notice("register input device failed (%d)\n", err);
+		goto err_unprepare_clk;
+	}
+
+	input_set_drvdata(keypad->input_dev, keypad);
+
+	keypad->suspend_lock = wakeup_source_register(NULL, "kpd wakelock");
+	if (!keypad->suspend_lock) {

drivers/input/keyboard/mtk-kpd.c line 299

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+		pr_notice("wakeup source init failed.\n");
+		err = -ENOMEM;
+		goto err_unregister_device;
+	}
+
+	tasklet_init(&keypad->tasklet, kpd_keymap_handler,
+		     (unsigned long)keypad);
+
+	writew((u16)(keypad->key_debounce & KPD_DEBOUNCE_MASK),
+		     keypad->base + KP_DEBOUNCE);

You use a 13 bits mask and set it directly to KP_DEBOUNCE register. Are you sure the debounce unit is ms?

drivers/input/keyboard/mtk-kpd.c line 303

Quoted 4 lines
drivers/input/keyboard/mtk-kpd.c new file +4 -0
+
+	/* register IRQ */
+	err = request_irq(keypad->irqnr, kpd_irq_handler, IRQF_TRIGGER_NONE,
+			  KPD_NAME, keypad);

please consider using devm_request_irq, otherwise you have to free it in _remove function.

Joe.C

Quoted 44 lines
drivers/input/keyboard/mtk-kpd.c new file +44 -0
+	if (err) {
+		pr_notice("register IRQ failed (%d)\n", err);
+		goto err_irq;
+	}
+
+	pr_info("kpd_probe OK.\n");
+
+	return 0;
+
+err_irq:
+	tasklet_kill(&keypad->tasklet);
+	wakeup_source_unregister(keypad->suspend_lock);
+
+err_unregister_device:
+	input_unregister_device(keypad->input_dev);
+
+err_unprepare_clk:
+	clk_disable_unprepare(keypad->clk);
+
+	return err;
+}
+
+static int kpd_pdrv_remove(struct platform_device *pdev)
+{
+	struct mtk_keypad *keypad = platform_get_drvdata(pdev);
+
+	tasklet_kill(&keypad->tasklet);
+	wakeup_source_unregister(keypad->suspend_lock);
+	input_unregister_device(keypad->input_dev);
+	clk_disable_unprepare(keypad->clk);
+
+	return 0;
+}
+
+static const struct of_device_id kpd_of_match[] = {
+	{.compatible = "mediatek,mt6779-keypad"},
+	{.compatible = "mediatek,kp"},
+	{},
+};
+
+static struct platform_driver kpd_pdrv = {
+	.probe = kpd_pdrv_probe,
+	.remove = kpd_pdrv_remove,
+	.driver = {

drivers/input/keyboard/mtk-kpd.c line 357

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+		   .name = 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");

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#8 lore raw

Re: [PATCH V2 2/2] drivers: input: keyboard

Quoted 11 lines · Yingjoe Chen

drivers/input/keyboard/mtk-kpd.c line 299

Quoted 5 lines · fengping yu
drivers/input/keyboard/mtk-kpd.c new file +5 -0
+	tasklet_init(&keypad->tasklet, kpd_keymap_handler,
+		     (unsigned long)keypad);
+
+	writew((u16)(keypad->key_debounce & KPD_DEBOUNCE_MASK),
+		     keypad->base + KP_DEBOUNCE);

You use a 13 bits mask and set it directly to KP_DEBOUNCE register. Are you sure the debounce unit is ms?

Quoted 7 lines

drivers/input/keyboard/mtk-kpd.c line 303

Quoted 4 lines
drivers/input/keyboard/mtk-kpd.c new file +4 -0
+
+	/* register IRQ */
+	err = request_irq(keypad->irqnr, kpd_irq_handler, IRQF_TRIGGER_NONE,
+			  KPD_NAME, keypad);

please consider using devm_request_irq, otherwise you have to free it in _remove function.

No, you may not use devm_*_irq() when tasklets are in use. There is a nasty race condition.

Actually the rule of thumb is to NOT use devm_*_irq() unless you exactly know what you are doing.

P.S. Why simple not to switch to threaded IRQ handler and drop tasklet? In such case devm_*_irq() is fine.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#9 lore raw

Re: [PATCH V2 2/2] drivers: input: keyboard

Quoted 20 lines · Andy Shevchenko
Quoted 11 lines · Yingjoe Chen

drivers/input/keyboard/mtk-kpd.c line 299

Quoted 5 lines · fengping yu
drivers/input/keyboard/mtk-kpd.c new file +5 -0
+	tasklet_init(&keypad->tasklet, kpd_keymap_handler,
+		     (unsigned long)keypad);
+
+	writew((u16)(keypad->key_debounce & KPD_DEBOUNCE_MASK),
+		     keypad->base + KP_DEBOUNCE);

You use a 13 bits mask and set it directly to KP_DEBOUNCE register. Are you sure the debounce unit is ms?

Quoted 7 lines

drivers/input/keyboard/mtk-kpd.c line 303

Quoted 4 lines
drivers/input/keyboard/mtk-kpd.c new file +4 -0
+
+	/* register IRQ */
+	err = request_irq(keypad->irqnr, kpd_irq_handler, IRQF_TRIGGER_NONE,
+			  KPD_NAME, keypad);

please consider using devm_request_irq, otherwise you have to free it in _remove function.

Quoted 8 lines

No, you may not use devm_*_irq() when tasklets are in use. There is a nasty race condition.

Actually the rule of thumb is to NOT use devm_*_irq() unless you exactly know what you are doing.

P.S. Why simple not to switch to threaded IRQ handler and drop tasklet? In such case devm_*_irq() is fine.

Actually, we are simply reading iomem data and forward it to input subsystem, there is no need to use threaded interrupt nor the tasklet.

Thanks.

Signature · 1 line
Dmitry
#10 lore raw

Re: [PATCH V2 2/2] drivers: input: keyboard

In reply to fengping yu
Quoted 3 lines · fengping yu

From: "fengping.yu" <[email protected]>

add mtk keypad driver

A bit more details, perhaps?
Also, what about proper English grammar and punctuation?

Quoted 1 line

Change-Id: I20bb26ee4112f51f60476b7ff7d6e42b43f729dc

Are you sure it's ready for upstream?

...

Quoted 1 line
 arch/arm64/configs/defconfig                  |   1 +

Why?

...

Quoted 11 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +1 -3
@@ -38,8 +38,15 @@ Example:
 	};
 
 	&keypad {
-		mediatek,key-debounce-ms = <1024>;
+		mediatek,key-debounce-ms = <32>;
 		/*HW Keycode [0~71] -> Linux Keycode*/
-		mediatek,khw-map-num = <72>;
-		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 >;

Documentation/devicetree/bindings/input/mtk-kpd.txt Example: · line 52

Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +9 -0
+		mediatek,hw-map-num = <72>;
+		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0 >;
 	};

Why above in this patch?

...

Quoted 1 line

+obj-$(CONFIG_KEYBOARD_MTK) += mtk-kpd.o

TABs/spaces mix.

...

Quoted 13 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +13 -0
+#include <linux/atomic.h>
+#include <linux/clk.h>
+#include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioctl.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +10 -0
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/platform_device.h>
+#include <linux/pm_wakeup.h>
+#include <linux/regmap.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>

Do you really need all of them?!

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 9 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +9 -0
+#define KP_STA			(0x0000)
+#define KP_MEM1			(0x0004)
+#define KP_MEM2			(0x0008)
+#define KP_MEM3			(0x000c)
+#define KP_MEM4			(0x0010)
+#define KP_MEM5			(0x0014)
+#define KP_DEBOUNCE		(0x0018)
+#define KP_SEL			(0x0020)
+#define KP_EN			(0x0024)

What the purpose of parentheses?

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 3 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +3 -0
+#define KP_COL0_SEL		(1 << 10)
+#define KP_COL1_SEL		(1 << 11)
+#define KP_COL2_SEL		(1 << 12)

BIT()

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 2 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +2 -0
+#define KPD_DEBOUNCE_MASK	((1U << 14) - 1)
+#define KPD_DOUBLE_KEY_MASK	(1U << 0)

GENMASK() / BIT_MASK() / BIT()

...

Quoted 1 line

+static int kpd_pdrv_probe(struct platform_device *pdev);

Why this forward declaration is present?

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +9 -0
+static void kpd_get_keymap_state(void __iomem *kp_base, u16 state[])
+{
+	state[0] = readw(kp_base + KP_MEM1);
+	state[1] = readw(kp_base + KP_MEM2);
+	state[2] = readw(kp_base + KP_MEM3);
+	state[3] = readw(kp_base + KP_MEM4);
+	state[4] = readw(kp_base + KP_MEM5);
 
+	pr_debug("kpd register = %x %x %x %x %x\n",
+		 state[0], state[1], state[2], state[3], state[4]);

Consider print_hex_dump() instead. But do you need this at all?

Quoted 1 line

+}

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 4 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +4 -0
+		for (j = 0; j < 16U; j++) {
+			mask = (u16)1 << j;
+			if (!(change & mask))
+				continue;

for_each_set_bit() ?

Quoted 1 line
Documentation/devicetree/bindings/input/mtk-kpd.txt +1 -0
+		}

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 4 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +4 -0
+static int kpd_get_dts_info(struct mtk_keypad *keypad,
+			    struct device_node *node)
+{
+	int ret;

Consider pr_*() -> dev_*() in all below code.

Quoted 8 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +8 -0
+
+	ret = of_property_read_u32(node, "mediatek,key-debounce-ms",
+				   &keypad->key_debounce);
+	if (ret) {
+		pr_debug("read mediatek,key-debounce-ms error.\n");
+		return ret;
+	}
+

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +10 -0
+	ret = of_property_read_u32(node, "mediatek,hw-map-num",
+				   &keypad->hw_map_num);
+	if (ret) {
+		pr_debug("read mediatek,hw-map-num error.\n");
+		return ret;
+	}
+
+	if (keypad->hw_map_num > KPD_NUM_KEYS) {
+		pr_debug("hw-map-num error, it cannot bigger than %d.\n",
+			 KPD_NUM_KEYS);

dev_err() ?

Quoted 6 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +6 -0
+		return -EINVAL;
+	}
+
+	ret = of_property_read_u32_array(node, "mediatek,hw-init-map",
+					 keypad->hw_init_map,
+					 keypad->hw_map_num);

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +10 -0
+
+	if (ret) {
+		pr_debug("hw-init-map was not defined in dts.\n");
+		return ret;
+	}
+
+	pr_debug("deb= %d\n", keypad->key_debounce);
+
+	return 0;
+}

It's for ARM64 which might support ACPI. Perhaps you may use device property API instead of be OF-centric.

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 5 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +4 -0
+	keypad_pinctrl = devm_pinctrl_get(dev);
+	if (IS_ERR(keypad_pinctrl)) {
 
+		pr_debug("Cannot find keypad_pinctrl!\n");
+

These kind of messages are not for production.

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 1 line
Documentation/devicetree/bindings/input/mtk-kpd.txt +1 -0
+		return (int)PTR_ERR(keypad_pinctrl);

Why explicit casting? (Same for similar places all over the driver) Is it really a fatal error?

Quoted 1 line
Documentation/devicetree/bindings/input/mtk-kpd.txt +1 -0
+	}

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 2 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +2 -0
+	return pinctrl_select_state(keypad_pinctrl,
+				kpd_default);

One line. Perhaps you need to configure your text editor.

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 4 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +3 -0
+	keypad->clk = devm_clk_get(&pdev->dev, "kpd");
+	if (IS_ERR(keypad->clk)) {
 
+		pr_notice("get kpd-clk fail: %d\n", (int)PTR_ERR(keypad->clk));

Noise as a lot of such messages.

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 1 line
Documentation/devicetree/bindings/input/mtk-kpd.txt +1 -0
+		return (int)PTR_ERR(keypad->clk);

Casting?!

Quoted 1 line
Documentation/devicetree/bindings/input/mtk-kpd.txt +1 -0
+	}

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 13 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +13 -0
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		err = -ENODEV;
+		goto err_unprepare_clk;
+	}
+
+	keypad->base = devm_ioremap(&pdev->dev, res->start,
+				    resource_size(res));
+	if (!keypad->base) {
+		pr_notice("KP iomap failed\n");
+		err = -EBUSY;
+		goto err_unprepare_clk;
+	}

What's wrong with devm_platform_ioremap_resource()?

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 6 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +6 -0
+	keypad->irqnr = irq_of_parse_and_map(pdev->dev.of_node, 0);
+	if (!keypad->irqnr) {
+		pr_notice("KP get irqnr failed\n");
+		err = -ENODEV;
+		goto err_unprepare_clk;
+	}

Can't you use platform_get_irq()?
Why not?

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 2 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +2 -0
+	pr_info("kp base: 0x%p, addr:0x%p,  kp irq: %d\n",
+		keypad->base, &keypad->base, keypad->irqnr);

Useless message. Moreover I believe it has wrong specifiers in use.

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 1 line
Documentation/devicetree/bindings/input/mtk-kpd.txt +1 -0
+	memset(keypad->keymap_state, 0xff, sizeof(keypad->keymap_state));

Shouldn't be bitmap_fill()? In such case the variable has to be type of unsigned long.

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 2 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +2 -0
+	writew((u16)(keypad->key_debounce & KPD_DEBOUNCE_MASK),
+		     keypad->base + KP_DEBOUNCE);

Why explicit casting?

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 7 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +7 -0
+	/* register IRQ */
+	err = request_irq(keypad->irqnr, kpd_irq_handler, IRQF_TRIGGER_NONE,
+			  KPD_NAME, keypad);
+	if (err) {
+		pr_notice("register IRQ failed (%d)\n", err);
+		goto err_irq;
+	}

Why not threaded IRQ handler instead of ugly tasklet?

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 1 line
Documentation/devicetree/bindings/input/mtk-kpd.txt +1 -0
+	pr_info("kpd_probe OK.\n");

Noise.

...

Documentation/devicetree/bindings/input/mtk-kpd.txt

Quoted 5 lines
Documentation/devicetree/bindings/input/mtk-kpd.txt +4 -0
+static const struct of_device_id kpd_of_match[] = {
+	{.compatible = "mediatek,mt6779-keypad"},
+	{.compatible = "mediatek,kp"},
 
+	{},

Comma is not needed in terminator lines.

Quoted 1 line

+};

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#11 lore raw

Re: [PATCH V2 2/2] drivers: input: keyboard

In reply to fengping yu
Quoted 152 lines · fengping yu

From: "fengping.yu" <[email protected]>

add mtk keypad driver

Change-Id I20bb26ee4112f51f60476b7ff7d6e42b43f729dc
---
 .../devicetree/bindings/input/mtk-kpd.txt     |  13 +-
 arch/arm64/configs/defconfig                  |   1 +
 drivers/input/keyboard/Kconfig                |   8 +
 drivers/input/keyboard/Makefile               |   1 +
 drivers/input/keyboard/mtk-kpd.c              | 357 ++++++++++++++++++
 5 files changed, 377 insertions(+), 3 deletions(-)
 create mode 100644 drivers/input/keyboard/mtk-kpd.c
Documentation/devicetree/bindings/input/mtk-kpd.txt +10 -3
index 2af81e696159..e3c17513c02c 100644
@@ -38,8 +38,15 @@ Example:
 	};
 
 	&keypad {
-		mediatek,key-debounce-ms = <1024>;
+		mediatek,key-debounce-ms = <32>;
 		/*HW Keycode [0~71] -> Linux Keycode*/
-		mediatek,khw-map-num = <72>;
-		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 >;
+		mediatek,hw-map-num = <72>;
+		mediatek,hw-init-map = <114 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0
+															0 0 0 0 0 0 0 0 0 >;
 	};
arch/arm64/configs/defconfig +1 -0
index 8e05c39eab08..62bed77ec127 100644
@@ -315,6 +315,7 @@ CONFIG_KEYBOARD_ADC=m
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_SNVS_PWRKEY=m
 CONFIG_KEYBOARD_CROS_EC=y
+CONFIG_KEYBOARD_MTK=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_INPUT_MISC=y
drivers/input/keyboard/Kconfig +8 -0
index 8911bc2ec42a..01747a97536b 100644
@@ -775,4 +775,12 @@ config KEYBOARD_MTK_PMIC
 	  To compile this driver as a module, choose M here: the
 	  module will be called pmic-keys.
 
+config KEYBOARD_MTK
+	tristate "MediaTek Keypad Support"
+	help
+	  Say Y here if you want to use the keypad.
+	  If unuse, say N.
+	  To compile this driver as a module, choose M here: the
+	  module will be called mtk-kpd.
+
 endif
drivers/input/keyboard/Makefile +1 -0
index 9510325c0c5d..daa654bcce6e 100644
@@ -41,6 +41,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) 		+= 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
drivers/input/keyboard/mtk-kpd.c new file +67 -0
new file mode 100644
index 000000000000..740a58b44dac
@@ -0,0 +1,357 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 MediaTek Inc.
+ * Author Terry Chang <[email protected]>
+ */
+#include <linux/atomic.h>
+#include <linux/clk.h>
+#include <linux/debugfs.h>
+#include <linux/delay.h>
+#include <linux/fs.h>
+#include <linux/gpio.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/ioctl.h>
+#include <linux/kernel.h>
+#include <linux/miscdevice.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
+#include <linux/pinctrl/consumer.h>
+#include <linux/platform_device.h>
+#include <linux/pm_wakeup.h>
+#include <linux/regmap.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
+
+#define KPD_NAME	"mtk-kpd"
+
+#define KP_STA			(0x0000)
+#define KP_MEM1			(0x0004)
+#define KP_MEM2			(0x0008)
+#define KP_MEM3			(0x000c)
+#define KP_MEM4			(0x0010)
+#define KP_MEM5			(0x0014)
+#define KP_DEBOUNCE		(0x0018)
+#define KP_SEL			(0x0020)
+#define KP_EN			(0x0024)
+
+#define KP_COL0_SEL		(1 << 10)
+#define KP_COL1_SEL		(1 << 11)
+#define KP_COL2_SEL		(1 << 12)
+
+#define KPD_DEBOUNCE_MASK	((1U << 14) - 1)
+#define KPD_DOUBLE_KEY_MASK	(1U << 0)
+
+#define KPD_NUM_MEMS	5
+#define KPD_MEM5_BITS	8
+#define KPD_NUM_KEYS	72	/* 4 * 16 + KPD_MEM5_BITS */
+
+struct mtk_keypad {
+	struct input_dev *input_dev;
+	struct wakeup_source *suspend_lock;
+	struct tasklet_struct tasklet;
+	struct clk *clk;
+	void __iomem *base;
+	unsigned int irqnr;
+	u32 key_debounce;
+	u32 hw_map_num;
+	u32 hw_init_map[KPD_NUM_KEYS];
+	u16 keymap_state[KPD_NUM_MEMS];
+};
+
+/* for keymap handling */
+static void kpd_keymap_handler(unsigned long data);

drivers/input/keyboard/mtk-kpd.c line 77

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+
+static int kpd_pdrv_probe(struct platform_device *pdev);
+
+static void kpd_get_keymap_state(void __iomem *kp_base, u16 state[])
+{
+	state[0] = readw(kp_base + KP_MEM1);
+	state[1] = readw(kp_base + KP_MEM2);
+	state[2] = readw(kp_base + KP_MEM3);
+	state[3] = readw(kp_base + KP_MEM4);
+	state[4] = readw(kp_base + KP_MEM5);

Please use memcpy_formio() here.

Quoted 16 lines
drivers/input/keyboard/mtk-kpd.c new file +16 -0
+	pr_debug("kpd register = %x %x %x %x %x\n",
+		 state[0], state[1], state[2], state[3], state[4]);
+}
+
+static void kpd_keymap_handler(unsigned long data)
+{
+	int i, j;
+	int pressed;
+	u16 new_state[KPD_NUM_MEMS], change, mask;
+	u16 hw_keycode, keycode;
+	void *dest;
+	struct mtk_keypad *keypad = (struct mtk_keypad *)data;
+
+	kpd_get_keymap_state(keypad->base, new_state);
+
+	__pm_wakeup_event(keypad->suspend_lock, 500);

drivers/input/keyboard/mtk-kpd.c line 103

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+
+	for (i = 0; i < KPD_NUM_MEMS; i++) {
+		change = new_state[i] ^ keypad->keymap_state[i];
+		if (!change)
+			continue;
+
+		for (j = 0; j < 16U; j++) {
+			mask = (u16)1 << j;
+			if (!(change & mask))
+				continue;

If you define state as N longs instead of M u16s, you can do

	for_each_set_bit()

as the single loop, figure row/col from offset, and get the state and fetch the code from keymap.

Quoted 53 lines
drivers/input/keyboard/mtk-kpd.c new file +53 -0
+
+			hw_keycode = (i << 4) + j;
+
+			if (hw_keycode >= KPD_NUM_KEYS)
+				continue;
+
+			/* bit is 1: not pressed, 0: pressed */
+			pressed = (new_state[i] & mask) == 0U;
+			pr_debug("(%s) HW keycode = %d\n",
+				 (pressed) ? "pressed" : "released",
+				 hw_keycode);
+
+			keycode = keypad->hw_init_map[hw_keycode];
+			if (!keycode)
+				continue;
+			input_report_key(keypad->input_dev, keycode, pressed);
+			input_sync(keypad->input_dev);
+			pr_debug("report Linux keycode = %d\n", keycode);
+		}
+	}
+
+	dest = memcpy(keypad->keymap_state, new_state, sizeof(new_state));
+	enable_irq(keypad->irqnr);
+}
+
+static irqreturn_t kpd_irq_handler(int irq, void *dev_id)
+{
+	/* use _nosync to avoid deadlock */
+	struct mtk_keypad *keypad = dev_id;
+
+	disable_irq_nosync(keypad->irqnr);
+	tasklet_schedule(&keypad->tasklet);
+	return IRQ_HANDLED;
+}
+
+static int kpd_get_dts_info(struct mtk_keypad *keypad,
+			    struct device_node *node)
+{
+	int ret;
+
+	ret = of_property_read_u32(node, "mediatek,key-debounce-ms",
+				   &keypad->key_debounce);
+	if (ret) {
+		pr_debug("read mediatek,key-debounce-ms error.\n");
+		return ret;
+	}
+
+	ret = of_property_read_u32(node, "mediatek,hw-map-num",
+				   &keypad->hw_map_num);
+	if (ret) {
+		pr_debug("read mediatek,hw-map-num error.\n");
+		return ret;
+	}

drivers/input/keyboard/mtk-kpd.c line 166

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+
+	if (keypad->hw_map_num > KPD_NUM_KEYS) {
+		pr_debug("hw-map-num error, it cannot bigger than %d.\n",
+			 KPD_NUM_KEYS);
+		return -EINVAL;
+	}
+
+	ret = of_property_read_u32_array(node, "mediatek,hw-init-map",
+					 keypad->hw_init_map,
+					 keypad->hw_map_num);

As I mentioned, please use matrix keymap API and linux,keymap property.

Quoted 42 lines
drivers/input/keyboard/mtk-kpd.c new file +42 -0
+
+	if (ret) {
+		pr_debug("hw-init-map was not defined in dts.\n");
+		return ret;
+	}
+
+	pr_debug("deb= %d\n", keypad->key_debounce);
+
+	return 0;
+}
+
+static int kpd_gpio_init(struct device *dev)
+{
+	struct pinctrl *keypad_pinctrl;
+	struct pinctrl_state *kpd_default;
+
+	keypad_pinctrl = devm_pinctrl_get(dev);
+	if (IS_ERR(keypad_pinctrl)) {
+		pr_debug("Cannot find keypad_pinctrl!\n");
+
+		return (int)PTR_ERR(keypad_pinctrl);
+	}
+
+	kpd_default = pinctrl_lookup_state(keypad_pinctrl, "default");
+	if (IS_ERR(kpd_default)) {
+		pr_debug("Cannot find ecall_state!\n");
+
+		return (int)PTR_ERR(kpd_default);
+	}
+
+	return pinctrl_select_state(keypad_pinctrl,
+				kpd_default);
+}
+
+static int kpd_pdrv_probe(struct platform_device *pdev)
+{
+	struct mtk_keypad *keypad;
+	struct resource *res;
+	int i;
+	int err;
+
+	keypad = devm_kzalloc(&pdev->dev, sizeof(*keypad), GFP_KERNEL);

drivers/input/keyboard/mtk-kpd.c line 218

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+	if (!keypad)
+		return -ENOMEM;
+
+	keypad->clk = devm_clk_get(&pdev->dev, "kpd");
+	if (IS_ERR(keypad->clk)) {
+		pr_notice("get kpd-clk fail: %d\n", (int)PTR_ERR(keypad->clk));
+		return (int)PTR_ERR(keypad->clk);
+	}
+
+	err = clk_prepare_enable(keypad->clk);

Do not mix devm and non-devm APIs. Use devm_add_action_or_reset() for disabling clock in proper order.

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+	if (err) {
+		pr_notice("kpd-clk prepare enable failed.\n");
+		return err;
+	}
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		err = -ENODEV;
+		goto err_unprepare_clk;
+	}

drivers/input/keyboard/mtk-kpd.c line 238

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+
+	keypad->base = devm_ioremap(&pdev->dev, res->start,
+				    resource_size(res));
+	if (!keypad->base) {
+		pr_notice("KP iomap failed\n");
+		err = -EBUSY;
+		goto err_unprepare_clk;
+	}
+
+	keypad->irqnr = irq_of_parse_and_map(pdev->dev.of_node, 0);

Why is this done in the driver? Use platform_get_irq() instead.

Quoted 22 lines
drivers/input/keyboard/mtk-kpd.c new file +22 -0
+	if (!keypad->irqnr) {
+		pr_notice("KP get irqnr failed\n");
+		err = -ENODEV;
+		goto err_unprepare_clk;
+	}
+
+	pr_info("kp base: 0x%p, addr:0x%p,  kp irq: %d\n",
+		keypad->base, &keypad->base, keypad->irqnr);
+	err = kpd_gpio_init(&pdev->dev);
+	if (err) {
+		pr_debug("gpio init failed\n");
+		goto err_unprepare_clk;
+	}
+
+	err = kpd_get_dts_info(keypad, pdev->dev.of_node);
+	if (err) {
+		pr_debug("get dts info failed.\n");
+		goto err_unprepare_clk;
+	}
+
+	memset(keypad->keymap_state, 0xff, sizeof(keypad->keymap_state));
+

drivers/input/keyboard/mtk-kpd.c line 270

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+	keypad->input_dev = devm_input_allocate_device(&pdev->dev);
+	if (!keypad->input_dev) {
+		pr_notice("input allocate device fail.\n");
+		err = -ENOMEM;
+		goto err_unprepare_clk;
+	}
+
+	keypad->input_dev->name = KPD_NAME;
+	keypad->input_dev->id.bustype = BUS_HOST;
+	keypad->input_dev->dev.parent = &pdev->dev;

No need to set this since you are using devm_input_allocate_device().

Quoted 13 lines
drivers/input/keyboard/mtk-kpd.c new file +13 -0
+
+	__set_bit(EV_KEY, keypad->input_dev->evbit);
+
+	for (i = 0; i < KPD_NUM_KEYS; i++) {
+		if (keypad->hw_init_map[i])
+			__set_bit(keypad->hw_init_map[i],
+				  keypad->input_dev->keybit);
+	}
+
+	err = input_register_device(keypad->input_dev);
+	if (err) {
+		pr_notice("register input device failed (%d)\n", err);
+		goto err_unprepare_clk;

drivers/input/keyboard/mtk-kpd.c line 293

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+	}
+
+	input_set_drvdata(keypad->input_dev, keypad);
+
+	keypad->suspend_lock = wakeup_source_register(NULL, "kpd wakelock");
+	if (!keypad->suspend_lock) {
+		pr_notice("wakeup source init failed.\n");
+		err = -ENOMEM;
+		goto err_unregister_device;
+	}

Why are we doing it in this fashion instead of checking "wakeup-source" property and doing device_init_wakeup() when this flag is set?

drivers/input/keyboard/mtk-kpd.c line 296

Quoted 3 lines
drivers/input/keyboard/mtk-kpd.c new file +3 -0
+
+	tasklet_init(&keypad->tasklet, kpd_keymap_handler,
+		     (unsigned long)keypad);

No need to use tasklet, you are not doing anything heavy in the ISR.

Quoted 27 lines
drivers/input/keyboard/mtk-kpd.c new file +27 -0
+
+	writew((u16)(keypad->key_debounce & KPD_DEBOUNCE_MASK),
+		     keypad->base + KP_DEBOUNCE);
+
+	/* register IRQ */
+	err = request_irq(keypad->irqnr, kpd_irq_handler, IRQF_TRIGGER_NONE,
+			  KPD_NAME, keypad);
+	if (err) {
+		pr_notice("register IRQ failed (%d)\n", err);
+		goto err_irq;
+	}
+
+	pr_info("kpd_probe OK.\n");
+
+	return 0;
+
+err_irq:
+	tasklet_kill(&keypad->tasklet);
+	wakeup_source_unregister(keypad->suspend_lock);
+
+err_unregister_device:
+	input_unregister_device(keypad->input_dev);
+
+err_unprepare_clk:
+	clk_disable_unprepare(keypad->clk);
+
+	return err;

drivers/input/keyboard/mtk-kpd.c line 333

Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10 -0
+}
+
+static int kpd_pdrv_remove(struct platform_device *pdev)
+{
+	struct mtk_keypad *keypad = platform_get_drvdata(pdev);
+
+	tasklet_kill(&keypad->tasklet);
+	wakeup_source_unregister(keypad->suspend_lock);
+	input_unregister_device(keypad->input_dev);
+	clk_disable_unprepare(keypad->clk);

Please remove this all and rely on devm for cleanup.

drivers/input/keyboard/mtk-kpd.c line 340

Quoted 7 lines
drivers/input/keyboard/mtk-kpd.c new file +7 -0
+
+	return 0;
+}
+
+static const struct of_device_id kpd_of_match[] = {
+	{.compatible = "mediatek,mt6779-keypad"},
+	{.compatible = "mediatek,kp"},

Do we need both compatibles? Why?

Quoted 19 lines
drivers/input/keyboard/mtk-kpd.c new file +17 -0
+	{},
+};
+
+static struct platform_driver kpd_pdrv = {
+	.probe = kpd_pdrv_probe,
+	.remove = kpd_pdrv_remove,
+	.driver = {
+		   .name = 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");
Signature · 1 line
2.18.0

Thanks.

Signature · 1 line
Dmitry
#12 lore raw

Re: [PATCH V2 2/2] drivers: input: keyboard

Quoted 2 lines · Dmitry Torokhov
Quoted 1 line · fengping yu

From: "fengping.yu" <[email protected]>

...

Quoted 9 lines

drivers/input/keyboard/mtk-kpd.c line 77

Quoted 7 lines
drivers/input/keyboard/mtk-kpd.c new file +7 -0
+static void kpd_get_keymap_state(void __iomem *kp_base, u16 state[])
+{
+     state[0] = readw(kp_base + KP_MEM1);
+     state[1] = readw(kp_base + KP_MEM2);
+     state[2] = readw(kp_base + KP_MEM3);
+     state[3] = readw(kp_base + KP_MEM4);
+     state[4] = readw(kp_base + KP_MEM5);

Please use memcpy_formio() here.

Actually it's not an equivalent and may have side effects. I already told somewhere that we lack of mem*_*io{32,16,8}() implementation.

Signature · 2 lines
With Best Regards,
Andy Shevchenko