Add matrix keypad driver support for Mediatek SoCs
Subsystems (3)
PATCH v7 1/1 Add matrix keypad driver support for Mediatek SoCs
Change since v6:
- update keypad device tree document schema
fengping.yu (3):
dt-bindings: Add keypad devicetree documentation
drivers: input: keyboard: Add mtk keypad driver
configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y
.../devicetree/bindings/input/mtk-kpd.yaml | 102 ++++++++ arch/arm64/configs/defconfig | 2 + drivers/input/keyboard/Kconfig | 8 + drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/mtk-kpd.c | 223 ++++++++++++++++++ 5 files changed, 336 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml create mode 100644 drivers/input/keyboard/mtk-kpd.c
--
2.18.0
PATCH v7 1/3 dt-bindings: Add keypad devicetree documentation
From: "fengping.yu" <[email protected]>
Add Mediatek matrix keypad dt-binding doc as yaml schema.
--- .../devicetree/bindings/input/mtk-kpd.yaml | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +102 -0
@@ -0,0 +1,102 @@ +%YAML 1.2 +--- +version: 1 + +$id: http://devicetree.org/schemas/input/mtk-keypad.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek's Keypad Controller device tree bindings + +maintainer: + - Fengping Yu <[email protected]> + +description: | + 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. + +properties: + compatible: + constraint: | + "mediatek,mt6779-keypad" + "mediatek, kp" + + clock-names: + description: Names of the clocks listed in clocks property in the same order + + clocks: + description: Must contain one entry, for the module clock + refs: devicetree/bindings/clocks/clock-bindings.txt for details. + + interrupts: + description: A single interrupt specifier + + linux,keymap: + description: The keymap for keys as described in the binding document + refs: devicetree/bindings/input/matrix-keymap.txt + + pinctrl-0: + description: Specify pin control groups used for this controller + refs: devicetree/bindings/pinctrl/pinctrl-bindings.txt + + pinctrl-names: + description: Names for optional pin modes + + reg: + description: The base address of the Keypad register bank + + wakeup-source: + description: use any event on keypad as wakeup event + + keypad,num-columns: + description: 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 + + keypad,num-rows: + description: 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 + + mediatek,debounce-us: + description: Debounce interval in microseconds + maximum: 256000 + + +required: + - compatible + - reg + - interrupts + - mediatek,debounce-us + - keypad,num-rows + - keypad,num-columns + - linux,keymap + - pinctrl + - clocks + - clock-names + +optional: + - wakeup-source: + +examples: + - | + + keypad: kp@10010000 { + compatible = "mediatek,kp"; + reg = <0 0x10010000 0 0x1000>; + wakeup-source; + interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_FALLING>; + 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>; + };
Signature · 5 lines
2.18.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v7 1/3] dt-bindings: Add keypad devicetree documentation
Hi,
Quoted 28 lines · Fengping Yu
From: "fengping.yu" <[email protected]>
Add Mediatek matrix keypad dt-binding doc as yaml schema.
Signed-off-by fengping.yu <[email protected]>--- .../devicetree/bindings/input/mtk-kpd.yaml | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yamlDocumentation/devicetree/bindings/input/mtk-kpd.yaml new file +12
-0@@ -0,0 +1,102 @@ +%YAML 1.2 +--- +version: 1 + +$id: http://devicetree.org/schemas/input/mtk-keypad.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek's Keypad Controller device tree bindings + +maintainer: + - Fengping Yu <[email protected]> +
Documentation/devicetree/bindings/input/mtk-kpd.yaml line 22
Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +10
-0+description: | + 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. + +properties: + compatible: + constraint: |
enum or const ?
Quoted 32 lines
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +32
-0+ "mediatek,mt6779-keypad" + "mediatek, kp" + + clock-names: + description: Names of the clocks listed in clocks property in the same order + + clocks: + description: Must contain one entry, for the module clock + refs: devicetree/bindings/clocks/clock-bindings.txt for details. + + interrupts: + description: A single interrupt specifier + + linux,keymap: + description: The keymap for keys as described in the binding document + refs: devicetree/bindings/input/matrix-keymap.txt + + pinctrl-0: + description: Specify pin control groups used for this controller + refs: devicetree/bindings/pinctrl/pinctrl-bindings.txt + + pinctrl-names: + description: Names for optional pin modes + + reg: + description: The base address of the Keypad register bank + + wakeup-source: + description: use any event on keypad as wakeup event + + keypad,num-columns: + description: Number of column lines connected to the keypad controller,
Documentation/devicetree/bindings/input/mtk-kpd.yaml line 64
Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +10
-0+ it is not equal to PCB columns number, instead you should add required value + for each IC + + keypad,num-rows: + description: 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 + + mediatek,debounce-us: + description: Debounce interval in microseconds + maximum: 256000
I think that you are missing the maxItems on all your properties so we can't make any validation. Also the indent looks wrong.
Quoted 6 lines
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +6
-0+ + +required: + - compatible + - reg + - interrupts
Documentation/devicetree/bindings/input/mtk-kpd.yaml line 80
Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +10
-0+ - mediatek,debounce-us + - keypad,num-rows + - keypad,num-columns + - linux,keymap + - pinctrl + - clocks + - clock-names + +optional: + - wakeup-source:
I think the optional can be dropped.
Quoted 11 lines
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +11
-0+examples: + - | + + keypad: kp@10010000 { + compatible = "mediatek,kp"; + reg = <0 0x10010000 0 0x1000>; + wakeup-source; + interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_FALLING>; + clocks = <&clk26m>; + clock-names = "kpd"; + };
Documentation/devicetree/bindings/input/mtk-kpd.yaml line 102
Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +10
-0+ + &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>; + };
Pls squash those nodes.
Regards,
Marco
Quoted 2 lines
Signature · 1 line
2.18.0
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Matthias Brugger
maintainerRe: [PATCH v7 1/3] dt-bindings: Add keypad devicetree documentation
In reply to Fengping YuQuoted 30 lines · Fengping Yu
From: "fengping.yu" <[email protected]>
Add Mediatek matrix keypad dt-binding doc as yaml schema.
Signed-off-by fengping.yu <[email protected]>--- .../devicetree/bindings/input/mtk-kpd.yaml | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yamlDocumentation/devicetree/bindings/input/mtk-kpd.yaml new file +14
-0@@ -0,0 +1,102 @@ +%YAML 1.2 +--- +version: 1 + +$id: http://devicetree.org/schemas/input/mtk-keypad.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek's Keypad Controller device tree bindings + +maintainer: + - Fengping Yu <[email protected]> + +description: | + Mediatek's Keypad controller is used to interface a SoC with a matrix-type
Documentation/devicetree/bindings/input/mtk-kpd.yaml line 24
Quoted 10 lines
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +10
-0+ 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. + +properties: + compatible: + constraint: | + "mediatek,mt6779-keypad" + "mediatek, kp"
"mediatek, kp" is too generic. Are you aware that the keypad can be used by other SoCs. Then we should add them later with a fallback to mt6779-keypad.
Regards,
Matthias
Quoted 79 lines
Documentation/devicetree/bindings/input/mtk-kpd.yaml new file +78
-0+ + clock-names: + description: Names of the clocks listed in clocks property in the same order + + clocks: + description: Must contain one entry, for the module clock + refs: devicetree/bindings/clocks/clock-bindings.txt for details. + + interrupts: + description: A single interrupt specifier + + linux,keymap: + description: The keymap for keys as described in the binding document + refs: devicetree/bindings/input/matrix-keymap.txt + + pinctrl-0: + description: Specify pin control groups used for this controller + refs: devicetree/bindings/pinctrl/pinctrl-bindings.txt + + pinctrl-names: + description: Names for optional pin modes + + reg: + description: The base address of the Keypad register bank + + wakeup-source: + description: use any event on keypad as wakeup event + + keypad,num-columns: + description: 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 + + keypad,num-rows: + description: 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 + + mediatek,debounce-us: + description: Debounce interval in microseconds + maximum: 256000 + + +required: + - compatible + - reg + - interrupts + - mediatek,debounce-us + - keypad,num-rows + - keypad,num-columns + - linux,keymap + - pinctrl + - clocks + - clock-names + +optional: + - wakeup-source: + +examples: + - | + + keypad: kp@10010000 { + compatible = "mediatek,kp"; + reg = <0 0x10010000 0 0x1000>; + wakeup-source; + interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_FALLING>; + 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>; + };
PATCH v7 2/3 drivers: input: keyboard: Add mtk keypad driver
In reply to Fengping YuFrom: "fengping.yu" <[email protected]>
This adds matrix keypad support for Mediatek SoCs.
--- drivers/input/keyboard/Kconfig | 8 ++ drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/mtk-kpd.c | 223 +++++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+) create mode 100644 drivers/input/keyboard/mtk-kpd.c
drivers/input/keyboard/Kconfig +8 -0
@@ -782,6 +782,14 @@ config KEYBOARD_BCM To compile this driver as a module, choose M here: the module will be called bcm-keypad. +config KEYBOARD_MTK_KPD + tristate "MediaTek Keypad Support" + depends on OF && HAVE_CLK + help + Say Y here if you want to use the keypad on MediaTek SoCs. + If unsure, say N. + To compile this driver as a module, choose M here: the + module will be called mtk-kpd. config KEYBOARD_MTK_PMIC tristate "MediaTek PMIC keys support" depends on MFD_MT6397
drivers/input/keyboard/Makefile +1 -0
@@ -43,6 +43,7 @@ obj-$(CONFIG_KEYBOARD_MATRIX) += matrix_keypad.o obj-$(CONFIG_KEYBOARD_MAX7359) += max7359_keypad.o obj-$(CONFIG_KEYBOARD_MCS) += mcs_touchkey.o obj-$(CONFIG_KEYBOARD_MPR121) += mpr121_touchkey.o +obj-$(CONFIG_KEYBOARD_MTK_KPD) += mtk-kpd.o obj-$(CONFIG_KEYBOARD_MTK_PMIC) += mtk-pmic-keys.o obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o obj-$(CONFIG_KEYBOARD_NOMADIK) += nomadik-ske-keypad.o
drivers/input/keyboard/mtk-kpd.c new file +223 -0
223 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
Re: [PATCH v7 2/3] drivers: input: keyboard: Add mtk keypad driver
Hi,
I like the evolution of this patch =)
Quoted 53 lines · Fengping Yu
From: "fengping.yu" <[email protected]>
This adds matrix keypad support for Mediatek SoCs.
Signed-off-by fengping.yu <[email protected]>--- drivers/input/keyboard/Kconfig | 8 ++ drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/mtk-kpd.c | 223 +++++++++++++++++++++++++++++++ 3 files changed, 232 insertions(+) create mode 100644 drivers/input/keyboard/mtk-kpd.cdrivers/input/keyboard/Kconfig +8
-0@@ -782,6 +782,14 @@ config KEYBOARD_BCM To compile this driver as a module, choose M here: the module will be called bcm-keypad. +config KEYBOARD_MTK_KPD + tristate "MediaTek Keypad Support" + depends on OF && HAVE_CLK + help + Say Y here if you want to use the keypad on MediaTek SoCs. + If unsure, say N. + To compile this driver as a module, choose M here: the + module will be called mtk-kpd. config KEYBOARD_MTK_PMIC tristate "MediaTek PMIC keys support" depends on MFD_MT6397drivers/input/keyboard/Makefile +1
-0@@ -43,6 +43,7 @@ obj-$(CONFIG_KEYBOARD_MATRIX) += matrix_keypad.o obj-$(CONFIG_KEYBOARD_MAX7359) += max7359_keypad.o obj-$(CONFIG_KEYBOARD_MCS) += mcs_touchkey.o obj-$(CONFIG_KEYBOARD_MPR121) += mpr121_touchkey.o +obj-$(CONFIG_KEYBOARD_MTK_KPD) += mtk-kpd.o obj-$(CONFIG_KEYBOARD_MTK_PMIC) += mtk-pmic-keys.o obj-$(CONFIG_KEYBOARD_NEWTON) += newtonkbd.o obj-$(CONFIG_KEYBOARD_NOMADIK) += nomadik-ske-keypad.odrivers/input/keyboard/mtk-kpd.c new file +4
-0@@ -0,0 +1,223 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2019 MediaTek Inc. +* Author Terry Chang <[email protected]>
drivers/input/keyboard/mtk-kpd.c line 14
Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10
-0+*/ +#include <linux/clk.h> +#include <linux/input/matrix_keypad.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/property.h> +#include <linux/pinctrl/consumer.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/bitops.h>
Please sort it alphabetical.
drivers/input/keyboard/mtk-kpd.c line 24
Quoted 9 lines
drivers/input/keyboard/mtk-kpd.c new file +9
-0+#define KPD_NAME "mtk-kpd" + +#define KP_MEM 0x0004 +#define KP_DEBOUNCE 0x0018 + +#define KPD_DEBOUNCE_MASK GENMASK(13, 0) +#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 */
Pls align all define values. Nit, I would also make the names a bit more uniform e.g.
- MTK_KPD_NAME
- MTK_KPD_MEM
- MTK_KPD_DEBOUNCE
- MTK_KPD_NUM_MEMS
...
Quoted 6 lines
drivers/input/keyboard/mtk-kpd.c new file +6
-0+struct mtk_keypad { +struct regmap *regmap; +struct input_dev *input_dev; +struct clk *clk; +void __iomem *base; +bool wakeup;
drivers/input/keyboard/mtk-kpd.c line 41
Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10
-0+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 ,
IMHO we should specify max_register as decimal value.
Quoted 39 lines
drivers/input/keyboard/mtk-kpd.c new file +39
-0+}; + +static irqreturn_t kpd_irq_handler (int irq,void *dev_id) +{ +struct mtk_keypad *keypad = dev_id; +unsigned short *keycode = keypad->input_dev->keycode; +DECLARE_BITMAP (new_state,KPD_NUM_BITS ); +DECLARE_BITMAP (change,KPD_NUM_BITS ); +int bit_nr; +int pressed; +unsigned short code; + +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 ) { +/* 1: not pressed, 0: pressed */ + pressed = !test_bit (bit_nr, new_state); +dev_dbg (&keypad->input_dev->dev,"%s" , + pressed ?"pressed" :"released" ); + +/* 32bit register only use low 16bit as keypad mem register */ + code = keycode[bit_nr -16 * (BITS_TO_U32 (bit_nr) -1 )]; + +input_report_key (keypad->input_dev, code, pressed); +input_sync (keypad->input_dev); + +dev_dbg (&keypad->input_dev->dev, +"report Linux keycode = %d\n" , code); + } + +bitmap_copy (keypad->keymap_state, new_state,KPD_NUM_BITS ); + +return IRQ_HANDLED ; +} + +static int kpd_pdrv_probe (struct platform_device *pdev) +{
drivers/input/keyboard/mtk-kpd.c line 90
Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10
-0+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 ;
Missing newline ?
drivers/input/keyboard/mtk-kpd.c line 96
Quoted 6 lines
drivers/input/keyboard/mtk-kpd.c new file +6
-0+ 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);
Pls align it and make use of devm_regmap_init_mmio().
Quoted 20 lines
drivers/input/keyboard/mtk-kpd.c new file +20
-0+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 ); + + keypad->input_dev =devm_input_allocate_device (&pdev->dev); +if (!keypad->input_dev) { +dev_err (&pdev->dev,"Failed to allocate input dev\n" ); +return -ENOMEM ; + } + + keypad->input_dev->name =KPD_NAME ; + keypad->input_dev->id.bustype =BUS_HOST ; + + ret =matrix_keypad_parse_properties (&pdev->dev, &keypad->n_rows, + &keypad->n_cols); +if (ret) {
drivers/input/keyboard/mtk-kpd.c line 126
Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10
-0+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 read mediatek debounce time\n" ); +return ret; + }
Nit, I would make it optional and use a default if no value is specified.
Quoted 6 lines
drivers/input/keyboard/mtk-kpd.c new file +6
-0+ +if (debounce >KPD_DEBOUNCE_MAX_US ) { +dev_err (&pdev->dev,"Debounce time exceeds the maximum allowed time 256ms\n" ); +return -EINVAL ; + } +
drivers/input/keyboard/mtk-kpd.c line 142
Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10
-0+ 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);
Pls align it correctly.
drivers/input/keyboard/mtk-kpd.c line 151
Quoted 9 lines
drivers/input/keyboard/mtk-kpd.c new file +9
-0+if (ret) { +dev_err (&pdev->dev,"Failed to build keymap\n" ); +return ret; + } + +input_set_drvdata (keypad->input_dev, keypad); + +regmap_write (keypad->regmap,KP_DEBOUNCE , + debounce *32 /1000 &KPD_DEBOUNCE_MASK );
Pls align this also.
drivers/input/keyboard/mtk-kpd.c line 156
Quoted 5 lines
drivers/input/keyboard/mtk-kpd.c new file +5
-0+ + keypad->clk =devm_clk_get (&pdev->dev,"kpd" ); +if (IS_ERR (keypad->clk)) { +return PTR_ERR (keypad->clk); + }
Not needed braces.
drivers/input/keyboard/mtk-kpd.c line 166
Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10
-0+ + ret =clk_prepare_enable (keypad->clk); +if (ret) { +dev_err (&pdev->dev,"cannot prepare/enable keypad clock\n" ); +return ret; + } + +devm_add_action_or_reset (&pdev->dev, + (void (*)(void *))clk_disable_unprepare, + keypad->clk);
Pls don't do that and instead add a internal driver function.
drivers/input/keyboard/mtk-kpd.c line 171
Quoted 5 lines
drivers/input/keyboard/mtk-kpd.c new file +5
-0+ + keypad_pinctrl =devm_pinctrl_get (&pdev->dev); +if (IS_ERR (keypad_pinctrl)) { +return PTR_ERR (keypad_pinctrl); + }
Not needed braces.
Quoted 27 lines
drivers/input/keyboard/mtk-kpd.c new file +27
-0+ + kpd_default =pinctrl_lookup_state (keypad_pinctrl,"default" ); +if (IS_ERR (kpd_default)) { +dev_err (&pdev->dev,"No default pinctrl state\n" ); +return PTR_ERR (kpd_default); + } + +pinctrl_select_state (keypad_pinctrl, kpd_default); + + irqnr =platform_get_irq (pdev,0 ); +if (irqnr <0 ) { +dev_err (&pdev->dev,"Failed to get irq\n" ); +return -irqnr; + } + + 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" , + irqnr, ret); +return ret; + } + + ret =input_register_device (keypad->input_dev); +if (ret) { +dev_err (&pdev->dev,"Failed to register device\n" );
drivers/input/keyboard/mtk-kpd.c line 208
Quoted 10 lines
drivers/input/keyboard/mtk-kpd.c new file +10
-0+return ret; + } + +device_init_wakeup (&pdev->dev, keypad->wakeup); + +return 0 ; +} + +static const struct of_device_id kpd_of_match[] = { + {.compatible ="mediatek,kp" },
I would also add the specific compatible which you list in the dt-bindings patch.
Quoted 17 lines
drivers/input/keyboard/mtk-kpd.c new file +15
-0+ {/*sentinel*/ } +}; + +static struct platform_driver kpd_pdrv = { + .probe = kpd_pdrv_probe, + .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
Pls use checkpatch the next time, there are several style issues. Also it is quite common to use a vendor prefix for funtions e.g. mtk_kpd_probe() and mtk_kpd_irq_handler() but this is up to you.
Regards,
Marco
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v7 2/3] drivers: input: keyboard: Add mtk keypad driver
In reply to Fengping YuQuoted 3 lines · Fengping Yu
From: "fengping.yu" <[email protected]>
This adds matrix keypad support for Mediatek SoCs.
...
drivers/input/keyboard/Kconfig config KEYBOARD_BCM · line 787
Quoted 4 lines
drivers/input/keyboard/Kconfig +3
-0+config KEYBOARD_MTK_KPD + tristate "MediaTek Keypad Support" + depends on OF && HAVE_CLK
What makes it OF dependent?
Quoted 5 lines
drivers/input/keyboard/Kconfig +5
-0+ help + Say Y here if you want to use the keypad on MediaTek SoCs. + If unsure, say N. + To compile this driver as a module, choose M here: the + module will be called mtk-kpd.
...
Quoted 1 line
+#define
KPD_DEBOUNCE_MAX_US256000 /*256ms */
Comment, besides missed space, is redundant. That's how we use unit suffixes in the definitions.
...
drivers/input/keyboard/mtk-kpd.c line 41
Quoted 6 lines
drivers/input/keyboard/mtk-kpd.c new file +5
-0+static const struct regmap_config keypad_regmap_cfg = { + .reg_bits =32 , + .val_bits =32 , + .reg_stride =sizeof (u32), + .max_register =0x0024 ,
Can it be definition?
Quoted 1 line
+};
...
drivers/input/keyboard/mtk-kpd.c line 90
Quoted 3 lines
drivers/input/keyboard/mtk-kpd.c new file +3
-0+ keypad =devm_kzalloc (&pdev->dev,sizeof (*keypad),GFP_KERNEL ); +if (!keypad) +return -ENOMEM ;
+ blank line here.
Quoted 3 lines
drivers/input/keyboard/mtk-kpd.c new file +3
-0+ keypad->base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (keypad->base)) +return PTR_ERR (keypad->base);
...
drivers/input/keyboard/mtk-kpd.c line 129
Quoted 2 lines
drivers/input/keyboard/mtk-kpd.c new file +2
-0+if (debounce >KPD_DEBOUNCE_MAX_US ) { +dev_err (&pdev->dev,"Debounce time exceeds the maximum allowed time 256ms\n" );
...%dus\n", KPD_DEBOUNCE_MAX_US); or ...%dms\n", KPD_DEBOUNCE_MAX_US / USEC_PER_MSEC);
Quoted 2 lines
(quoted diff) +2
-0+ return -EINVAL; + }
...
drivers/input/keyboard/mtk-kpd.c line 171
Quoted 5 lines
drivers/input/keyboard/mtk-kpd.c new file +4
-0+ keypad_pinctrl =devm_pinctrl_get (&pdev->dev); +if (IS_ERR (keypad_pinctrl)) { +return PTR_ERR (keypad_pinctrl); + }
Extra {}.
...
drivers/input/keyboard/mtk-kpd.c line 175
Quoted 4 lines
drivers/input/keyboard/mtk-kpd.c new file +3
-0+ kpd_default =pinctrl_lookup_state (keypad_pinctrl,"default" ); +if (IS_ERR (kpd_default)) { +dev_err (&pdev->dev,"No default pinctrl state\n" );
Isn't it done by pin control core?
drivers/input/keyboard/mtk-kpd.c line 179
Quoted 4 lines
drivers/input/keyboard/mtk-kpd.c new file +4
-0+return PTR_ERR (kpd_default); + } + +pinctrl_select_state (keypad_pinctrl, kpd_default);
And basically entire part is duplicating device core part? (Look at dd.c)
...
drivers/input/keyboard/mtk-kpd.c line 183
Quoted 4 lines
drivers/input/keyboard/mtk-kpd.c new file +3
-0+ irqnr =platform_get_irq (pdev,0 ); +if (irqnr <0 ) { +dev_err (&pdev->dev,"Failed to get irq\n" );
This duplicates what platform core does.
drivers/input/keyboard/mtk-kpd.c line 184
Quoted 1 line
drivers/input/keyboard/mtk-kpd.c new file +1
-0+return -irqnr;
- ?!
Quoted 1 line
(quoted diff) +1
-0+ }
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 2/3] drivers: input: keyboard: Add mtk keypad driver
Quoted 5 lines · Andy Shevchenko
Quoted 3 lines · Fengping Yu
From: "fengping.yu" <[email protected]>
This adds matrix keypad support for Mediatek SoCs.
Quoted 8 lines
...
drivers/input/keyboard/Kconfig config KEYBOARD_BCM · line 787
Quoted 4 lines
drivers/input/keyboard/Kconfig +3
-0+config KEYBOARD_MTK_KPD + tristate "MediaTek Keypad Support" + depends on OF && HAVE_CLKWhat makes it OF dependent?
Actually you missed regmap dependencies or selection. I dunno which one should be used (IIRC selection).
Quoted 5 lines
Quoted 5 lines
drivers/input/keyboard/Kconfig +5
-0+ help + Say Y here if you want to use the keypad on MediaTek SoCs. + If unsure, say N. + To compile this driver as a module, choose M here: the + module will be called mtk-kpd.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v7 3/3 configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y
In reply to Fengping YuFrom: "fengping.yu" <[email protected]>
Add Mediatek matrix keypad support in defconfig.
--- arch/arm64/configs/defconfig | 2 ++ 1 file changed, 2 insertions(+)
arch/arm64/configs/defconfig +2 -0
@@ -349,6 +349,8 @@ CONFIG_KEYBOARD_GPIO=y 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
Signature · 5 lines
2.18.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v7 3/3] configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y
Hi,
Quoted 14 lines · Fengping Yu
From: "fengping.yu" <[email protected]>
Add Mediatek matrix keypad support in defconfig.
Signed-off-by fengping.yu <[email protected]>--- arch/arm64/configs/defconfig | 2 ++ 1 file changed, 2 insertions(+)arch/arm64/configs/defconfig +0
-0
arch/arm64/configs/defconfig CONFIG_KEYBOARD_GPIO=y · line 352
Quoted 4 lines
arch/arm64/configs/defconfig +1
-0@@ -349,6 +349,8 @@ CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_SNVS_PWRKEY=m CONFIG_KEYBOARD_IMX_SC_KEY=m CONFIG_KEYBOARD_CROS_EC=y +CONFIG_KEYBOARD_MTK_KPD=y
Why not as module?
arch/arm64/configs/defconfig CONFIG_KEYBOARD_GPIO=y · line 353
Quoted 1 line
arch/arm64/configs/defconfig +1
-0+# CONFIG_KEYBOARD_MTK_PMIC is not set
Also this is a unrelated add.
Regards,
Marco
Quoted 5 lines
arch/arm64/configs/defconfig +0
-0CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_INPUT_MISC=ySignature · 1 line
2.18.0
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel