This patch adds a driver for the key scan interface of the LPC32xx SoC Signed-off-by: Roland Stigge <stigge@xxxxxxxxx> --- Applies to v3.4-rc4 Please pick this patch for the input subsystem. Changes since v1: * Removed devm_kfree(), lpc32XX_free_dt(), iounmap(), release_mem_region() * Changed __raw_writel()+__raw_readl() to writel()+readl() Thanks to Axel Lin for reviewing! Documentation/devicetree/bindings/input/lpc32xx-key.txt | 31 + drivers/input/keyboard/Kconfig | 10 drivers/input/keyboard/Makefile | 1 drivers/input/keyboard/lpc32xx-keys.c | 343 ++++++++++++++++ 4 files changed, 385 insertions(+) --- /dev/null +++ linux-2.6/Documentation/devicetree/bindings/input/lpc32xx-key.txt @@ -0,0 +1,31 @@ +NXP LPC32xx Key Scan Interface + +Required Properties: +- compatible: Should be "nxp,lpc3220-key" +- reg: Physical base address of the controller and length of memory mapped + region. +- interrupts: The interrupt number to the cpu. +- nxp,matrix-size: Number of rows and columns, e.g. 1: 1x1, 6: 6x6 +- nxp,debounce-delay-ms: +- nxp,scan-delay-ms: + +- Keys represented as child nodes: Each key connected to the keypad + controller is represented as a child node, line by line, to the keypad + controller device node and should include the following properties: + - linux,code: the key-code to be reported when the key is pressed + and released. + +Example: + + key@40050000 { + compatible = "nxp,lpc3220-key"; + reg = <0x40050000 0x1000>; + interrupts = <54 0>; + nxp,matrix-size = <1>; + nxp,debounce-delay-ms = <3>; + nxp,scan-delay-ms = <34>; + + key_1 { + linux,code = <2>; + }; + }; --- linux-2.6.orig/drivers/input/keyboard/Kconfig +++ linux-2.6/drivers/input/keyboard/Kconfig @@ -318,6 +318,16 @@ config KEYBOARD_LOCOMO To compile this driver as a module, choose M here: the module will be called locomokbd. +config KEYBOARD_LPC32XX + tristate "LPC32XX matrix key scanner support" + depends on ARCH_LPC32XX + help + Say Y here if you want to use NXP LPC32XX SoC key scanner interface, + connected to a key matrix. + + To compile this driver as a module, choose M here: the + module will be called lpc32xx-keys. + config KEYBOARD_MAPLE tristate "Maple bus keyboard" depends on SH_DREAMCAST && MAPLE --- linux-2.6.orig/drivers/input/keyboard/Makefile +++ linux-2.6/drivers/input/keyboard/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_KEYBOARD_HP7XX) += jornada obj-$(CONFIG_KEYBOARD_LKKBD) += lkkbd.o obj-$(CONFIG_KEYBOARD_LM8323) += lm8323.o obj-$(CONFIG_KEYBOARD_LOCOMO) += locomokbd.o +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 --- /dev/null +++ linux-2.6/drivers/input/keyboard/lpc32xx-keys.c @@ -0,0 +1,343 @@ +/* + * NXP LPC32xx SoC Key Scan Interface + * + * Authors: + * Kevin Wells <kevin.wells@xxxxxxx> + * Roland Stigge <stigge@xxxxxxxxx> + * + * Copyright (C) 2010 NXP Semiconductors + * Copyright (C) 2012 Roland Stigge + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/slab.h> +#include <linux/irq.h> +#include <linux/pm.h> +#include <linux/platform_device.h> +#include <linux/input.h> +#include <linux/clk.h> +#include <linux/io.h> +#include <linux/of.h> + +/* + * Key scanner register offsets + */ +#define LPC32XX_KS_DEB(x) ((x) + 0x00) +#define LPC32XX_KS_STATE_COND(x) ((x) + 0x04) +#define LPC32XX_KS_IRQ(x) ((x) + 0x08) +#define LPC32XX_KS_SCAN_CTL(x) ((x) + 0x0C) +#define LPC32XX_KS_FAST_TST(x) ((x) + 0x10) +#define LPC32XX_KS_MATRIX_DIM(x) ((x) + 0x14) +#define LPC32XX_KS_DATA(x, y) ((x) + 0x40 + ((y) << 2)) + +#define LPC32XX_KSCAN_DEB_NUM_DEB_PASS(n) ((n) & 0xFF) + +#define LPC32XX_KSCAN_SCOND_IN_IDLE 0x0 +#define LPC32XX_KSCAN_SCOND_IN_SCANONCE 0x1 +#define LPC32XX_KSCAN_SCOND_IN_IRQGEN 0x2 +#define LPC32XX_KSCAN_SCOND_IN_SCAN_MATRIX 0x3 + +#define LPC32XX_KSCAN_IRQ_PENDING_CLR 0x1 + +#define LPC32XX_KSCAN_SCTRL_SCAN_DELAY(n) ((n) & 0xFF) + +#define LPC32XX_KSCAN_FTST_FORCESCANONCE 0x1 +#define LPC32XX_KSCAN_FTST_USE32K_CLK 0x2 + +#define LPC32XX_KSCAN_MSEL_SELECT(n) ((n) & 0xF) + +/* + * Key scanner platform configuration structure + */ +struct lpc32XX_kscan_cfg { + u32 matrix_sz; /* Size of matrix in XxY, ie. 3 = 3x3 */ + int *keymap; /* Pointer to key map for the scan matrix */ + u32 deb_clks; /* Debounce clocks (based on 32KHz clock) */ + u32 scan_delay; /* Scan delay (based on 32KHz clock) */ +}; + +struct lpc32xx_kscan_drv { + struct input_dev *input; + struct lpc32XX_kscan_cfg *kscancfg; + struct clk *clk; + void __iomem *kscan_base; + int irq; + u8 lastkeystates[8]; +}; + +static void lpc32xx_mod_states(struct lpc32xx_kscan_drv *kscandat, int off) +{ + u8 st, key; + int j, scancode, keycode; + + key = (u8)readl(LPC32XX_KS_DATA(kscandat->kscan_base, off)); + if (key != kscandat->lastkeystates[off]) { + for (j = 0; j < kscandat->kscancfg->matrix_sz; j++) { + st = key & (1 << j); + if (st != (kscandat->lastkeystates[off] & (1 << j))) { + /* Key state changed, signal an event */ + scancode = (int) + (j * kscandat->kscancfg->matrix_sz) + off; + keycode = kscandat->kscancfg->keymap[scancode]; + input_report_key(kscandat->input, keycode, + (st != 0)); + } + } + + kscandat->lastkeystates[off] = key; + } +} + +static irqreturn_t lpc32xx_kscan_irq(int irq, void *dev_id) +{ + int i; + struct lpc32xx_kscan_drv *kscandat = (struct lpc32xx_kscan_drv *)dev_id; + + for (i = 0; i < kscandat->kscancfg->matrix_sz; i++) + lpc32xx_mod_states(kscandat, i); + + writel(1, LPC32XX_KS_IRQ(kscandat->kscan_base)); + + input_sync(kscandat->input); + + return IRQ_HANDLED; +} + +#ifdef CONFIG_OF +static struct lpc32XX_kscan_cfg *lpc32XX_parse_dt(struct device *dev) +{ + struct lpc32XX_kscan_cfg *pdata; + struct device_node *np = dev->of_node; + struct device_node *key_np; + int key_count; + int i; + + pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); + if (!pdata) { + dev_err(dev, "could not allocate memory for platform data\n"); + return NULL; + } + + of_property_read_u32(np, "nxp,matrix-size", &pdata->matrix_sz); + of_property_read_u32(np, "nxp,debounce-delay-ms", &pdata->deb_clks); + of_property_read_u32(np, "nxp,scan-delay-ms", &pdata->scan_delay); + + if (!pdata->matrix_sz || !pdata->deb_clks || !pdata->scan_delay) { + dev_err(dev, + "matrix size, debounce or scan delay not specified\n"); + return NULL; + } + + key_count = pdata->matrix_sz * pdata->matrix_sz; + pdata->keymap = devm_kzalloc(dev, sizeof(int) * key_count, GFP_KERNEL); + if (!pdata->keymap) { + dev_err(dev, "could not allocate memory for keymap\n"); + return NULL; + } + + i = 0; + for_each_child_of_node(np, key_np) { + u32 key_code; + of_property_read_u32(key_np, "linux,code", &key_code); + pdata->keymap[i++] = key_code; + } + + return pdata; +} +#else +static struct lpc32XX_kscan_cfg *lpc32XX_parse_dt(struct device *dev) +{ + return NULL; +} +#endif + +static int __devinit lpc32xx_kscan_probe(struct platform_device *pdev) +{ + struct lpc32xx_kscan_drv *kscandat; + struct resource *res; + int retval, i, keynum; + + kscandat = kzalloc(sizeof(struct lpc32xx_kscan_drv), GFP_KERNEL); + if (unlikely(!kscandat)) { + dev_err(&pdev->dev, "failed to allocate memory\n"); + return -ENOMEM; + } + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (res == NULL) { + dev_err(&pdev->dev, "failed to get platform I/O memory\n"); + retval = -EBUSY; + goto out1; + } + + kscandat->kscan_base = devm_request_and_ioremap(&pdev->dev, res); + if (kscandat->kscan_base == NULL) { + dev_err(&pdev->dev, "failed to request and remap I/O memory\n"); + retval = -EBUSY; + goto out1; + } + + /* Get the key scanner clock */ + kscandat->clk = clk_get(&pdev->dev, NULL); + if (IS_ERR(kscandat->clk)) { + dev_err(&pdev->dev, "failed to get clock\n"); + retval = -ENODEV; + goto out1; + } + clk_enable(kscandat->clk); + + kscandat->irq = platform_get_irq(pdev, 0); + if ((kscandat->irq < 0) || (kscandat->irq >= NR_IRQS)) { + dev_err(&pdev->dev, "failed to get platform irq\n"); + retval = -EINVAL; + goto out2; + } + retval = request_irq(kscandat->irq, lpc32xx_kscan_irq, + 0, pdev->name, kscandat); + if (retval) { + dev_err(&pdev->dev, "failed to request irq\n"); + goto out2; + } + + kscandat->input = input_allocate_device(); + if (kscandat->input == NULL) { + dev_err(&pdev->dev, "failed to allocate device\n"); + retval = -ENOMEM; + goto out3; + } + + if (pdev->dev.of_node) + kscandat->kscancfg = lpc32XX_parse_dt(&pdev->dev); + else + kscandat->kscancfg = + (struct lpc32XX_kscan_cfg *)pdev->dev.platform_data; + if (!kscandat->kscancfg) { + dev_err(&pdev->dev, "failed to get platform data\n"); + retval = -EINVAL; + goto out4; + } + + platform_set_drvdata(pdev, kscandat); + + /* Setup key input */ + kscandat->input->evbit[0] = BIT_MASK(EV_KEY); + kscandat->input->name = pdev->name; + kscandat->input->phys = "matrix-keys/input0"; + kscandat->input->dev.parent = &pdev->dev; + kscandat->input->id.vendor = 0x0001; + kscandat->input->id.product = 0x0001; + kscandat->input->id.version = 0x0100; + keynum = kscandat->kscancfg->matrix_sz * kscandat->kscancfg->matrix_sz; + for (i = 0; i < keynum; i++) + __set_bit(kscandat->kscancfg->keymap[i], + kscandat->input->keybit); + + input_set_capability(kscandat->input, EV_MSC, MSC_SCAN); + + retval = input_register_device(kscandat->input); + if (retval) { + dev_err(&pdev->dev, "failed to register input device\n"); + goto out4; + } + + /* Configure the key scanner */ + writel(kscandat->kscancfg->deb_clks, + LPC32XX_KS_DEB(kscandat->kscan_base)); + writel(kscandat->kscancfg->scan_delay, + LPC32XX_KS_SCAN_CTL(kscandat->kscan_base)); + writel(LPC32XX_KSCAN_FTST_USE32K_CLK, + LPC32XX_KS_FAST_TST(kscandat->kscan_base)); + writel(kscandat->kscancfg->matrix_sz, + LPC32XX_KS_MATRIX_DIM(kscandat->kscan_base)); + writel(1, LPC32XX_KS_IRQ(kscandat->kscan_base)); + + return 0; + +out4: + input_free_device(kscandat->input); +out3: + free_irq(kscandat->irq, pdev); +out2: + clk_put(kscandat->clk); +out1: + kfree(kscandat); + + return retval; +} + +static int __devexit lpc32xx_kscan_remove(struct platform_device *pdev) +{ + struct lpc32xx_kscan_drv *kscandat = platform_get_drvdata(pdev); + + free_irq(kscandat->irq, pdev); + input_unregister_device(kscandat->input); + clk_put(kscandat->clk); + kfree(kscandat); + + return 0; +} + +#ifdef CONFIG_PM +static int lpc32xx_kscan_suspend(struct platform_device *pdev, + pm_message_t state) +{ + struct lpc32xx_kscan_drv *kscandat = platform_get_drvdata(pdev); + + /* Clear IRQ and disable clock */ + writel(1, LPC32XX_KS_IRQ(kscandat->kscan_base)); + clk_disable(kscandat->clk); + + return 0; +} + +static int lpc32xx_kscan_resume(struct platform_device *pdev) +{ + struct lpc32xx_kscan_drv *kscandat = platform_get_drvdata(pdev); + + /* Enable clock and clear IRQ */ + clk_enable(kscandat->clk); + writel(1, LPC32XX_KS_IRQ(kscandat->kscan_base)); + + return 0; +} +#else +#define lpc32xx_kscan_suspend NULL +#define lpc32xx_kscan_resume NULL +#endif + +#ifdef CONFIG_OF +static const struct of_device_id lpc32xx_kscan_match[] = { + { .compatible = "nxp,lpc3220-key" }, + {}, +}; +MODULE_DEVICE_TABLE(of, lpc32xx_kscan_match); +#endif + +static struct platform_driver lpc32xx_kscan_driver = { + .probe = lpc32xx_kscan_probe, + .remove = __devexit_p(lpc32xx_kscan_remove), + .suspend = lpc32xx_kscan_suspend, + .resume = lpc32xx_kscan_resume, + .driver = { + .name = "lpc32xx_keys", + .of_match_table = of_match_ptr(lpc32xx_kscan_match), + } +}; + +module_platform_driver(lpc32xx_kscan_driver); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Kevin Wells <kevin.wells@xxxxxxx>"); +MODULE_AUTHOR("Roland Stigge <stigge@xxxxxxxxx>"); +MODULE_DESCRIPTION("Key scanner driver for LPC32XX devices"); -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html