| Message ID | 20250318-mdb-max7360-support-v5-9-fb20baf97da0@bootlin.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for MAX7360 | expand |
On Tue, Mar 18, 2025 at 05:26:25PM +0100, Mathieu Dubois-Briand wrote: > Add driver for Maxim Integrated MAX7360 keypad controller, providing > support for up to 64 keys, with a matrix of 8 columns and 8 rows. ... > + help > + If you say yes here you get support for the keypad controller on the > + Maxim MAX7360 I/O Expander. > + > + To compile this driver as a module, choose M here: the > + module will be called max7360_keypad. One paragraph is wrapped way too late or too early, can you make them approx. the same in terms of a line width? ... + bitfield.h + bitops.h + dev_printk.h + device/devres.h + err.h > +#include <linux/init.h> > +#include <linux/input.h> > +#include <linux/input/matrix_keypad.h> > +#include <linux/interrupt.h> > +#include <linux/mfd/max7360.h> + mod_devicetable.h > +#include <linux/module.h> > +#include <linux/property.h> > +#include <linux/platform_device.h> > +#include <linux/pm_wakeirq.h> > +#include <linux/regmap.h> > +#include <linux/slab.h> IS it used? I think it's device/devres.h that covers it. ... > +static int max7360_keypad_open(struct input_dev *pdev) > +{ > + struct max7360_keypad *max7360_keypad = input_get_drvdata(pdev); > + int ret; > + > + /* > + * Somebody is using the device: get out of sleep. > + */ > + ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_CONFIG, > + MAX7360_CFG_SLEEP, MAX7360_CFG_SLEEP); > + if (ret) { > + dev_err(&max7360_keypad->input->dev, > + "Failed to write max7360 configuration\n"); > + return ret; > + } > + > + return 0; Just return ret; ? > +} ... > + /* > + * Nobody is using the device anymore: go to sleep. > + */ The comment message can take only a line. > + ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_CONFIG, MAX7360_CFG_SLEEP, 0); > + if (ret) > + dev_err(&max7360_keypad->input->dev, > + "Failed to write max7360 configuration\n"); > +} ... > +static int max7360_keypad_parse_dt(struct platform_device *pdev, s/dt/fw > + struct max7360_keypad *max7360_keypad, > + bool *autorepeat) > +{ struct device *dev = &pdev>dev; but why not supply struct device to begin with? How is the platform part used here? > + int ret; > + > + ret = matrix_keypad_parse_properties(pdev->dev.parent, &max7360_keypad->rows, > + &max7360_keypad->cols); > + if (ret) > + return ret; > + > + if (!max7360_keypad->rows || !max7360_keypad->cols || > + max7360_keypad->rows > MAX7360_MAX_KEY_ROWS || > + max7360_keypad->cols > MAX7360_MAX_KEY_COLS) { See also below comment. > + dev_err(&pdev->dev, > + "Invalid number of columns or rows (%ux%u)\n", > + max7360_keypad->cols, max7360_keypad->rows); > + return -EINVAL; > + } > + > + *autorepeat = device_property_read_bool(pdev->dev.parent, "autorepeat"); > + > + max7360_keypad->debounce_ms = MAX7360_DEBOUNCE_MIN; > + ret = device_property_read_u32(pdev->dev.parent, "keypad-debounce-delay-ms", > + &max7360_keypad->debounce_ms); > + if (ret == -EINVAL) { > + dev_info(&pdev->dev, "Using default keypad-debounce-delay-ms: %u\n", > + max7360_keypad->debounce_ms); > + } else if (ret < 0) { > + dev_err(&pdev->dev, > + "Failed to read keypad-debounce-delay-ms property\n"); > + return ret; > + } else if (max7360_keypad->debounce_ms < MAX7360_DEBOUNCE_MIN || Redundant 'else'. > + max7360_keypad->debounce_ms > MAX7360_DEBOUNCE_MAX) { Maybe in_range()? But up to you, it takes start:len and not start:end. > + dev_err(&pdev->dev, > + "Invalid keypad-debounce-delay-ms: %u, should be between %u and %u.\n", > + max7360_keypad->debounce_ms, MAX7360_DEBOUNCE_MIN, MAX7360_DEBOUNCE_MAX); > + return -EINVAL; > + } > + > + return 0; > +} ... > +static int max7360_keypad_probe(struct platform_device *pdev) > +{ > + struct max7360_keypad *max7360_keypad; struct device *dev = &pdev>dev; > + struct input_dev *input; > + bool autorepeat; > + int ret; > + int irq; > + if (!pdev->dev.parent) > + return dev_err_probe(&pdev->dev, -ENODEV, "No parent device\n"); Just do like in the rest, i.e. local variable for regmap and its validness will be the one that indicates the wrong enumeration path. > + irq = platform_get_irq_byname(to_platform_device(pdev->dev.parent), "intk"); > + if (irq < 0) > + return irq; > + > + max7360_keypad = devm_kzalloc(&pdev->dev, sizeof(*max7360_keypad), GFP_KERNEL); > + if (!max7360_keypad) > + return -ENOMEM; > + > + max7360_keypad->regmap = dev_get_regmap(pdev->dev.parent, NULL); > + if (!max7360_keypad->regmap) > + return dev_err_probe(&pdev->dev, -ENODEV, "Could not get parent regmap\n"); > + > + ret = max7360_keypad_parse_dt(pdev, max7360_keypad, &autorepeat); > + if (ret) > + return ret; > + > + input = devm_input_allocate_device(pdev->dev.parent); > + if (!input) > + return -ENOMEM; > + > + max7360_keypad->input = input; > + > + input->id.bustype = BUS_I2C; > + input->name = pdev->name; > + input->open = max7360_keypad_open; > + input->close = max7360_keypad_close; > + > + ret = matrix_keypad_build_keymap(NULL, NULL, MAX7360_MAX_KEY_ROWS, MAX7360_MAX_KEY_COLS, > + max7360_keypad->keycodes, input); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, > + "Failed to build keymap\n"); One line. > + > + input_set_capability(input, EV_MSC, MSC_SCAN); > + if (autorepeat) > + __set_bit(EV_REP, input->evbit); > + > + input_set_drvdata(input, max7360_keypad); > + > + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, max7360_keypad_irq, > + IRQF_TRIGGER_LOW | IRQF_ONESHOT, What's wrong with the interrupt flags provided by firmware description? > + "max7360-keypad", max7360_keypad); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, "Failed to register interrupt\n"); > + > + ret = input_register_device(input); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, "Could not register input device\n"); > + platform_set_drvdata(pdev, max7360_keypad); Is it used? > + ret = max7360_keypad_hw_init(max7360_keypad); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, "Failed to initialize max7360 keypad\n"); > + > + device_init_wakeup(&pdev->dev, true); > + ret = dev_pm_set_wake_irq(&pdev->dev, irq); > + if (ret) > + dev_warn(&pdev->dev, "Failed to set up wakeup irq: %d\n", ret); > + > + return 0; > +}
Hi Mathieu, kernel test robot noticed the following build errors: [auto build test ERROR on a64dcfb451e254085a7daee5fe51bf22959d52d3] url: https://github.com/intel-lab-lkp/linux/commits/Mathieu-Dubois-Briand/dt-bindings-mfd-gpio-Add-MAX7360/20250319-003750 base: a64dcfb451e254085a7daee5fe51bf22959d52d3 patch link: https://lore.kernel.org/r/20250318-mdb-max7360-support-v5-9-fb20baf97da0%40bootlin.com patch subject: [PATCH v5 09/11] input: keyboard: Add support for MAX7360 keypad config: m68k-allmodconfig (https://download.01.org/0day-ci/archive/20250319/202503192258.ULXxG0T4-lkp@intel.com/config) compiler: m68k-linux-gcc (GCC) 8.5.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250319/202503192258.ULXxG0T4-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202503192258.ULXxG0T4-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/input/keyboard/max7360-keypad.c: In function 'max7360_keypad_irq': >> drivers/input/keyboard/max7360-keypad.c:57:8: error: implicit declaration of function 'FIELD_GET' [-Werror=implicit-function-declaration] row = FIELD_GET(MAX7360_FIFO_ROW, val); ^~~~~~~~~ drivers/input/keyboard/max7360-keypad.c: In function 'max7360_keypad_hw_init': >> drivers/input/keyboard/max7360-keypad.c:114:5: error: implicit declaration of function 'FIELD_PREP'; did you mean 'EV_REP'? [-Werror=implicit-function-declaration] FIELD_PREP(MAX7360_DEBOUNCE, val)); ^~~~~~~~~~ EV_REP cc1: some warnings being treated as errors vim +/FIELD_GET +57 drivers/input/keyboard/max7360-keypad.c 29 30 static irqreturn_t max7360_keypad_irq(int irq, void *data) 31 { 32 struct max7360_keypad *max7360_keypad = data; 33 unsigned int val; 34 unsigned int row, col; 35 unsigned int release; 36 unsigned int code; 37 int ret; 38 39 do { 40 ret = regmap_read(max7360_keypad->regmap, MAX7360_REG_KEYFIFO, &val); 41 if (ret) { 42 dev_err(&max7360_keypad->input->dev, "Failed to read max7360 FIFO"); 43 return IRQ_NONE; 44 } 45 46 /* FIFO overflow: ignore it and get next event. */ 47 if (val == MAX7360_FIFO_OVERFLOW) 48 dev_warn(&max7360_keypad->input->dev, "max7360 FIFO overflow"); 49 } while (val == MAX7360_FIFO_OVERFLOW); 50 51 if (val == MAX7360_FIFO_EMPTY) { 52 dev_dbg(&max7360_keypad->input->dev, "Got a spurious interrupt"); 53 54 return IRQ_NONE; 55 } 56 > 57 row = FIELD_GET(MAX7360_FIFO_ROW, val); 58 col = FIELD_GET(MAX7360_FIFO_COL, val); 59 release = val & MAX7360_FIFO_RELEASE; 60 61 code = MATRIX_SCAN_CODE(row, col, MAX7360_ROW_SHIFT); 62 63 dev_dbg(&max7360_keypad->input->dev, "key[%d:%d] %s\n", row, col, 64 release ? "release" : "press"); 65 66 input_event(max7360_keypad->input, EV_MSC, MSC_SCAN, code); 67 input_report_key(max7360_keypad->input, max7360_keypad->keycodes[code], !release); 68 input_sync(max7360_keypad->input); 69 70 return IRQ_HANDLED; 71 } 72 73 static int max7360_keypad_open(struct input_dev *pdev) 74 { 75 struct max7360_keypad *max7360_keypad = input_get_drvdata(pdev); 76 int ret; 77 78 /* 79 * Somebody is using the device: get out of sleep. 80 */ 81 ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_CONFIG, 82 MAX7360_CFG_SLEEP, MAX7360_CFG_SLEEP); 83 if (ret) { 84 dev_err(&max7360_keypad->input->dev, 85 "Failed to write max7360 configuration\n"); 86 return ret; 87 } 88 89 return 0; 90 } 91 92 static void max7360_keypad_close(struct input_dev *pdev) 93 { 94 struct max7360_keypad *max7360_keypad = input_get_drvdata(pdev); 95 int ret; 96 97 /* 98 * Nobody is using the device anymore: go to sleep. 99 */ 100 ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_CONFIG, MAX7360_CFG_SLEEP, 0); 101 if (ret) 102 dev_err(&max7360_keypad->input->dev, 103 "Failed to write max7360 configuration\n"); 104 } 105 106 static int max7360_keypad_hw_init(struct max7360_keypad *max7360_keypad) 107 { 108 unsigned int val; 109 int ret; 110 111 val = max7360_keypad->debounce_ms - MAX7360_DEBOUNCE_MIN; 112 ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_DEBOUNCE, 113 MAX7360_DEBOUNCE, > 114 FIELD_PREP(MAX7360_DEBOUNCE, val)); 115 if (ret) { 116 return dev_err_probe(&max7360_keypad->input->dev, ret, 117 "Failed to write max7360 debounce configuration\n"); 118 } 119 120 ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_INTERRUPT, 121 MAX7360_INTERRUPT_TIME_MASK, 122 FIELD_PREP(MAX7360_INTERRUPT_TIME_MASK, 1)); 123 if (ret) { 124 return dev_err_probe(&max7360_keypad->input->dev, ret, 125 "Failed to write max7360 keypad interrupt configuration\n"); 126 } 127 128 return 0; 129 } 130
On Wed Mar 19, 2025 at 1:02 PM CET, Andy Shevchenko wrote: > On Tue, Mar 18, 2025 at 05:26:25PM +0100, Mathieu Dubois-Briand wrote: > > Add driver for Maxim Integrated MAX7360 keypad controller, providing > > support for up to 64 keys, with a matrix of 8 columns and 8 rows. > > ... > > > + help > > + If you say yes here you get support for the keypad controller on the > > + Maxim MAX7360 I/O Expander. > > + > > + To compile this driver as a module, choose M here: the > > + module will be called max7360_keypad. > > One paragraph is wrapped way too late or too early, can you make them approx. > the same in terms of a line width? > Thanks. I had a look at all other Kconfigs, I believe they are all fixed now. > > + > > + input_set_capability(input, EV_MSC, MSC_SCAN); > > + if (autorepeat) > > + __set_bit(EV_REP, input->evbit); > > + > > + input_set_drvdata(input, max7360_keypad); > > + > > + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, max7360_keypad_irq, > > + IRQF_TRIGGER_LOW | IRQF_ONESHOT, > > What's wrong with the interrupt flags provided by firmware description? > So same question as for the GPIO driver: IRQF_TRIGGER_LOW from the firmware, but IRQF_ONESHOT from the driver? Or should everything come from the firmware? Thanks again for your review. Mathieu
On Tue, Mar 25, 2025 at 03:57:01PM +0100, Mathieu Dubois-Briand wrote: > On Wed Mar 19, 2025 at 1:02 PM CET, Andy Shevchenko wrote: > > On Tue, Mar 18, 2025 at 05:26:25PM +0100, Mathieu Dubois-Briand wrote: ... > > > + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, max7360_keypad_irq, > > > + IRQF_TRIGGER_LOW | IRQF_ONESHOT, > > > > What's wrong with the interrupt flags provided by firmware description? > > So same question as for the GPIO driver: IRQF_TRIGGER_LOW from the > firmware, but IRQF_ONESHOT from the driver? Or should everything come > from the firmware? The same answer, yes, the Linux stuff (e.g., ONESHOT) should be given explicitly here.
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig index 721ab69e84ac..bba029f65cfa 100644 --- a/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig @@ -421,6 +421,18 @@ config KEYBOARD_MAX7359 To compile this driver as a module, choose M here: the module will be called max7359_keypad. +config KEYBOARD_MAX7360 + tristate "Maxim MAX7360 Key Switch Controller" + select INPUT_MATRIXKMAP + depends on I2C + depends on MFD_MAX7360 + help + If you say yes here you get support for the keypad controller on the + Maxim MAX7360 I/O Expander. + + To compile this driver as a module, choose M here: the + module will be called max7360_keypad. + config KEYBOARD_MPR121 tristate "Freescale MPR121 Touchkey" depends on I2C diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile index 1e0721c30709..b49d32d4003d 100644 --- a/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile @@ -42,6 +42,7 @@ obj-$(CONFIG_KEYBOARD_LPC32XX) += lpc32xx-keys.o obj-$(CONFIG_KEYBOARD_MAPLE) += maple_keyb.o obj-$(CONFIG_KEYBOARD_MATRIX) += matrix_keypad.o obj-$(CONFIG_KEYBOARD_MAX7359) += max7359_keypad.o +obj-$(CONFIG_KEYBOARD_MAX7360) += max7360-keypad.o obj-$(CONFIG_KEYBOARD_MPR121) += mpr121_touchkey.o obj-$(CONFIG_KEYBOARD_MT6779) += mt6779-keypad.o obj-$(CONFIG_KEYBOARD_MTK_PMIC) += mtk-pmic-keys.o diff --git a/drivers/input/keyboard/max7360-keypad.c b/drivers/input/keyboard/max7360-keypad.c new file mode 100644 index 000000000000..bea4621c0622 --- /dev/null +++ b/drivers/input/keyboard/max7360-keypad.c @@ -0,0 +1,264 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright 2025 Bootlin + * + * Author: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> + */ + +#include <linux/init.h> +#include <linux/input.h> +#include <linux/input/matrix_keypad.h> +#include <linux/interrupt.h> +#include <linux/mfd/max7360.h> +#include <linux/module.h> +#include <linux/property.h> +#include <linux/platform_device.h> +#include <linux/pm_wakeirq.h> +#include <linux/regmap.h> +#include <linux/slab.h> + +struct max7360_keypad { + struct input_dev *input; + unsigned int rows; + unsigned int cols; + unsigned int debounce_ms; + int irq; + struct regmap *regmap; + unsigned short keycodes[MAX7360_MAX_KEY_ROWS * MAX7360_MAX_KEY_COLS]; +}; + +static irqreturn_t max7360_keypad_irq(int irq, void *data) +{ + struct max7360_keypad *max7360_keypad = data; + unsigned int val; + unsigned int row, col; + unsigned int release; + unsigned int code; + int ret; + + do { + ret = regmap_read(max7360_keypad->regmap, MAX7360_REG_KEYFIFO, &val); + if (ret) { + dev_err(&max7360_keypad->input->dev, "Failed to read max7360 FIFO"); + return IRQ_NONE; + } + + /* FIFO overflow: ignore it and get next event. */ + if (val == MAX7360_FIFO_OVERFLOW) + dev_warn(&max7360_keypad->input->dev, "max7360 FIFO overflow"); + } while (val == MAX7360_FIFO_OVERFLOW); + + if (val == MAX7360_FIFO_EMPTY) { + dev_dbg(&max7360_keypad->input->dev, "Got a spurious interrupt"); + + return IRQ_NONE; + } + + row = FIELD_GET(MAX7360_FIFO_ROW, val); + col = FIELD_GET(MAX7360_FIFO_COL, val); + release = val & MAX7360_FIFO_RELEASE; + + code = MATRIX_SCAN_CODE(row, col, MAX7360_ROW_SHIFT); + + dev_dbg(&max7360_keypad->input->dev, "key[%d:%d] %s\n", row, col, + release ? "release" : "press"); + + input_event(max7360_keypad->input, EV_MSC, MSC_SCAN, code); + input_report_key(max7360_keypad->input, max7360_keypad->keycodes[code], !release); + input_sync(max7360_keypad->input); + + return IRQ_HANDLED; +} + +static int max7360_keypad_open(struct input_dev *pdev) +{ + struct max7360_keypad *max7360_keypad = input_get_drvdata(pdev); + int ret; + + /* + * Somebody is using the device: get out of sleep. + */ + ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_CONFIG, + MAX7360_CFG_SLEEP, MAX7360_CFG_SLEEP); + if (ret) { + dev_err(&max7360_keypad->input->dev, + "Failed to write max7360 configuration\n"); + return ret; + } + + return 0; +} + +static void max7360_keypad_close(struct input_dev *pdev) +{ + struct max7360_keypad *max7360_keypad = input_get_drvdata(pdev); + int ret; + + /* + * Nobody is using the device anymore: go to sleep. + */ + ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_CONFIG, MAX7360_CFG_SLEEP, 0); + if (ret) + dev_err(&max7360_keypad->input->dev, + "Failed to write max7360 configuration\n"); +} + +static int max7360_keypad_hw_init(struct max7360_keypad *max7360_keypad) +{ + unsigned int val; + int ret; + + val = max7360_keypad->debounce_ms - MAX7360_DEBOUNCE_MIN; + ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_DEBOUNCE, + MAX7360_DEBOUNCE, + FIELD_PREP(MAX7360_DEBOUNCE, val)); + if (ret) { + return dev_err_probe(&max7360_keypad->input->dev, ret, + "Failed to write max7360 debounce configuration\n"); + } + + ret = regmap_write_bits(max7360_keypad->regmap, MAX7360_REG_INTERRUPT, + MAX7360_INTERRUPT_TIME_MASK, + FIELD_PREP(MAX7360_INTERRUPT_TIME_MASK, 1)); + if (ret) { + return dev_err_probe(&max7360_keypad->input->dev, ret, + "Failed to write max7360 keypad interrupt configuration\n"); + } + + return 0; +} + +static int max7360_keypad_parse_dt(struct platform_device *pdev, + struct max7360_keypad *max7360_keypad, + bool *autorepeat) +{ + int ret; + + ret = matrix_keypad_parse_properties(pdev->dev.parent, &max7360_keypad->rows, + &max7360_keypad->cols); + if (ret) + return ret; + + if (!max7360_keypad->rows || !max7360_keypad->cols || + max7360_keypad->rows > MAX7360_MAX_KEY_ROWS || + max7360_keypad->cols > MAX7360_MAX_KEY_COLS) { + dev_err(&pdev->dev, + "Invalid number of columns or rows (%ux%u)\n", + max7360_keypad->cols, max7360_keypad->rows); + return -EINVAL; + } + + *autorepeat = device_property_read_bool(pdev->dev.parent, "autorepeat"); + + max7360_keypad->debounce_ms = MAX7360_DEBOUNCE_MIN; + ret = device_property_read_u32(pdev->dev.parent, "keypad-debounce-delay-ms", + &max7360_keypad->debounce_ms); + if (ret == -EINVAL) { + dev_info(&pdev->dev, "Using default keypad-debounce-delay-ms: %u\n", + max7360_keypad->debounce_ms); + } else if (ret < 0) { + dev_err(&pdev->dev, + "Failed to read keypad-debounce-delay-ms property\n"); + return ret; + } else if (max7360_keypad->debounce_ms < MAX7360_DEBOUNCE_MIN || + max7360_keypad->debounce_ms > MAX7360_DEBOUNCE_MAX) { + dev_err(&pdev->dev, + "Invalid keypad-debounce-delay-ms: %u, should be between %u and %u.\n", + max7360_keypad->debounce_ms, MAX7360_DEBOUNCE_MIN, MAX7360_DEBOUNCE_MAX); + return -EINVAL; + } + + return 0; +} + +static int max7360_keypad_probe(struct platform_device *pdev) +{ + struct max7360_keypad *max7360_keypad; + struct input_dev *input; + bool autorepeat; + int ret; + int irq; + + if (!pdev->dev.parent) + return dev_err_probe(&pdev->dev, -ENODEV, "No parent device\n"); + + irq = platform_get_irq_byname(to_platform_device(pdev->dev.parent), "intk"); + if (irq < 0) + return irq; + + max7360_keypad = devm_kzalloc(&pdev->dev, sizeof(*max7360_keypad), GFP_KERNEL); + if (!max7360_keypad) + return -ENOMEM; + + max7360_keypad->regmap = dev_get_regmap(pdev->dev.parent, NULL); + if (!max7360_keypad->regmap) + return dev_err_probe(&pdev->dev, -ENODEV, "Could not get parent regmap\n"); + + ret = max7360_keypad_parse_dt(pdev, max7360_keypad, &autorepeat); + if (ret) + return ret; + + input = devm_input_allocate_device(pdev->dev.parent); + if (!input) + return -ENOMEM; + + max7360_keypad->input = input; + + input->id.bustype = BUS_I2C; + input->name = pdev->name; + input->open = max7360_keypad_open; + input->close = max7360_keypad_close; + + ret = matrix_keypad_build_keymap(NULL, NULL, MAX7360_MAX_KEY_ROWS, MAX7360_MAX_KEY_COLS, + max7360_keypad->keycodes, input); + if (ret) + return dev_err_probe(&pdev->dev, ret, + "Failed to build keymap\n"); + + input_set_capability(input, EV_MSC, MSC_SCAN); + if (autorepeat) + __set_bit(EV_REP, input->evbit); + + input_set_drvdata(input, max7360_keypad); + + ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, max7360_keypad_irq, + IRQF_TRIGGER_LOW | IRQF_ONESHOT, + "max7360-keypad", max7360_keypad); + if (ret) + return dev_err_probe(&pdev->dev, ret, "Failed to register interrupt\n"); + + ret = input_register_device(input); + if (ret) + return dev_err_probe(&pdev->dev, ret, "Could not register input device\n"); + + platform_set_drvdata(pdev, max7360_keypad); + + ret = max7360_keypad_hw_init(max7360_keypad); + if (ret) + return dev_err_probe(&pdev->dev, ret, "Failed to initialize max7360 keypad\n"); + + device_init_wakeup(&pdev->dev, true); + ret = dev_pm_set_wake_irq(&pdev->dev, irq); + if (ret) + dev_warn(&pdev->dev, "Failed to set up wakeup irq: %d\n", ret); + + return 0; +} + +static void max7360_keypad_remove(struct platform_device *pdev) +{ + dev_pm_clear_wake_irq(&pdev->dev); +} + +static struct platform_driver max7360_keypad_driver = { + .driver = { + .name = "max7360-keypad", + }, + .probe = max7360_keypad_probe, + .remove = max7360_keypad_remove, +}; +module_platform_driver(max7360_keypad_driver); + +MODULE_DESCRIPTION("MAX7360 Keypad driver"); +MODULE_AUTHOR("Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>"); +MODULE_LICENSE("GPL");
Add driver for Maxim Integrated MAX7360 keypad controller, providing support for up to 64 keys, with a matrix of 8 columns and 8 rows. Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> --- drivers/input/keyboard/Kconfig | 12 ++ drivers/input/keyboard/Makefile | 1 + drivers/input/keyboard/max7360-keypad.c | 264 ++++++++++++++++++++++++++++++++ 3 files changed, 277 insertions(+)