* [PATCH v4 1/2] Input: DaVinci Keypad Driver
@ 2009-10-09 17:27 miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w
[not found] ` <1255109225-6833-1-git-send-email-miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
2009-10-13 5:46 ` Dmitry Torokhov
0 siblings, 2 replies; 9+ messages in thread
From: miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w @ 2009-10-09 17:27 UTC (permalink / raw)
To: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
nsnehaprabha-l0cyMroinI0, linux-input-u79uwXL29TY76Z2rM5mHXA
Cc: santiago.nunez-9uBrGCPFOa1Wk0Htik3J/w,
todd.fischer-9uBrGCPFOa1Wk0Htik3J/w,
clark.becker-9uBrGCPFOa1Wk0Htik3J/w, Miguel Aguilar
From: Miguel Aguilar <miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
Adds the driver for enabling keypad support for DaVinci platforms.
DM365 is the only platform that uses this driver at the moment.
Signed-off-by: Miguel Aguilar <miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
---
arch/arm/mach-davinci/include/mach/keyscan.h | 44 ++++
drivers/input/keyboard/Kconfig | 10 +
drivers/input/keyboard/Makefile | 1 +
drivers/input/keyboard/davinci_keyscan.c | 338 ++++++++++++++++++++++++++
4 files changed, 393 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-davinci/include/mach/keyscan.h
create mode 100644 drivers/input/keyboard/davinci_keyscan.c
diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/arch/arm/mach-davinci/include/mach/keyscan.h
new file mode 100644
index 0000000..dd84361
--- /dev/null
+++ b/arch/arm/mach-davinci/include/mach/keyscan.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2009 Texas Instruments, Inc
+ *
+ * Author: Miguel Aguilar <miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#ifndef DAVINCI_KEYSCAN_H
+#define DAVINCI_KEYSCAN_H
+
+#include <linux/io.h>
+
+/* Base of key scan register bank */
+#define DM365_KEYSCAN_BASE (0x01C69400)
+
+enum davinci_matrix_types {
+ DAVINCI_KEYSCAN_MATRIX_4X4,
+ DAVINCI_KEYSCAN_MATRIX_5X3,
+};
+
+struct davinci_ks_platform_data {
+ unsigned short *keymap;
+ u32 keymapsize;
+ u8 rep:1;
+ u8 strobe;
+ u8 interval;
+ u8 matrix_type;
+};
+
+#endif
+
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index ee98b1b..b7668ed 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -423,4 +423,14 @@ config KEYBOARD_W90P910
To compile this driver as a module, choose M here: the
module will be called w90p910_keypad.
+config KEYBOARD_DAVINCI
+ tristate "TI DaVinci Key Scan"
+ depends on ARCH_DAVINCI_DM365
+ help
+ Say Y to enable keypad module support for the TI DaVinci
+ platforms (DM365).
+
+ To compile this driver as a module, choose M here: the
+ module will be called davinci_keyscan.
+
endif
diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
index babad5e..bd49fed 100644
--- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile
@@ -37,3 +37,4 @@ obj-$(CONFIG_KEYBOARD_TOSA) += tosakbd.o
obj-$(CONFIG_KEYBOARD_TWL4030) += twl4030_keypad.o
obj-$(CONFIG_KEYBOARD_XTKBD) += xtkbd.o
obj-$(CONFIG_KEYBOARD_W90P910) += w90p910_keypad.o
+obj-$(CONFIG_KEYBOARD_DAVINCI) += davinci_keyscan.o
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
new file mode 100644
index 0000000..7b7424b
--- /dev/null
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -0,0 +1,338 @@
+/*
+ * DaVinci Key Scan Driver for TI platforms
+ *
+ * Copyright (C) 2009 Texas Instruments, Inc
+ *
+ * Author: Miguel Aguilar <miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
+ *
+ * Intial Code: Sandeep Paulraj <s-paulraj-l0cyMroinI0@public.gmane.org>
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/types.h>
+#include <linux/input.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/platform_device.h>
+#include <linux/errno.h>
+
+#include <asm/irq.h>
+
+#include <mach/hardware.h>
+#include <mach/irqs.h>
+#include <mach/keyscan.h>
+
+/* Key scan registers */
+#define DAVINCI_KEYSCAN_KEYCTRL 0x0000
+#define DAVINCI_KEYSCAN_INTENA 0x0004
+#define DAVINCI_KEYSCAN_INTFLAG 0x0008
+#define DAVINCI_KEYSCAN_INTCLR 0x000c
+#define DAVINCI_KEYSCAN_STRBWIDTH 0x0010
+#define DAVINCI_KEYSCAN_INTERVAL 0x0014
+#define DAVINCI_KEYSCAN_CONTTIME 0x0018
+#define DAVINCI_KEYSCAN_CURRENTST 0x001c
+#define DAVINCI_KEYSCAN_PREVSTATE 0x0020
+#define DAVINCI_KEYSCAN_EMUCTRL 0x0024
+#define DAVINCI_KEYSCAN_IODFTCTRL 0x002c
+
+/* Key Control Register (KEYCTRL) */
+#define DAVINCI_KEYSCAN_KEYEN 0x00000001
+#define DAVINCI_KEYSCAN_PREVMODE 0x00000002
+#define DAVINCI_KEYSCAN_CHATOFF 0x00000004
+#define DAVINCI_KEYSCAN_AUTODET 0x00000008
+#define DAVINCI_KEYSCAN_SCANMODE 0x00000010
+#define DAVINCI_KEYSCAN_OUTTYPE 0x00000020
+
+/* Masks for the interrupts */
+#define DAVINCI_KEYSCAN_INT_CONT 0x00000008
+#define DAVINCI_KEYSCAN_INT_OFF 0x00000004
+#define DAVINCI_KEYSCAN_INT_ON 0x00000002
+#define DAVINCI_KEYSCAN_INT_CHANGE 0x00000001
+#define DAVINCI_KEYSCAN_INT_ALL 0x0000000f
+
+struct davinci_ks {
+ struct input_dev *input;
+ struct davinci_ks_platform_data *pdata;
+ int irq;
+ void __iomem *base;
+ resource_size_t pbase;
+ size_t base_size;
+ unsigned short keymap[];
+};
+
+static void davinci_ks_write(struct davinci_ks *davinci_ks, u32 val, u32 addr)
+{
+ u32 base = (u32)davinci_ks->base;
+
+ __raw_writel(val,(u32 *)(base + addr));
+}
+
+static u32 davinci_ks_read(struct davinci_ks *davinci_ks, u32 addr)
+{
+ u32 base = (u32)davinci_ks->base;
+
+ return __raw_readl((u32 *)(base + addr));
+}
+
+/* Initializing the kp Module */
+static int davinci_ks_initialize(struct davinci_ks *davinci_ks)
+{
+ struct device *dev = &davinci_ks->input->dev;
+ u8 strobe = davinci_ks->pdata->strobe;
+ u8 interval = davinci_ks->pdata->interval;
+ u8 matrix_type = davinci_ks->pdata->matrix_type;
+
+ /* Enable all interrupts */
+ davinci_ks_write(davinci_ks, DAVINCI_KEYSCAN_INT_ALL, DAVINCI_KEYSCAN_INTENA);
+
+ /* Clear interrupts if any */
+ davinci_ks_write(davinci_ks, DAVINCI_KEYSCAN_INT_ALL, DAVINCI_KEYSCAN_INTCLR);
+
+ /* Setup the scan period = strobe + interval */
+ davinci_ks_write(davinci_ks, strobe, DAVINCI_KEYSCAN_STRBWIDTH);
+ davinci_ks_write(davinci_ks, interval, DAVINCI_KEYSCAN_INTERVAL);
+ davinci_ks_write(davinci_ks, 0x01, DAVINCI_KEYSCAN_CONTTIME);
+
+ /* Define matrix type */
+ if ((matrix_type != 0) && (matrix_type != 1)) {
+ dev_err(dev->parent, "wrong matrix type\n");
+ return -EINVAL;
+ }
+
+ /* Enable key scan module and set matrix type */
+ davinci_ks_write(davinci_ks, DAVINCI_KEYSCAN_AUTODET | DAVINCI_KEYSCAN_KEYEN
+ | (matrix_type << 6), DAVINCI_KEYSCAN_KEYCTRL);
+
+ return 0;
+}
+
+static irqreturn_t davinci_ks_interrupt(int irq, void *dev_id)
+{
+ struct davinci_ks *davinci_ks = dev_id;
+ struct device *dev = &davinci_ks->input->dev;
+ unsigned short *keymap = davinci_ks->keymap;
+ int keymapsize = davinci_ks->pdata->keymapsize;
+ u32 prev_status, new_status, changed;
+ bool release;
+ int keycode = KEY_UNKNOWN;
+ int i;
+
+ /* Disable interrupt */
+ davinci_ks_write(davinci_ks, 0x0, DAVINCI_KEYSCAN_INTENA);
+
+ /* Reading previous and new status of the key scan */
+ prev_status = davinci_ks_read(davinci_ks, DAVINCI_KEYSCAN_PREVSTATE);
+ new_status = davinci_ks_read(davinci_ks, DAVINCI_KEYSCAN_CURRENTST);
+
+ changed = prev_status ^ new_status;
+
+ if(changed) {
+ /*
+ * It goes go through all bits in changed to ensure
+ * that no key changes are being missed
+ */
+ for(i = 0 ; i < keymapsize; i++) {
+ if((changed>>i) & 0x1) {
+ keycode = keymap[i];
+ release = (new_status >> i) & 0x1;
+ dev_dbg(dev->parent, "key %d %s\n", keycode,
+ release ? "released" : "pressed");
+ input_report_key(davinci_ks->input, keycode,
+ !release);
+ input_sync(davinci_ks->input);
+ }
+ }
+ /* Clearing interrupt */
+ davinci_ks_write(davinci_ks, DAVINCI_KEYSCAN_INT_ALL,
+ DAVINCI_KEYSCAN_INTCLR);
+ }
+
+ /* Enable interrupts */
+ davinci_ks_write(davinci_ks, 0x1, DAVINCI_KEYSCAN_INTENA);
+
+ return IRQ_HANDLED;
+}
+
+static int __init davinci_ks_probe(struct platform_device *pdev)
+{
+ struct davinci_ks *davinci_ks;
+ struct input_dev *key_dev;
+ struct resource *res, *mem;
+ struct device * dev = &pdev->dev;
+ struct davinci_ks_platform_data *pdata = pdev->dev.platform_data;
+ int ret, i;
+
+ if (!pdata->keymap) {
+ dev_dbg(dev, "no keymap from pdata\n");
+ return -EINVAL;
+ }
+
+ davinci_ks = kzalloc(sizeof(struct davinci_ks) +
+ sizeof(unsigned short) * pdata->keymapsize, GFP_KERNEL);
+ if(!davinci_ks) {
+ dev_dbg(dev, "could not allocate memory for private data\n");
+ return -ENOMEM;
+ }
+
+ memcpy(davinci_ks->keymap, pdata->keymap,
+ sizeof(unsigned short) * pdata->keymapsize);
+
+ key_dev = input_allocate_device();
+ if (!key_dev) {
+ dev_dbg(dev, "could not allocate input device\n");
+ ret = -ENOMEM;
+ goto fail1;
+ }
+
+ platform_set_drvdata(pdev, davinci_ks);
+
+ davinci_ks->input = key_dev;
+
+ davinci_ks->irq = platform_get_irq(pdev, 0);
+ if (davinci_ks->irq < 0) {
+ dev_err(dev, "no key scan irq\n");
+ ret = davinci_ks->irq;
+ goto fail2;
+ }
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ dev_err(dev, "no mem resource\n");
+ ret = -EINVAL;
+ goto fail2;
+ }
+
+ davinci_ks->pbase = res->start;
+ davinci_ks->base_size = resource_size(res);
+
+ mem = request_mem_region(davinci_ks->pbase, davinci_ks->base_size, pdev->name);
+ if (!mem) {
+ dev_err(dev, "key scan registers at %08x are not free\n",
+ davinci_ks->pbase);
+ ret = -EBUSY;
+ goto fail2;
+ }
+
+ davinci_ks->base = ioremap(davinci_ks->pbase, davinci_ks->base_size);
+ if (!davinci_ks->base) {
+ dev_err(dev, "can't ioremap MEM resource.\n");
+ ret = -ENOMEM;
+ goto fail3;
+ }
+
+ /* Enable auto repeat feature of Linux input subsystem */
+ if (pdata->rep)
+ __set_bit(EV_REP, key_dev->evbit);
+
+ /* Setup input device */
+ __set_bit(EV_KEY, key_dev->evbit);
+
+ /* Setup the platform data */
+ davinci_ks->pdata = pdata;
+
+ for (i = 0; i < davinci_ks->pdata->keymapsize; i++)
+ __set_bit(davinci_ks->pdata->keymap[i], key_dev->keybit);
+
+ key_dev->name = "davinci_keyscan";
+ key_dev->phys = "davinci_keyscan/input0";
+ key_dev->dev.parent = &pdev->dev;
+ key_dev->id.bustype = BUS_HOST;
+ key_dev->id.vendor = 0x0001;
+ key_dev->id.product = 0x0001;
+ key_dev->id.version = 0x0001;
+ key_dev->keycode = davinci_ks->keymap;
+ key_dev->keycodesize = sizeof(davinci_ks->keymap[0]);
+ key_dev->keycodemax = davinci_ks->pdata->keymapsize;
+
+ ret = input_register_device(davinci_ks->input);
+ if (ret < 0) {
+ dev_err(dev, "unable to register davinci key scan device\n");
+ goto fail4;
+ }
+
+ ret = request_irq(davinci_ks->irq, davinci_ks_interrupt, IRQF_DISABLED,
+ "davinci_keyscan", davinci_ks);
+ if (ret < 0) {
+ dev_err(dev, "unable to register davinci key scan interrupt\n");
+ goto fail5;
+ }
+
+ ret = davinci_ks_initialize(davinci_ks);
+ if (ret < 0) {
+ dev_err(dev, "unable to initialize davinci key scan device\n");
+ goto fail5;
+ }
+
+ return 0;
+
+fail5:
+ input_unregister_device(davinci_ks->input);
+ key_dev = NULL;
+fail4:
+ iounmap(davinci_ks->base);
+fail3:
+ release_mem_region(davinci_ks->pbase, davinci_ks->base_size);
+fail2:
+ input_free_device(key_dev);
+fail1:
+ kfree(davinci_ks);
+
+ return ret;
+}
+
+static int __devexit davinci_ks_remove(struct platform_device *pdev)
+{
+ struct davinci_ks *davinci_ks = platform_get_drvdata(pdev);
+
+ free_irq(davinci_ks->irq, davinci_ks);
+
+ input_unregister_device(davinci_ks->input);
+
+ iounmap(davinci_ks->base);
+ release_mem_region(davinci_ks->pbase, davinci_ks->base_size);
+
+ platform_set_drvdata(pdev, NULL);
+
+ kfree(davinci_ks);
+
+ return 0;
+}
+
+static struct platform_driver davinci_ks_driver = {
+ .driver = {
+ .name = "davinci_keyscan",
+ .owner = THIS_MODULE,
+ },
+ .remove = __devexit_p(davinci_ks_remove),
+};
+
+static int __init davinci_ks_init(void)
+{
+ return platform_driver_probe(&davinci_ks_driver, davinci_ks_probe);
+}
+module_init(davinci_ks_init);
+
+static void __exit davinci_ks_exit(void)
+{
+ platform_driver_unregister(&davinci_ks_driver);
+}
+module_exit(davinci_ks_exit);
+
+MODULE_AUTHOR("Miguel Aguilar");
+MODULE_DESCRIPTION("Texas Instruments DaVinci Key Scan Driver");
+MODULE_LICENSE("GPL");
--
1.6.0.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
[parent not found: <1255109225-6833-1-git-send-email-miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>]
* Re: [PATCH v4 1/2] Input: DaVinci Keypad Driver
[not found] ` <1255109225-6833-1-git-send-email-miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
@ 2009-10-12 18:27 ` Kevin Hilman
[not found] ` <874oq4sc1b.fsf-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org>
0 siblings, 1 reply; 9+ messages in thread
From: Kevin Hilman @ 2009-10-12 18:27 UTC (permalink / raw)
To: miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w
Cc: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
clark.becker-9uBrGCPFOa1Wk0Htik3J/w,
linux-input-u79uwXL29TY76Z2rM5mHXA,
santiago.nunez-9uBrGCPFOa1Wk0Htik3J/w,
todd.fischer-9uBrGCPFOa1Wk0Htik3J/w
<miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org> writes:
> From: Miguel Aguilar <miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
>
> Adds the driver for enabling keypad support for DaVinci platforms.
>
> DM365 is the only platform that uses this driver at the moment.
>
> Signed-off-by: Miguel Aguilar <miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
> ---
> arch/arm/mach-davinci/include/mach/keyscan.h | 44 ++++
> drivers/input/keyboard/Kconfig | 10 +
> drivers/input/keyboard/Makefile | 1 +
> drivers/input/keyboard/davinci_keyscan.c | 338 ++++++++++++++++++++++++++
> 4 files changed, 393 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-davinci/include/mach/keyscan.h
> create mode 100644 drivers/input/keyboard/davinci_keyscan.c
>
> diff --git a/arch/arm/mach-davinci/include/mach/keyscan.h b/arch/arm/mach-davinci/include/mach/keyscan.h
> new file mode 100644
> index 0000000..dd84361
> --- /dev/null
> +++ b/arch/arm/mach-davinci/include/mach/keyscan.h
> @@ -0,0 +1,44 @@
> +/*
> + * Copyright (C) 2009 Texas Instruments, Inc
> + *
> + * Author: Miguel Aguilar <miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
> + *
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + */
> +
> +#ifndef DAVINCI_KEYSCAN_H
> +#define DAVINCI_KEYSCAN_H
> +
> +#include <linux/io.h>
> +
> +/* Base of key scan register bank */
n> +#define DM365_KEYSCAN_BASE (0x01C69400)
This base address is not used in the driver code and is SoC specific.
You've already defined it in PATCH 2/2 in the SoC specific files which
is the right place.
Kevin
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4 1/2] Input: DaVinci Keypad Driver
2009-10-09 17:27 [PATCH v4 1/2] Input: DaVinci Keypad Driver miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w
[not found] ` <1255109225-6833-1-git-send-email-miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
@ 2009-10-13 5:46 ` Dmitry Torokhov
2009-10-13 16:21 ` H Hartley Sweeten
[not found] ` <20091013054644.GF2887-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
1 sibling, 2 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2009-10-13 5:46 UTC (permalink / raw)
To: miguel.aguilar
Cc: davinci-linux-open-source, nsnehaprabha, linux-input,
todd.fischer, diego.dompe, clark.becker, santiago.nunez
Hi Miguel,
On Fri, Oct 09, 2009 at 11:27:05AM -0600, miguel.aguilar@ridgerun.com wrote:
> From: Miguel Aguilar <miguel.aguilar@ridgerun.com>
>
> Adds the driver for enabling keypad support for DaVinci platforms.
>
> DM365 is the only platform that uses this driver at the moment.
>
Looks pretty good, I have one question:
> +static void davinci_ks_write(struct davinci_ks *davinci_ks, u32 val, u32 addr)
> +{
> + u32 base = (u32)davinci_ks->base;
> +
> + __raw_writel(val,(u32 *)(base + addr));
> +}
Do you really need these casts? I'd think that bare __raw_writel would
work just fine.
> +
> +static u32 davinci_ks_read(struct davinci_ks *davinci_ks, u32 addr)
> +{
> + u32 base = (u32)davinci_ks->base;
> +
> + return __raw_readl((u32 *)(base + addr));
> +}
Could you also please try the patch below and let me know if it breaks
things. Also iof you coulr run sparse over the driver that would be
nice.
Thanks!
--
Dmitry
Input: davinci_keyscan - miscellaneous fixes
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
drivers/input/keyboard/davinci_keyscan.c | 107 +++++++++++++++++-------------
1 files changed, 60 insertions(+), 47 deletions(-)
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c
index 7b7424b..b80f078 100644
--- a/drivers/input/keyboard/davinci_keyscan.c
+++ b/drivers/input/keyboard/davinci_keyscan.c
@@ -79,7 +79,7 @@ static void davinci_ks_write(struct davinci_ks *davinci_ks, u32 val, u32 addr)
{
u32 base = (u32)davinci_ks->base;
- __raw_writel(val,(u32 *)(base + addr));
+ __raw_writel(val, (u32 *)(base + addr));
}
static u32 davinci_ks_read(struct davinci_ks *davinci_ks, u32 addr)
@@ -90,33 +90,46 @@ static u32 davinci_ks_read(struct davinci_ks *davinci_ks, u32 addr)
}
/* Initializing the kp Module */
-static int davinci_ks_initialize(struct davinci_ks *davinci_ks)
+static int __init davinci_ks_initialize(struct davinci_ks *davinci_ks)
{
struct device *dev = &davinci_ks->input->dev;
- u8 strobe = davinci_ks->pdata->strobe;
- u8 interval = davinci_ks->pdata->interval;
- u8 matrix_type = davinci_ks->pdata->matrix_type;
+ struct davinci_ks_platform_data *pdata = davinci_ks->pdata;
+ u32 matrix_ctrl;
/* Enable all interrupts */
- davinci_ks_write(davinci_ks, DAVINCI_KEYSCAN_INT_ALL, DAVINCI_KEYSCAN_INTENA);
+ davinci_ks_write(davinci_ks,
+ DAVINCI_KEYSCAN_INT_ALL, DAVINCI_KEYSCAN_INTENA);
/* Clear interrupts if any */
- davinci_ks_write(davinci_ks, DAVINCI_KEYSCAN_INT_ALL, DAVINCI_KEYSCAN_INTCLR);
+ davinci_ks_write(davinci_ks,
+ DAVINCI_KEYSCAN_INT_ALL, DAVINCI_KEYSCAN_INTCLR);
/* Setup the scan period = strobe + interval */
- davinci_ks_write(davinci_ks, strobe, DAVINCI_KEYSCAN_STRBWIDTH);
- davinci_ks_write(davinci_ks, interval, DAVINCI_KEYSCAN_INTERVAL);
+ davinci_ks_write(davinci_ks,
+ pdata->strobe, DAVINCI_KEYSCAN_STRBWIDTH);
+ davinci_ks_write(davinci_ks,
+ pdata->interval, DAVINCI_KEYSCAN_INTERVAL);
davinci_ks_write(davinci_ks, 0x01, DAVINCI_KEYSCAN_CONTTIME);
/* Define matrix type */
- if ((matrix_type != 0) && (matrix_type != 1)) {
+ switch (pdata->matrix_type) {
+ case DAVINCI_KEYSCAN_MATRIX_4X4:
+ matrix_ctrl = 0;
+ break;
+
+ case DAVINCI_KEYSCAN_MATRIX_5X3:
+ matrix_ctrl = (1 << 6);
+ break;
+
+ default:
dev_err(dev->parent, "wrong matrix type\n");
return -EINVAL;
}
/* Enable key scan module and set matrix type */
- davinci_ks_write(davinci_ks, DAVINCI_KEYSCAN_AUTODET | DAVINCI_KEYSCAN_KEYEN
- | (matrix_type << 6), DAVINCI_KEYSCAN_KEYCTRL);
+ davinci_ks_write(davinci_ks,
+ DAVINCI_KEYSCAN_AUTODET | DAVINCI_KEYSCAN_KEYEN | matrix_ctrl,
+ DAVINCI_KEYSCAN_KEYCTRL);
return 0;
}
@@ -140,26 +153,25 @@ static irqreturn_t davinci_ks_interrupt(int irq, void *dev_id)
new_status = davinci_ks_read(davinci_ks, DAVINCI_KEYSCAN_CURRENTST);
changed = prev_status ^ new_status;
-
- if(changed) {
+ if (changed) {
/*
- * It goes go through all bits in changed to ensure
+ * It goes through all bits in 'changed' to ensure
* that no key changes are being missed
*/
- for(i = 0 ; i < keymapsize; i++) {
- if((changed>>i) & 0x1) {
+ for (i = 0 ; i < keymapsize; i++) {
+ if ((changed >> i) & 0x1) {
keycode = keymap[i];
release = (new_status >> i) & 0x1;
dev_dbg(dev->parent, "key %d %s\n", keycode,
- release ? "released" : "pressed");
+ release ? "released" : "pressed");
input_report_key(davinci_ks->input, keycode,
- !release);
+ !release);
input_sync(davinci_ks->input);
}
}
/* Clearing interrupt */
davinci_ks_write(davinci_ks, DAVINCI_KEYSCAN_INT_ALL,
- DAVINCI_KEYSCAN_INTCLR);
+ DAVINCI_KEYSCAN_INTCLR);
}
/* Enable interrupts */
@@ -173,9 +185,9 @@ static int __init davinci_ks_probe(struct platform_device *pdev)
struct davinci_ks *davinci_ks;
struct input_dev *key_dev;
struct resource *res, *mem;
- struct device * dev = &pdev->dev;
+ struct device *dev = &pdev->dev;
struct davinci_ks_platform_data *pdata = pdev->dev.platform_data;
- int ret, i;
+ int error, i;
if (!pdata->keymap) {
dev_dbg(dev, "no keymap from pdata\n");
@@ -184,54 +196,53 @@ static int __init davinci_ks_probe(struct platform_device *pdev)
davinci_ks = kzalloc(sizeof(struct davinci_ks) +
sizeof(unsigned short) * pdata->keymapsize, GFP_KERNEL);
- if(!davinci_ks) {
+ if (!davinci_ks) {
dev_dbg(dev, "could not allocate memory for private data\n");
return -ENOMEM;
}
memcpy(davinci_ks->keymap, pdata->keymap,
- sizeof(unsigned short) * pdata->keymapsize);
+ sizeof(unsigned short) * pdata->keymapsize);
key_dev = input_allocate_device();
if (!key_dev) {
dev_dbg(dev, "could not allocate input device\n");
- ret = -ENOMEM;
+ error = -ENOMEM;
goto fail1;
}
- platform_set_drvdata(pdev, davinci_ks);
-
davinci_ks->input = key_dev;
davinci_ks->irq = platform_get_irq(pdev, 0);
if (davinci_ks->irq < 0) {
dev_err(dev, "no key scan irq\n");
- ret = davinci_ks->irq;
+ error = davinci_ks->irq;
goto fail2;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(dev, "no mem resource\n");
- ret = -EINVAL;
+ error = -EINVAL;
goto fail2;
}
davinci_ks->pbase = res->start;
davinci_ks->base_size = resource_size(res);
- mem = request_mem_region(davinci_ks->pbase, davinci_ks->base_size, pdev->name);
+ mem = request_mem_region(davinci_ks->pbase, davinci_ks->base_size,
+ pdev->name);
if (!mem) {
dev_err(dev, "key scan registers at %08x are not free\n",
davinci_ks->pbase);
- ret = -EBUSY;
+ error = -EBUSY;
goto fail2;
}
davinci_ks->base = ioremap(davinci_ks->pbase, davinci_ks->base_size);
if (!davinci_ks->base) {
dev_err(dev, "can't ioremap MEM resource.\n");
- ret = -ENOMEM;
+ error = -ENOMEM;
goto fail3;
}
@@ -259,27 +270,30 @@ static int __init davinci_ks_probe(struct platform_device *pdev)
key_dev->keycodesize = sizeof(davinci_ks->keymap[0]);
key_dev->keycodemax = davinci_ks->pdata->keymapsize;
- ret = input_register_device(davinci_ks->input);
- if (ret < 0) {
+ error = input_register_device(davinci_ks->input);
+ if (error < 0) {
dev_err(dev, "unable to register davinci key scan device\n");
goto fail4;
}
- ret = request_irq(davinci_ks->irq, davinci_ks_interrupt, IRQF_DISABLED,
- "davinci_keyscan", davinci_ks);
- if (ret < 0) {
+ error = request_irq(davinci_ks->irq, davinci_ks_interrupt,
+ IRQF_DISABLED, pdev->name, davinci_ks);
+ if (error < 0) {
dev_err(dev, "unable to register davinci key scan interrupt\n");
goto fail5;
}
- ret = davinci_ks_initialize(davinci_ks);
- if (ret < 0) {
+ error = davinci_ks_initialize(davinci_ks);
+ if (error < 0) {
dev_err(dev, "unable to initialize davinci key scan device\n");
- goto fail5;
+ goto fail6;
}
+ platform_set_drvdata(pdev, davinci_ks);
return 0;
+fail6:
+ free_irq(davinci_ks->irq);
fail5:
input_unregister_device(davinci_ks->input);
key_dev = NULL;
@@ -291,8 +305,7 @@ fail2:
input_free_device(key_dev);
fail1:
kfree(davinci_ks);
-
- return ret;
+ return error;
}
static int __devexit davinci_ks_remove(struct platform_device *pdev)
@@ -314,11 +327,11 @@ static int __devexit davinci_ks_remove(struct platform_device *pdev)
}
static struct platform_driver davinci_ks_driver = {
- .driver = {
- .name = "davinci_keyscan",
- .owner = THIS_MODULE,
- },
- .remove = __devexit_p(davinci_ks_remove),
+ .driver = {
+ .name = "davinci_keyscan",
+ .owner = THIS_MODULE,
+ },
+ .remove = __devexit_p(davinci_ks_remove),
};
static int __init davinci_ks_init(void)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* RE: [PATCH v4 1/2] Input: DaVinci Keypad Driver
2009-10-13 5:46 ` Dmitry Torokhov
@ 2009-10-13 16:21 ` H Hartley Sweeten
2009-10-13 16:55 ` Dmitry Torokhov
[not found] ` <20091013054644.GF2887-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
1 sibling, 1 reply; 9+ messages in thread
From: H Hartley Sweeten @ 2009-10-13 16:21 UTC (permalink / raw)
To: Dmitry Torokhov, miguel.aguilar
Cc: davinci-linux-open-source, nsnehaprabha, linux-input,
todd.fischer, diego.dompe, clark.becker, santiago.nunez
On Monday, October 12, 2009 10:47 PM, Dmitry Torokhov wrote:
> Hi Miguel,
>
> On Fri, Oct 09, 2009 at 11:27:05AM -0600, miguel.aguilar@ridgerun.com wrote:
>> From: Miguel Aguilar <miguel.aguilar@ridgerun.com>
>>
>> Adds the driver for enabling keypad support for DaVinci platforms.
>>
>> DM365 is the only platform that uses this driver at the moment.
>>
>
> Looks pretty good, I have one question:
>
>> +static void davinci_ks_write(struct davinci_ks *davinci_ks, u32 val, u32 addr)
>> +{
>> + u32 base = (u32)davinci_ks->base;
>> +
>> + __raw_writel(val,(u32 *)(base + addr));
>> +}
>
> Do you really need these casts? I'd think that bare __raw_writel would
> work just fine.
The address for __raw_{write/read}* should be void __iomem *, davinci_ks->base
should already be the correct type due to ioremap().
You can probably just change the whole thing to:
+static void davinci_ks_write(struct davinci_ks *davinci_ks, u32 val, u32 addr)
+{
+ __raw_writel(val, davinci_ks->base + addr);
+}
+
+static u32 davinci_ks_read(struct davinci_ks *davinci_ks, u32 addr)
+{
+ return __raw_readl(davinci_ks->base + addr);
+}
Regards,
Hartley
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v4 1/2] Input: DaVinci Keypad Driver
2009-10-13 16:21 ` H Hartley Sweeten
@ 2009-10-13 16:55 ` Dmitry Torokhov
[not found] ` <20091013165524.GA21593-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
0 siblings, 1 reply; 9+ messages in thread
From: Dmitry Torokhov @ 2009-10-13 16:55 UTC (permalink / raw)
To: H Hartley Sweeten
Cc: miguel.aguilar, davinci-linux-open-source, nsnehaprabha,
linux-input, todd.fischer, diego.dompe, clark.becker,
santiago.nunez
On Tue, Oct 13, 2009 at 12:21:47PM -0400, H Hartley Sweeten wrote:
> On Monday, October 12, 2009 10:47 PM, Dmitry Torokhov wrote:
> > Hi Miguel,
> >
> > On Fri, Oct 09, 2009 at 11:27:05AM -0600, miguel.aguilar@ridgerun.com wrote:
> >> From: Miguel Aguilar <miguel.aguilar@ridgerun.com>
> >>
> >> Adds the driver for enabling keypad support for DaVinci platforms.
> >>
> >> DM365 is the only platform that uses this driver at the moment.
> >>
> >
> > Looks pretty good, I have one question:
> >
> >> +static void davinci_ks_write(struct davinci_ks *davinci_ks, u32 val, u32 addr)
> >> +{
> >> + u32 base = (u32)davinci_ks->base;
> >> +
> >> + __raw_writel(val,(u32 *)(base + addr));
> >> +}
> >
> > Do you really need these casts? I'd think that bare __raw_writel would
> > work just fine.
>
> The address for __raw_{write/read}* should be void __iomem *, davinci_ks->base
> should already be the correct type due to ioremap().
>
> You can probably just change the whole thing to:
>
> +static void davinci_ks_write(struct davinci_ks *davinci_ks, u32 val, u32 addr)
> +{
> + __raw_writel(val, davinci_ks->base + addr);
> +}
> +
> +static u32 davinci_ks_read(struct davinci_ks *davinci_ks, u32 addr)
> +{
> + return __raw_readl(davinci_ks->base + addr);
> +}
>
Better yet, use __raw_readl() and __raw_writel() directly - there is no
need for wrappers that just rename existig functions not adding any
additional functionality.
--
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <20091013054644.GF2887-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>]
* Re: [PATCH v4 1/2] Input: DaVinci Keypad Driver
[not found] ` <20091013054644.GF2887-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
@ 2009-10-13 16:43 ` Miguel Aguilar
0 siblings, 0 replies; 9+ messages in thread
From: Miguel Aguilar @ 2009-10-13 16:43 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: davinci-linux-open-source-VycZQUHpC/PFrsHnngEfi1aTQe2KTcn/,
clark.becker-9uBrGCPFOa1Wk0Htik3J/w,
linux-input-u79uwXL29TY76Z2rM5mHXA,
santiago.nunez-9uBrGCPFOa1Wk0Htik3J/w,
todd.fischer-9uBrGCPFOa1Wk0Htik3J/w
Dmitry,
Dmitry Torokhov wrote:
> Hi Miguel,
>
> On Fri, Oct 09, 2009 at 11:27:05AM -0600, miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org wrote:
>> From: Miguel Aguilar <miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
>>
>> Adds the driver for enabling keypad support for DaVinci platforms.
>>
>> DM365 is the only platform that uses this driver at the moment.
>>
>
> Looks pretty good, I have one question:
>
>> +static void davinci_ks_write(struct davinci_ks *davinci_ks, u32 val, u32 addr)
>> +{
>> + u32 base = (u32)davinci_ks->base;
>> +
>> + __raw_writel(val,(u32 *)(base + addr));
>> +}
>
> Do you really need these casts? I'd think that bare __raw_writel would
> work just fine.
>
>> +
>> +static u32 davinci_ks_read(struct davinci_ks *davinci_ks, u32 addr)
>> +{
>> + u32 base = (u32)davinci_ks->base;
>> +
>> + return __raw_readl((u32 *)(base + addr));
>> +}
>
> Could you also please try the patch below and let me know if it breaks
> things. Also iof you coulr run sparse over the driver that would be
> nice.
>
> Thanks!
>
Thanks for the patch, I will add it and resend the whole patch.
Just one thing failed:
+fail6:
+ free_irq(davinci_ks->irq);
this must be:
free_irq(davinci_ks->irq, davinci_ks);
^ permalink raw reply [flat|nested] 9+ messages in thread
[parent not found: <1254772537-30836-1-git-send-email-miguel.aguilar@ridgerun.com>]
end of thread, other threads:[~2009-10-13 18:58 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-09 17:27 [PATCH v4 1/2] Input: DaVinci Keypad Driver miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w
[not found] ` <1255109225-6833-1-git-send-email-miguel.aguilar-9uBrGCPFOa1Wk0Htik3J/w@public.gmane.org>
2009-10-12 18:27 ` Kevin Hilman
[not found] ` <874oq4sc1b.fsf-1D3HCaltpLuhEniVeURVKkEOCMrvLtNR@public.gmane.org>
2009-10-13 18:58 ` Miguel Aguilar
2009-10-13 5:46 ` Dmitry Torokhov
2009-10-13 16:21 ` H Hartley Sweeten
2009-10-13 16:55 ` Dmitry Torokhov
[not found] ` <20091013165524.GA21593-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
2009-10-13 17:03 ` Miguel Aguilar
[not found] ` <20091013054644.GF2887-WlK9ik9hQGAhIp7JRqBPierSzoNAToWh@public.gmane.org>
2009-10-13 16:43 ` Miguel Aguilar
[not found] <1254772537-30836-1-git-send-email-miguel.aguilar@ridgerun.com>
[not found] ` <4ACF6DBA.8080307@ridgerun.com>
[not found] ` <20091009172011.GF1092@core.coreip.homeip.net>
2009-10-09 17:21 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).