* [PATCH v6] Add mtk matrix keypad driver for keypad on MTK SoC @ 2020-05-09 2:04 ` Fengping Yu 0 siblings, 0 replies; 12+ messages in thread From: Fengping Yu @ 2020-05-09 2:04 UTC (permalink / raw) To: Marco Felsch, Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen Cc: linux-input, linux-arm-kernel, linux-mediatek, linux-kernel Change since v5: - remove unnecessary include files - remove redundant comments and newlines - use local irqnr variable instead of member variable of mtk_keypad struct - use regmap to read and write registers - drop kpd_get_dts_info directly into probe function - use devm_add_action_or_reset to avoid goto error handling when do clk setting - use devm_request_threaded_irq api to request irq - remove platform_set_drvdata fengping.yu (3): dt-bindings: Change keypad documentation schema drivers: input: keyboard: Add mtk keypad driver configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y .../devicetree/bindings/input/mtk-kpd.txt | 61 ------- .../devicetree/bindings/input/mtk-kpd.yaml | 93 +++++++++++ arch/arm64/configs/defconfig | 1 + drivers/input/keyboard/Kconfig | 5 +- drivers/input/keyboard/mtk-kpd.c | 151 ++++++++---------- 5 files changed, 163 insertions(+), 148 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml -- 2.18.0 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v6] Add mtk matrix keypad driver for keypad on MTK SoC @ 2020-05-09 2:04 ` Fengping Yu 0 siblings, 0 replies; 12+ messages in thread From: Fengping Yu @ 2020-05-09 2:04 UTC (permalink / raw) To: Marco Felsch, Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen Cc: linux-mediatek, linux-kernel, linux-arm-kernel, linux-input Change since v5: - remove unnecessary include files - remove redundant comments and newlines - use local irqnr variable instead of member variable of mtk_keypad struct - use regmap to read and write registers - drop kpd_get_dts_info directly into probe function - use devm_add_action_or_reset to avoid goto error handling when do clk setting - use devm_request_threaded_irq api to request irq - remove platform_set_drvdata fengping.yu (3): dt-bindings: Change keypad documentation schema drivers: input: keyboard: Add mtk keypad driver configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y .../devicetree/bindings/input/mtk-kpd.txt | 61 ------- .../devicetree/bindings/input/mtk-kpd.yaml | 93 +++++++++++ arch/arm64/configs/defconfig | 1 + drivers/input/keyboard/Kconfig | 5 +- drivers/input/keyboard/mtk-kpd.c | 151 ++++++++---------- 5 files changed, 163 insertions(+), 148 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v6] Add mtk matrix keypad driver for keypad on MTK SoC @ 2020-05-09 2:04 ` Fengping Yu 0 siblings, 0 replies; 12+ messages in thread From: Fengping Yu @ 2020-05-09 2:04 UTC (permalink / raw) To: Marco Felsch, Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen Cc: linux-mediatek, linux-kernel, linux-arm-kernel, linux-input Change since v5: - remove unnecessary include files - remove redundant comments and newlines - use local irqnr variable instead of member variable of mtk_keypad struct - use regmap to read and write registers - drop kpd_get_dts_info directly into probe function - use devm_add_action_or_reset to avoid goto error handling when do clk setting - use devm_request_threaded_irq api to request irq - remove platform_set_drvdata fengping.yu (3): dt-bindings: Change keypad documentation schema drivers: input: keyboard: Add mtk keypad driver configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y .../devicetree/bindings/input/mtk-kpd.txt | 61 ------- .../devicetree/bindings/input/mtk-kpd.yaml | 93 +++++++++++ arch/arm64/configs/defconfig | 1 + drivers/input/keyboard/Kconfig | 5 +- drivers/input/keyboard/mtk-kpd.c | 151 ++++++++---------- 5 files changed, 163 insertions(+), 148 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v6 1/3] dt-bindings: Change keypad documentation schema 2020-05-09 2:04 ` Fengping Yu @ 2020-05-09 2:04 ` Fengping Yu -1 siblings, 0 replies; 12+ messages in thread From: Fengping Yu @ 2020-05-09 2:04 UTC (permalink / raw) To: Marco Felsch, Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen Cc: fengping.yu, linux-mediatek, linux-kernel, linux-arm-kernel, linux-input From: "fengping.yu" <fengping.yu@mediatek.com> Change Mediatek matrix keypad dt-bindings doc to yaml schema. Signed-off-by: fengping.yu <fengping.yu@mediatek.com> --- .../devicetree/bindings/input/mtk-kpd.txt | 61 ------------ .../devicetree/bindings/input/mtk-kpd.yaml | 93 +++++++++++++++++++ 2 files changed, 93 insertions(+), 61 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml diff --git a/Documentation/devicetree/bindings/input/mtk-kpd.txt b/Documentation/devicetree/bindings/input/mtk-kpd.txt deleted file mode 100644 index 8b154a5e2f7d..000000000000 --- a/Documentation/devicetree/bindings/input/mtk-kpd.txt +++ /dev/null @@ -1,61 +0,0 @@ -* Mediatek's Keypad Controller device tree binding - -Mediatek's Keypad controller is used to interface a SoC with a matrix-type -keypad device. The keypad controller supports multiple row and column lines. -A key can be placed at each intersection of a unique row and a unique column. -The keypad controller can sense a key-press and key-release and report the -event using a interrupt to the cpu. - -Required properties: -- compatible should contain: - * "mediatek,kp" for common keypad - * "mediatek,mt6779-keypad" for specific keypad chip - -- reg: The base address of the Keypad register bank. - -- interrupts: A single interrupt specifier. - -- mediatek,debounce-us: Debounce interval in microseconds, maximum value - is 256000 microseconds. - -- keypad,num-rows: Number of row lines connected to the keypad controller, it is - not equal to PCB rows number, instead you should add required value for each IC. - -- keypad,num-columns: Number of column lines connected to the keypad controller, - it is not equal to PCB columns number, instead you should add required value - for each IC. - -- linux,keymap: The keymap for keys as described in the binding document - devicetree/bindings/input/matrix-keymap.txt. - -- pinctrl: Should specify pin control groups used for this controller. - See ../pinctrl/pinctrl-bindings.txt for details. - -- clocks: Must contain one entry, for the module clock. - See ../clocks/clock-bindings.txt for details. - -- clock-names: Names of the clocks listed in clocks property in the same order. - -Optional Properties: -- wakeup-source: use any event on keypad as wakeup event. - -Example: - - keypad: kp@10010000 { - compatible = "mediatek,kp"; - reg = <0 0x10010000 0 0x1000>; - wakeup-source; - interrupts = <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>; - }; diff --git a/Documentation/devicetree/bindings/input/mtk-kpd.yaml b/Documentation/devicetree/bindings/input/mtk-kpd.yaml new file mode 100644 index 000000000000..bd4247322e3c --- /dev/null +++ b/Documentation/devicetree/bindings/input/mtk-kpd.yaml @@ -0,0 +1,93 @@ +%YAML 1.2 +--- +version: 1 + +id: mtk-keypad + +title: Mediatek's Keypad Controller device tree bindings + +maintainer: + - name: Fengping Yu <fengping.yu@mediatek.com> + +description: > + TODO + +properties: + - name: "compatible" + constraint: | + "mediatek,mt6779-keypad" + "mediatek, kp" + clock-names: + clocks: + interrupts: + linux,keymap + pinctrl-0: + pinctrl-names: + reg: + wakeup-source: + keypad,num-columns: + keypad,num-rows: + mediatek,debounce-us + status: +... +# * Mediatek's Keypad Controller device tree binding +# +# Mediatek's Keypad controller is used to interface a SoC with a matrix-type +# keypad device. The keypad controller supports multiple row and column lines. +# A key can be placed at each intersection of a unique row and a unique column. +# The keypad controller can sense a key-press and key-release and report the +# event using a interrupt to the cpu. +# +# Required properties: +# - compatible should contain: +# * "mediatek,kp" for common keypad +# * "mediatek,mt6779-keypad" for specific keypad chip +# +# - reg: The base address of the Keypad register bank. +# +# - interrupts: A single interrupt specifier. +# +# - mediatek,debounce-us: Debounce interval in microseconds, maximum value +# is 256000 microseconds. +# +# - keypad,num-rows: Number of row lines connected to the keypad controller, it is +# not equal to PCB rows number, instead you should add required value for each IC. +# +# - keypad,num-columns: Number of column lines connected to the keypad controller, +# it is not equal to PCB columns number, instead you should add required value +# for each IC. +# +# - linux,keymap: The keymap for keys as described in the binding document +# devicetree/bindings/input/matrix-keymap.txt. +# +# - pinctrl: Should specify pin control groups used for this controller. +# See ../pinctrl/pinctrl-bindings.txt for details. +# +# - clocks: Must contain one entry, for the module clock. +# See ../clocks/clock-bindings.txt for details. +# +# - clock-names: Names of the clocks listed in clocks property in the same order. +# +# Optional Properties: +# - wakeup-source: use any event on keypad as wakeup event. +# +# Example: +# +# keypad: kp@10010000 { +# compatible = "mediatek,kp"; +# reg = <0 0x10010000 0 0x1000>; +# wakeup-source; +# interrupts = <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>; +# }; -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 1/3] dt-bindings: Change keypad documentation schema @ 2020-05-09 2:04 ` Fengping Yu 0 siblings, 0 replies; 12+ messages in thread From: Fengping Yu @ 2020-05-09 2:04 UTC (permalink / raw) To: Marco Felsch, Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen Cc: fengping.yu, linux-mediatek, linux-kernel, linux-arm-kernel, linux-input From: "fengping.yu" <fengping.yu@mediatek.com> Change Mediatek matrix keypad dt-bindings doc to yaml schema. Signed-off-by: fengping.yu <fengping.yu@mediatek.com> --- .../devicetree/bindings/input/mtk-kpd.txt | 61 ------------ .../devicetree/bindings/input/mtk-kpd.yaml | 93 +++++++++++++++++++ 2 files changed, 93 insertions(+), 61 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml diff --git a/Documentation/devicetree/bindings/input/mtk-kpd.txt b/Documentation/devicetree/bindings/input/mtk-kpd.txt deleted file mode 100644 index 8b154a5e2f7d..000000000000 --- a/Documentation/devicetree/bindings/input/mtk-kpd.txt +++ /dev/null @@ -1,61 +0,0 @@ -* Mediatek's Keypad Controller device tree binding - -Mediatek's Keypad controller is used to interface a SoC with a matrix-type -keypad device. The keypad controller supports multiple row and column lines. -A key can be placed at each intersection of a unique row and a unique column. -The keypad controller can sense a key-press and key-release and report the -event using a interrupt to the cpu. - -Required properties: -- compatible should contain: - * "mediatek,kp" for common keypad - * "mediatek,mt6779-keypad" for specific keypad chip - -- reg: The base address of the Keypad register bank. - -- interrupts: A single interrupt specifier. - -- mediatek,debounce-us: Debounce interval in microseconds, maximum value - is 256000 microseconds. - -- keypad,num-rows: Number of row lines connected to the keypad controller, it is - not equal to PCB rows number, instead you should add required value for each IC. - -- keypad,num-columns: Number of column lines connected to the keypad controller, - it is not equal to PCB columns number, instead you should add required value - for each IC. - -- linux,keymap: The keymap for keys as described in the binding document - devicetree/bindings/input/matrix-keymap.txt. - -- pinctrl: Should specify pin control groups used for this controller. - See ../pinctrl/pinctrl-bindings.txt for details. - -- clocks: Must contain one entry, for the module clock. - See ../clocks/clock-bindings.txt for details. - -- clock-names: Names of the clocks listed in clocks property in the same order. - -Optional Properties: -- wakeup-source: use any event on keypad as wakeup event. - -Example: - - keypad: kp@10010000 { - compatible = "mediatek,kp"; - reg = <0 0x10010000 0 0x1000>; - wakeup-source; - interrupts = <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>; - }; diff --git a/Documentation/devicetree/bindings/input/mtk-kpd.yaml b/Documentation/devicetree/bindings/input/mtk-kpd.yaml new file mode 100644 index 000000000000..bd4247322e3c --- /dev/null +++ b/Documentation/devicetree/bindings/input/mtk-kpd.yaml @@ -0,0 +1,93 @@ +%YAML 1.2 +--- +version: 1 + +id: mtk-keypad + +title: Mediatek's Keypad Controller device tree bindings + +maintainer: + - name: Fengping Yu <fengping.yu@mediatek.com> + +description: > + TODO + +properties: + - name: "compatible" + constraint: | + "mediatek,mt6779-keypad" + "mediatek, kp" + clock-names: + clocks: + interrupts: + linux,keymap + pinctrl-0: + pinctrl-names: + reg: + wakeup-source: + keypad,num-columns: + keypad,num-rows: + mediatek,debounce-us + status: +... +# * Mediatek's Keypad Controller device tree binding +# +# Mediatek's Keypad controller is used to interface a SoC with a matrix-type +# keypad device. The keypad controller supports multiple row and column lines. +# A key can be placed at each intersection of a unique row and a unique column. +# The keypad controller can sense a key-press and key-release and report the +# event using a interrupt to the cpu. +# +# Required properties: +# - compatible should contain: +# * "mediatek,kp" for common keypad +# * "mediatek,mt6779-keypad" for specific keypad chip +# +# - reg: The base address of the Keypad register bank. +# +# - interrupts: A single interrupt specifier. +# +# - mediatek,debounce-us: Debounce interval in microseconds, maximum value +# is 256000 microseconds. +# +# - keypad,num-rows: Number of row lines connected to the keypad controller, it is +# not equal to PCB rows number, instead you should add required value for each IC. +# +# - keypad,num-columns: Number of column lines connected to the keypad controller, +# it is not equal to PCB columns number, instead you should add required value +# for each IC. +# +# - linux,keymap: The keymap for keys as described in the binding document +# devicetree/bindings/input/matrix-keymap.txt. +# +# - pinctrl: Should specify pin control groups used for this controller. +# See ../pinctrl/pinctrl-bindings.txt for details. +# +# - clocks: Must contain one entry, for the module clock. +# See ../clocks/clock-bindings.txt for details. +# +# - clock-names: Names of the clocks listed in clocks property in the same order. +# +# Optional Properties: +# - wakeup-source: use any event on keypad as wakeup event. +# +# Example: +# +# keypad: kp@10010000 { +# compatible = "mediatek,kp"; +# reg = <0 0x10010000 0 0x1000>; +# wakeup-source; +# interrupts = <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>; +# }; -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 2/3] drivers: input: keyboard: Add mtk keypad driver 2020-05-09 2:04 ` Fengping Yu @ 2020-05-09 2:05 ` Fengping Yu -1 siblings, 0 replies; 12+ messages in thread From: Fengping Yu @ 2020-05-09 2:05 UTC (permalink / raw) To: Marco Felsch, Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen Cc: fengping.yu, linux-mediatek, linux-kernel, linux-arm-kernel, linux-input From: "fengping.yu" <fengping.yu@mediatek.com> This adds matrix keypad support for Mediatek SoCs. Signed-off-by: fengping.yu <fengping.yu@mediatek.com> --- drivers/input/keyboard/Kconfig | 5 +- drivers/input/keyboard/mtk-kpd.c | 151 ++++++++++++++----------------- 2 files changed, 69 insertions(+), 87 deletions(-) diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 4a387d8683b1..4ed9eff681f1 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -774,9 +774,10 @@ config KEYBOARD_BCM config KEYBOARD_MTK_KPD tristate "MediaTek Keypad Support" + depends on OF && HAVE_CLK help - Say Y here if you want to use the keypad. - If unuse, say N. + Say Y here if you want to use the keypad on MediaTek SoCs. + If unsure, say N. To compile this driver as a module, choose M here: the module will be called mtk-kpd. diff --git a/drivers/input/keyboard/mtk-kpd.c b/drivers/input/keyboard/mtk-kpd.c index 7f8f091b2734..a538f89d6696 100644 --- a/drivers/input/keyboard/mtk-kpd.c +++ b/drivers/input/keyboard/mtk-kpd.c @@ -4,16 +4,14 @@ * Author Terry Chang <terry.chang@mediatek.com> */ #include <linux/clk.h> -#include <linux/gpio.h> -#include <linux/init.h> #include <linux/input/matrix_keypad.h> #include <linux/interrupt.h> -#include <linux/io.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> +#include <linux/property.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/bitops.h> #define KPD_NAME "mtk-kpd" @@ -21,26 +19,30 @@ #define KP_DEBOUNCE 0x0018 #define KPD_DEBOUNCE_MASK GENMASK(13, 0) -#define KPD_DEBOUNCE_MAX 256000 +#define KPD_DEBOUNCE_MAX_US 256000 /*256ms */ #define KPD_NUM_MEMS 5 #define KPD_NUM_BITS 136 /* 4 * 32 + 8 MEM5 only use 8 BITS */ -#define BITS_TO_U32(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32)) struct mtk_keypad { + struct regmap *regmap; struct input_dev *input_dev; struct clk *clk; void __iomem *base; - unsigned int irqnr; bool wakeup; - u32 key_debounce; u32 n_rows; u32 n_cols; DECLARE_BITMAP(keymap_state, KPD_NUM_BITS); }; +static const struct regmap_config keypad_regmap_cfg = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = sizeof(u32), + .max_register = 0x0024, +}; + static irqreturn_t kpd_irq_handler(int irq, void *dev_id) { - /* use _nosync to avoid deadlock */ struct mtk_keypad *keypad = dev_id; unsigned short *keycode = keypad->input_dev->keycode; DECLARE_BITMAP(new_state, KPD_NUM_BITS); @@ -49,16 +51,17 @@ static irqreturn_t kpd_irq_handler(int irq, void *dev_id) int pressed; unsigned short code; - memcpy_fromio(new_state, keypad->base + KP_MEM, KPD_NUM_MEMS); + regmap_raw_read(keypad->regmap, KP_MEM, new_state, KPD_NUM_MEMS); bitmap_xor(change, new_state, keypad->keymap_state, KPD_NUM_BITS); for_each_set_bit(bit_nr, change, KPD_NUM_BITS) { - pressed = test_bit(bit_nr, new_state) == 0U; + /* 1: not pressed, 0: pressed */ + pressed = !test_bit(bit_nr, new_state); dev_dbg(&keypad->input_dev->dev, "%s", pressed ? "pressed" : "released"); - /* per 32bit register only use low 16bit as keypad mem register */ + /* 32bit register only use low 16bit as keypad mem register */ code = keycode[bit_nr - 16 * (BITS_TO_U32(bit_nr) - 1)]; input_report_key(keypad->input_dev, code, pressed); @@ -73,51 +76,29 @@ static irqreturn_t kpd_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } -static int kpd_get_dts_info(struct mtk_keypad *keypad) -{ - int ret; - struct device *dev = keypad->input_dev->dev.parent; - struct device_node *node = dev->of_node; - - ret = matrix_keypad_parse_properties(dev, &keypad->n_rows, - &keypad->n_cols); - - if (ret) { - dev_err(dev, "Failed to parse keypad params\n"); - return ret; - } - - ret = device_property_read_u32(dev, "mediatek,debounce-us", - &keypad->key_debounce); - if (ret) { - dev_err(dev, "Failed to read mediatek debounce time\n"); - return ret; - } - - if (keypad->key_debounce > KPD_DEBOUNCE_MAX) { - dev_err(dev, "Debounce time exceeds the maximum allowed time 256ms\n"); - return -EINVAL; - } - - keypad->wakeup = device_property_read_bool(node, "wakeup-source"); - - dev_dbg(dev, "n_row=%d n_col=%d debounce=%d\n", - keypad->n_rows, keypad->n_cols, - keypad->key_debounce); - - return 0; -} - static int kpd_pdrv_probe(struct platform_device *pdev) { struct mtk_keypad *keypad; struct pinctrl *keypad_pinctrl; struct pinctrl_state *kpd_default; + unsigned int irqnr; + u32 debounce; int ret; keypad = devm_kzalloc(&pdev->dev, sizeof(*keypad), GFP_KERNEL); if (!keypad) return -ENOMEM; + keypad->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(keypad->base)) + return PTR_ERR(keypad->base); + + keypad->regmap = devm_regmap_init_mmio_clk(&pdev->dev, NULL, + keypad->base, &keypad_regmap_cfg); + if (IS_ERR(keypad->regmap)) { + dev_err(&pdev->dev, + "regmap init failed:%ld\n", PTR_ERR(keypad->regmap)); + return PTR_ERR(keypad->regmap); + } bitmap_fill(keypad->keymap_state, KPD_NUM_BITS); @@ -130,18 +111,35 @@ static int kpd_pdrv_probe(struct platform_device *pdev) keypad->input_dev->name = KPD_NAME; keypad->input_dev->id.bustype = BUS_HOST; - ret = kpd_get_dts_info(keypad); + ret = matrix_keypad_parse_properties(&pdev->dev, &keypad->n_rows, + &keypad->n_cols); + if (ret) { + dev_err(&pdev->dev, "Failed to parse keypad params\n"); + return ret; + } + + ret = device_property_read_u32(&pdev->dev, "mediatek,debounce-us", + &debounce); if (ret) { - dev_err(&pdev->dev, "Failed to get dts info\n"); + dev_err(&pdev->dev, "Failed to read mediatek debounce time\n"); return ret; } + if (debounce > KPD_DEBOUNCE_MAX_US) { + dev_err(&pdev->dev, "Debounce time exceeds the maximum allowed time 256ms\n"); + return -EINVAL; + } + + keypad->wakeup = device_property_read_bool(&pdev->dev, "wakeup-source"); + + dev_dbg(&pdev->dev, "n_row=%d n_col=%d debounce=%d\n", + keypad->n_rows, keypad->n_cols, debounce); + ret = matrix_keypad_build_keymap(NULL, NULL, keypad->n_rows, keypad->n_cols, NULL, keypad->input_dev); - if (ret) { dev_err(&pdev->dev, "Failed to build keymap\n"); return ret; @@ -149,19 +147,8 @@ static int kpd_pdrv_probe(struct platform_device *pdev) input_set_drvdata(keypad->input_dev, keypad); - keypad->base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(keypad->base)) { - dev_err(&pdev->dev, "Failed to get resource and iomap keypad\n"); - return PTR_ERR(keypad->base); - } - - if (keypad->key_debounce > KPD_DEBOUNCE_MAX) { - dev_err(&pdev->dev, "Invalid debounce time value.\n"); - return -EINVAL; - } - - writew(keypad->key_debounce * 32 / 1000 & KPD_DEBOUNCE_MASK, - keypad->base + KP_DEBOUNCE); + regmap_write(keypad->regmap, KP_DEBOUNCE, + debounce * 32 / 1000 & KPD_DEBOUNCE_MASK); keypad->clk = devm_clk_get(&pdev->dev, "kpd"); if (IS_ERR(keypad->clk)) { @@ -174,57 +161,52 @@ static int kpd_pdrv_probe(struct platform_device *pdev) return ret; } + devm_add_action_or_reset(&pdev->dev, + (void (*)(void *))clk_disable_unprepare, + keypad->clk); + keypad_pinctrl = devm_pinctrl_get(&pdev->dev); if (IS_ERR(keypad_pinctrl)) { - ret = PTR_ERR(keypad_pinctrl); - goto disable_kpd_clk; + return PTR_ERR(keypad_pinctrl); } kpd_default = pinctrl_lookup_state(keypad_pinctrl, "default"); if (IS_ERR(kpd_default)) { dev_err(&pdev->dev, "No default pinctrl state\n"); - ret = PTR_ERR(kpd_default); - goto disable_kpd_clk; + return PTR_ERR(kpd_default); } pinctrl_select_state(keypad_pinctrl, kpd_default); - keypad->irqnr = platform_get_irq(pdev, 0); - if (keypad->irqnr < 0) { + irqnr = platform_get_irq(pdev, 0); + if (irqnr < 0) { dev_err(&pdev->dev, "Failed to get irq\n"); - ret = -keypad->irqnr; - goto disable_kpd_clk; + return -irqnr; } - ret = devm_request_irq(&pdev->dev, keypad->irqnr, - kpd_irq_handler, 0, + ret = devm_request_threaded_irq(&pdev->dev, irqnr, + NULL, kpd_irq_handler, 0, KPD_NAME, keypad); if (ret) { dev_err(&pdev->dev, "Failed to request IRQ#%d:%d\n", - keypad->irqnr, ret); - goto disable_kpd_clk; + irqnr, ret); + return ret; } ret = input_register_device(keypad->input_dev); if (ret) { dev_err(&pdev->dev, "Failed to register device\n"); - goto disable_kpd_clk; + return ret; } device_init_wakeup(&pdev->dev, keypad->wakeup); - platform_set_drvdata(pdev, keypad); - return 0; - -disable_kpd_clk: - clk_disable_unprepare(keypad->clk); - return ret; } static const struct of_device_id kpd_of_match[] = { {.compatible = "mediatek,kp"}, - {} + {/*sentinel*/} }; static struct platform_driver kpd_pdrv = { @@ -234,7 +216,6 @@ static struct platform_driver kpd_pdrv = { .of_match_table = kpd_of_match, }, }; - module_platform_driver(kpd_pdrv); MODULE_AUTHOR("Mediatek Corporation"); -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 2/3] drivers: input: keyboard: Add mtk keypad driver @ 2020-05-09 2:05 ` Fengping Yu 0 siblings, 0 replies; 12+ messages in thread From: Fengping Yu @ 2020-05-09 2:05 UTC (permalink / raw) To: Marco Felsch, Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen Cc: fengping.yu, linux-mediatek, linux-kernel, linux-arm-kernel, linux-input From: "fengping.yu" <fengping.yu@mediatek.com> This adds matrix keypad support for Mediatek SoCs. Signed-off-by: fengping.yu <fengping.yu@mediatek.com> --- drivers/input/keyboard/Kconfig | 5 +- drivers/input/keyboard/mtk-kpd.c | 151 ++++++++++++++----------------- 2 files changed, 69 insertions(+), 87 deletions(-) diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 4a387d8683b1..4ed9eff681f1 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -774,9 +774,10 @@ config KEYBOARD_BCM config KEYBOARD_MTK_KPD tristate "MediaTek Keypad Support" + depends on OF && HAVE_CLK help - Say Y here if you want to use the keypad. - If unuse, say N. + Say Y here if you want to use the keypad on MediaTek SoCs. + If unsure, say N. To compile this driver as a module, choose M here: the module will be called mtk-kpd. diff --git a/drivers/input/keyboard/mtk-kpd.c b/drivers/input/keyboard/mtk-kpd.c index 7f8f091b2734..a538f89d6696 100644 --- a/drivers/input/keyboard/mtk-kpd.c +++ b/drivers/input/keyboard/mtk-kpd.c @@ -4,16 +4,14 @@ * Author Terry Chang <terry.chang@mediatek.com> */ #include <linux/clk.h> -#include <linux/gpio.h> -#include <linux/init.h> #include <linux/input/matrix_keypad.h> #include <linux/interrupt.h> -#include <linux/io.h> #include <linux/module.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> +#include <linux/property.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/bitops.h> #define KPD_NAME "mtk-kpd" @@ -21,26 +19,30 @@ #define KP_DEBOUNCE 0x0018 #define KPD_DEBOUNCE_MASK GENMASK(13, 0) -#define KPD_DEBOUNCE_MAX 256000 +#define KPD_DEBOUNCE_MAX_US 256000 /*256ms */ #define KPD_NUM_MEMS 5 #define KPD_NUM_BITS 136 /* 4 * 32 + 8 MEM5 only use 8 BITS */ -#define BITS_TO_U32(nr) DIV_ROUND_UP(nr, BITS_PER_BYTE * sizeof(u32)) struct mtk_keypad { + struct regmap *regmap; struct input_dev *input_dev; struct clk *clk; void __iomem *base; - unsigned int irqnr; bool wakeup; - u32 key_debounce; u32 n_rows; u32 n_cols; DECLARE_BITMAP(keymap_state, KPD_NUM_BITS); }; +static const struct regmap_config keypad_regmap_cfg = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = sizeof(u32), + .max_register = 0x0024, +}; + static irqreturn_t kpd_irq_handler(int irq, void *dev_id) { - /* use _nosync to avoid deadlock */ struct mtk_keypad *keypad = dev_id; unsigned short *keycode = keypad->input_dev->keycode; DECLARE_BITMAP(new_state, KPD_NUM_BITS); @@ -49,16 +51,17 @@ static irqreturn_t kpd_irq_handler(int irq, void *dev_id) int pressed; unsigned short code; - memcpy_fromio(new_state, keypad->base + KP_MEM, KPD_NUM_MEMS); + regmap_raw_read(keypad->regmap, KP_MEM, new_state, KPD_NUM_MEMS); bitmap_xor(change, new_state, keypad->keymap_state, KPD_NUM_BITS); for_each_set_bit(bit_nr, change, KPD_NUM_BITS) { - pressed = test_bit(bit_nr, new_state) == 0U; + /* 1: not pressed, 0: pressed */ + pressed = !test_bit(bit_nr, new_state); dev_dbg(&keypad->input_dev->dev, "%s", pressed ? "pressed" : "released"); - /* per 32bit register only use low 16bit as keypad mem register */ + /* 32bit register only use low 16bit as keypad mem register */ code = keycode[bit_nr - 16 * (BITS_TO_U32(bit_nr) - 1)]; input_report_key(keypad->input_dev, code, pressed); @@ -73,51 +76,29 @@ static irqreturn_t kpd_irq_handler(int irq, void *dev_id) return IRQ_HANDLED; } -static int kpd_get_dts_info(struct mtk_keypad *keypad) -{ - int ret; - struct device *dev = keypad->input_dev->dev.parent; - struct device_node *node = dev->of_node; - - ret = matrix_keypad_parse_properties(dev, &keypad->n_rows, - &keypad->n_cols); - - if (ret) { - dev_err(dev, "Failed to parse keypad params\n"); - return ret; - } - - ret = device_property_read_u32(dev, "mediatek,debounce-us", - &keypad->key_debounce); - if (ret) { - dev_err(dev, "Failed to read mediatek debounce time\n"); - return ret; - } - - if (keypad->key_debounce > KPD_DEBOUNCE_MAX) { - dev_err(dev, "Debounce time exceeds the maximum allowed time 256ms\n"); - return -EINVAL; - } - - keypad->wakeup = device_property_read_bool(node, "wakeup-source"); - - dev_dbg(dev, "n_row=%d n_col=%d debounce=%d\n", - keypad->n_rows, keypad->n_cols, - keypad->key_debounce); - - return 0; -} - static int kpd_pdrv_probe(struct platform_device *pdev) { struct mtk_keypad *keypad; struct pinctrl *keypad_pinctrl; struct pinctrl_state *kpd_default; + unsigned int irqnr; + u32 debounce; int ret; keypad = devm_kzalloc(&pdev->dev, sizeof(*keypad), GFP_KERNEL); if (!keypad) return -ENOMEM; + keypad->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(keypad->base)) + return PTR_ERR(keypad->base); + + keypad->regmap = devm_regmap_init_mmio_clk(&pdev->dev, NULL, + keypad->base, &keypad_regmap_cfg); + if (IS_ERR(keypad->regmap)) { + dev_err(&pdev->dev, + "regmap init failed:%ld\n", PTR_ERR(keypad->regmap)); + return PTR_ERR(keypad->regmap); + } bitmap_fill(keypad->keymap_state, KPD_NUM_BITS); @@ -130,18 +111,35 @@ static int kpd_pdrv_probe(struct platform_device *pdev) keypad->input_dev->name = KPD_NAME; keypad->input_dev->id.bustype = BUS_HOST; - ret = kpd_get_dts_info(keypad); + ret = matrix_keypad_parse_properties(&pdev->dev, &keypad->n_rows, + &keypad->n_cols); + if (ret) { + dev_err(&pdev->dev, "Failed to parse keypad params\n"); + return ret; + } + + ret = device_property_read_u32(&pdev->dev, "mediatek,debounce-us", + &debounce); if (ret) { - dev_err(&pdev->dev, "Failed to get dts info\n"); + dev_err(&pdev->dev, "Failed to read mediatek debounce time\n"); return ret; } + if (debounce > KPD_DEBOUNCE_MAX_US) { + dev_err(&pdev->dev, "Debounce time exceeds the maximum allowed time 256ms\n"); + return -EINVAL; + } + + keypad->wakeup = device_property_read_bool(&pdev->dev, "wakeup-source"); + + dev_dbg(&pdev->dev, "n_row=%d n_col=%d debounce=%d\n", + keypad->n_rows, keypad->n_cols, debounce); + ret = matrix_keypad_build_keymap(NULL, NULL, keypad->n_rows, keypad->n_cols, NULL, keypad->input_dev); - if (ret) { dev_err(&pdev->dev, "Failed to build keymap\n"); return ret; @@ -149,19 +147,8 @@ static int kpd_pdrv_probe(struct platform_device *pdev) input_set_drvdata(keypad->input_dev, keypad); - keypad->base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(keypad->base)) { - dev_err(&pdev->dev, "Failed to get resource and iomap keypad\n"); - return PTR_ERR(keypad->base); - } - - if (keypad->key_debounce > KPD_DEBOUNCE_MAX) { - dev_err(&pdev->dev, "Invalid debounce time value.\n"); - return -EINVAL; - } - - writew(keypad->key_debounce * 32 / 1000 & KPD_DEBOUNCE_MASK, - keypad->base + KP_DEBOUNCE); + regmap_write(keypad->regmap, KP_DEBOUNCE, + debounce * 32 / 1000 & KPD_DEBOUNCE_MASK); keypad->clk = devm_clk_get(&pdev->dev, "kpd"); if (IS_ERR(keypad->clk)) { @@ -174,57 +161,52 @@ static int kpd_pdrv_probe(struct platform_device *pdev) return ret; } + devm_add_action_or_reset(&pdev->dev, + (void (*)(void *))clk_disable_unprepare, + keypad->clk); + keypad_pinctrl = devm_pinctrl_get(&pdev->dev); if (IS_ERR(keypad_pinctrl)) { - ret = PTR_ERR(keypad_pinctrl); - goto disable_kpd_clk; + return PTR_ERR(keypad_pinctrl); } kpd_default = pinctrl_lookup_state(keypad_pinctrl, "default"); if (IS_ERR(kpd_default)) { dev_err(&pdev->dev, "No default pinctrl state\n"); - ret = PTR_ERR(kpd_default); - goto disable_kpd_clk; + return PTR_ERR(kpd_default); } pinctrl_select_state(keypad_pinctrl, kpd_default); - keypad->irqnr = platform_get_irq(pdev, 0); - if (keypad->irqnr < 0) { + irqnr = platform_get_irq(pdev, 0); + if (irqnr < 0) { dev_err(&pdev->dev, "Failed to get irq\n"); - ret = -keypad->irqnr; - goto disable_kpd_clk; + return -irqnr; } - ret = devm_request_irq(&pdev->dev, keypad->irqnr, - kpd_irq_handler, 0, + ret = devm_request_threaded_irq(&pdev->dev, irqnr, + NULL, kpd_irq_handler, 0, KPD_NAME, keypad); if (ret) { dev_err(&pdev->dev, "Failed to request IRQ#%d:%d\n", - keypad->irqnr, ret); - goto disable_kpd_clk; + irqnr, ret); + return ret; } ret = input_register_device(keypad->input_dev); if (ret) { dev_err(&pdev->dev, "Failed to register device\n"); - goto disable_kpd_clk; + return ret; } device_init_wakeup(&pdev->dev, keypad->wakeup); - platform_set_drvdata(pdev, keypad); - return 0; - -disable_kpd_clk: - clk_disable_unprepare(keypad->clk); - return ret; } static const struct of_device_id kpd_of_match[] = { {.compatible = "mediatek,kp"}, - {} + {/*sentinel*/} }; static struct platform_driver kpd_pdrv = { @@ -234,7 +216,6 @@ static struct platform_driver kpd_pdrv = { .of_match_table = kpd_of_match, }, }; - module_platform_driver(kpd_pdrv); MODULE_AUTHOR("Mediatek Corporation"); -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 3/3] configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y 2020-05-09 2:04 ` Fengping Yu @ 2020-05-09 2:05 ` Fengping Yu -1 siblings, 0 replies; 12+ messages in thread From: Fengping Yu @ 2020-05-09 2:05 UTC (permalink / raw) To: Marco Felsch, Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen Cc: fengping.yu, linux-mediatek, linux-kernel, linux-arm-kernel, linux-input From: "fengping.yu" <fengping.yu@mediatek.com> Add Mediatek matrix keypad support in defconfig. Signed-off-by: fengping.yu <fengping.yu@mediatek.com> --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7863352521e5..140c7a5832f7 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -317,6 +317,7 @@ CONFIG_KEYBOARD_SNVS_PWRKEY=m CONFIG_KEYBOARD_IMX_SC_KEY=m CONFIG_KEYBOARD_CROS_EC=y CONFIG_KEYBOARD_MTK_KPD=y +# CONFIG_KEYBOARD_MTK_PMIC is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_INPUT_MISC=y -- 2.18.0 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v6 3/3] configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y @ 2020-05-09 2:05 ` Fengping Yu 0 siblings, 0 replies; 12+ messages in thread From: Fengping Yu @ 2020-05-09 2:05 UTC (permalink / raw) To: Marco Felsch, Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen Cc: fengping.yu, linux-mediatek, linux-kernel, linux-arm-kernel, linux-input From: "fengping.yu" <fengping.yu@mediatek.com> Add Mediatek matrix keypad support in defconfig. Signed-off-by: fengping.yu <fengping.yu@mediatek.com> --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7863352521e5..140c7a5832f7 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -317,6 +317,7 @@ CONFIG_KEYBOARD_SNVS_PWRKEY=m CONFIG_KEYBOARD_IMX_SC_KEY=m CONFIG_KEYBOARD_CROS_EC=y CONFIG_KEYBOARD_MTK_KPD=y +# CONFIG_KEYBOARD_MTK_PMIC is not set CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_INPUT_MISC=y -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v6] Add mtk matrix keypad driver for keypad on MTK SoC 2020-05-09 2:04 ` Fengping Yu (?) @ 2020-05-09 9:39 ` Marco Felsch -1 siblings, 0 replies; 12+ messages in thread From: Marco Felsch @ 2020-05-09 9:39 UTC (permalink / raw) To: Fengping Yu Cc: Andy Shevchenko, Dmitry Torokhov, Yingjoe Chen, linux-input, linux-arm-kernel, linux-mediatek, linux-kernel Hi Yu, sorry if this is not your first name.. Something went wrong with you v6 since you are sending diffs to files that are not present in input-master/next. Regards, Marco On 20-05-09 10:04, Fengping Yu wrote: > Change since v5: > - remove unnecessary include files > - remove redundant comments and newlines > - use local irqnr variable instead of member variable of mtk_keypad struct > - use regmap to read and write registers > - drop kpd_get_dts_info directly into probe function > - use devm_add_action_or_reset to avoid goto error handling when do clk setting > - use devm_request_threaded_irq api to request irq > - remove platform_set_drvdata > > fengping.yu (3): > dt-bindings: Change keypad documentation schema > drivers: input: keyboard: Add mtk keypad driver > configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y > > .../devicetree/bindings/input/mtk-kpd.txt | 61 ------- > .../devicetree/bindings/input/mtk-kpd.yaml | 93 +++++++++++ > arch/arm64/configs/defconfig | 1 + > drivers/input/keyboard/Kconfig | 5 +- > drivers/input/keyboard/mtk-kpd.c | 151 ++++++++---------- > 5 files changed, 163 insertions(+), 148 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt > create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml > > -- > 2.18.0 > > -- 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 | ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v6] Add mtk matrix keypad driver for keypad on MTK SoC @ 2020-05-09 9:39 ` Marco Felsch 0 siblings, 0 replies; 12+ messages in thread From: Marco Felsch @ 2020-05-09 9:39 UTC (permalink / raw) To: Fengping Yu Cc: Dmitry Torokhov, linux-kernel, linux-mediatek, linux-input, Yingjoe Chen, Andy Shevchenko, linux-arm-kernel Hi Yu, sorry if this is not your first name.. Something went wrong with you v6 since you are sending diffs to files that are not present in input-master/next. Regards, Marco On 20-05-09 10:04, Fengping Yu wrote: > Change since v5: > - remove unnecessary include files > - remove redundant comments and newlines > - use local irqnr variable instead of member variable of mtk_keypad struct > - use regmap to read and write registers > - drop kpd_get_dts_info directly into probe function > - use devm_add_action_or_reset to avoid goto error handling when do clk setting > - use devm_request_threaded_irq api to request irq > - remove platform_set_drvdata > > fengping.yu (3): > dt-bindings: Change keypad documentation schema > drivers: input: keyboard: Add mtk keypad driver > configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y > > .../devicetree/bindings/input/mtk-kpd.txt | 61 ------- > .../devicetree/bindings/input/mtk-kpd.yaml | 93 +++++++++++ > arch/arm64/configs/defconfig | 1 + > drivers/input/keyboard/Kconfig | 5 +- > drivers/input/keyboard/mtk-kpd.c | 151 ++++++++---------- > 5 files changed, 163 insertions(+), 148 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt > create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml > > -- > 2.18.0 > > -- 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 | _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v6] Add mtk matrix keypad driver for keypad on MTK SoC @ 2020-05-09 9:39 ` Marco Felsch 0 siblings, 0 replies; 12+ messages in thread From: Marco Felsch @ 2020-05-09 9:39 UTC (permalink / raw) To: Fengping Yu Cc: Dmitry Torokhov, linux-kernel, linux-mediatek, linux-input, Yingjoe Chen, Andy Shevchenko, linux-arm-kernel Hi Yu, sorry if this is not your first name.. Something went wrong with you v6 since you are sending diffs to files that are not present in input-master/next. Regards, Marco On 20-05-09 10:04, Fengping Yu wrote: > Change since v5: > - remove unnecessary include files > - remove redundant comments and newlines > - use local irqnr variable instead of member variable of mtk_keypad struct > - use regmap to read and write registers > - drop kpd_get_dts_info directly into probe function > - use devm_add_action_or_reset to avoid goto error handling when do clk setting > - use devm_request_threaded_irq api to request irq > - remove platform_set_drvdata > > fengping.yu (3): > dt-bindings: Change keypad documentation schema > drivers: input: keyboard: Add mtk keypad driver > configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y > > .../devicetree/bindings/input/mtk-kpd.txt | 61 ------- > .../devicetree/bindings/input/mtk-kpd.yaml | 93 +++++++++++ > arch/arm64/configs/defconfig | 1 + > drivers/input/keyboard/Kconfig | 5 +- > drivers/input/keyboard/mtk-kpd.c | 151 ++++++++---------- > 5 files changed, 163 insertions(+), 148 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.txt > create mode 100644 Documentation/devicetree/bindings/input/mtk-kpd.yaml > > -- > 2.18.0 > > -- 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 | _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-05-09 9:39 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-05-09 2:04 [PATCH v6] Add mtk matrix keypad driver for keypad on MTK SoC Fengping Yu 2020-05-09 2:04 ` Fengping Yu 2020-05-09 2:04 ` Fengping Yu 2020-05-09 2:04 ` [PATCH v6 1/3] dt-bindings: Change keypad documentation schema Fengping Yu 2020-05-09 2:04 ` Fengping Yu 2020-05-09 2:05 ` [PATCH v6 2/3] drivers: input: keyboard: Add mtk keypad driver Fengping Yu 2020-05-09 2:05 ` Fengping Yu 2020-05-09 2:05 ` [PATCH v6 3/3] configs: defconfig: Add CONFIG_KEYBOARD_MTK_KPD=y Fengping Yu 2020-05-09 2:05 ` Fengping Yu 2020-05-09 9:39 ` [PATCH v6] Add mtk matrix keypad driver for keypad on MTK SoC Marco Felsch 2020-05-09 9:39 ` Marco Felsch 2020-05-09 9:39 ` Marco Felsch
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.