leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Input: ams_delta_serio: Get FIQ buffer from platform_data

Browse Source 
Instead of exporting the FIQ buffer symbol to be used in
ams-delta-serio driver, pass it to the driver as platform_data.

Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Janusz Krzysztofik 2018-06-22 00:41:28 +02:00 committed by Tony Lindgren
parent a617b36bbc
commit 5f73861fae
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-omap1/ams-delta-fiq.c
View File

@ -40,8 +40,7 @@ static struct fiq_handler fh = {
* keystrokes received from the qwerty keyboard. See * keystrokes received from the qwerty keyboard. See
* <linux/platform_data/ams-delta-fiq.h> for details of offsets. * <linux/platform_data/ams-delta-fiq.h> for details of offsets.
*/ */
unsigned int fiq_buffer[1024]; static unsigned int fiq_buffer[1024];
EXPORT_SYMBOL(fiq_buffer);
static struct irq_chip *irq_chip; static struct irq_chip *irq_chip;
static struct irq_data *irq_data[16]; static struct irq_data *irq_data[16];
@ -203,9 +202,10 @@ void __init ams_delta_init_fiq(struct gpio_chip *chip,
val = omap_readl(OMAP_IH1_BASE + offset) | 1; val = omap_readl(OMAP_IH1_BASE + offset) | 1;
omap_writel(val, OMAP_IH1_BASE + offset); omap_writel(val, OMAP_IH1_BASE + offset);
/* Initialize serio device IRQ resource */ /* Initialize serio device IRQ resource and platform_data */
serio->resource[0].start = gpiod_to_irq(clk); serio->resource[0].start = gpiod_to_irq(clk);
serio->resource[0].end = serio->resource[0].start; serio->resource[0].end = serio->resource[0].start;
serio->dev.platform_data = fiq_buffer;
/* /*
* Since FIQ handler performs handling of GPIO registers for * Since FIQ handler performs handling of GPIO registers for

8
arch/arm/mach-omap1/board-ams-delta.c
View File

@ -537,6 +537,14 @@ static struct resource ams_delta_serio_resources[] = {
static struct platform_device ams_delta_serio_device = { static struct platform_device ams_delta_serio_device = {
.name = "ams-delta-serio", .name = "ams-delta-serio",
.id = PLATFORM_DEVID_NONE, .id = PLATFORM_DEVID_NONE,
.dev = {
/*
* Initialize .platform_data explicitly with NULL to
* indicate it is going to be used. It will be replaced
* with FIQ buffer address as soon as FIQ is initialized.
*/
.platform_data = NULL,
},
.num_resources = ARRAY_SIZE(ams_delta_serio_resources), .num_resources = ARRAY_SIZE(ams_delta_serio_resources),
.resource = ams_delta_serio_resources, .resource = ams_delta_serio_resources,
}; };

20
drivers/input/serio/ams_delta_serio.c
View File

@ -37,6 +37,7 @@ MODULE_LICENSE("GPL");
struct ams_delta_serio { struct ams_delta_serio {
struct serio *serio; struct serio *serio;
struct regulator *vcc; struct regulator *vcc;
unsigned int *fiq_buffer;
}; };
static int check_data(struct serio *serio, int data) static int check_data(struct serio *serio, int data)
@ -66,22 +67,23 @@ static int check_data(struct serio *serio, int data)
static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id) static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id)
{ {
struct ams_delta_serio *priv = dev_id; struct ams_delta_serio *priv = dev_id;
int *circ_buff = &fiq_buffer[FIQ_CIRC_BUFF]; int *circ_buff = &priv->fiq_buffer[FIQ_CIRC_BUFF];
int data, dfl; int data, dfl;
u8 scancode; u8 scancode;
fiq_buffer[FIQ_IRQ_PEND] = 0; priv->fiq_buffer[FIQ_IRQ_PEND] = 0;
/* /*
* Read data from the circular buffer, check it * Read data from the circular buffer, check it
* and then pass it on the serio * and then pass it on the serio
*/ */
while (fiq_buffer[FIQ_KEYS_CNT] > 0) { while (priv->fiq_buffer[FIQ_KEYS_CNT] > 0) {
data = circ_buff[fiq_buffer[FIQ_HEAD_OFFSET]++]; data = circ_buff[priv->fiq_buffer[FIQ_HEAD_OFFSET]++];
fiq_buffer[FIQ_KEYS_CNT]--; priv->fiq_buffer[FIQ_KEYS_CNT]--;
if (fiq_buffer[FIQ_HEAD_OFFSET] == fiq_buffer[FIQ_BUF_LEN]) if (priv->fiq_buffer[FIQ_HEAD_OFFSET] ==
fiq_buffer[FIQ_HEAD_OFFSET] = 0; priv->fiq_buffer[FIQ_BUF_LEN])
priv->fiq_buffer[FIQ_HEAD_OFFSET] = 0;
dfl = check_data(priv->serio, data); dfl = check_data(priv->serio, data);
scancode = (u8) (data >> 1) & 0xFF; scancode = (u8) (data >> 1) & 0xFF;
@ -116,6 +118,10 @@ static int ams_delta_serio_init(struct platform_device *pdev)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
priv->fiq_buffer = pdev->dev.platform_data;
if (!priv->fiq_buffer)
return -EINVAL;
priv->vcc = devm_regulator_get(&pdev->dev, "vcc"); priv->vcc = devm_regulator_get(&pdev->dev, "vcc");
if (IS_ERR(priv->vcc)) { if (IS_ERR(priv->vcc)) {
err = PTR_ERR(priv->vcc); err = PTR_ERR(priv->vcc);

4
include/linux/platform_data/ams-delta-fiq.h
View File

@ -55,8 +55,4 @@
#define FIQ_CIRC_BUFF 30 /*Start of circular buffer */ #define FIQ_CIRC_BUFF 30 /*Start of circular buffer */
#ifndef __ASSEMBLER__
extern unsigned int fiq_buffer[];
#endif
#endif #endif