SoC updates for omap1 for v4.19 merge window
Mostly a series by Janusz Krzysztofik to clean up the GPIO and input handling for ams-delta. Because of the platform data changes, we decided that it's best to merge the related input changes also via the arm-soc tree so Dmitry Torokhov has acked the input changes. Also included is a change to constify gpio_leds from Arvind Yadav. -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAltF9PcRHHRvbnlAYXRv bWlkZS5jb20ACgkQG9Q+yVyrpXN6Lg//ccr44ovAE3GWfS3JnnpbgxqcU5SJlleI vuy9vJ78okuq/bWXp87TgIpvR+Mikd7/dk1+W1JccefNsIfzG9QZY+ongUWORdhL KcwcTcNEL6sTFhhbSnyFWcL3mBrD/3TB8a8fm611tjYl87DYQ4PiD1Wnu+1EMsD7 95FjzMQ6ASj2ulzoybSaTg33qpyoyUAzn78+qmSTV+2jz9lg8JBc+9kGI9x8lMnr 3QWQYBJWSJCjkMTPNbltBY1jNdmfhyilqWbxXFr3FcifCRBCivbZblk+aPUsmLy6 Pk5pdpQCnZd5hpsoAx2U+7o+/FKTq1UtGlDdfN4yQxiy1wT87uWkidfm1HxuLFTC rEBFfIOe3aXbJNbHgIV+l45CYnfNJb9ZyFqXmmunia1xqhZWq3MvDBIPK57NmNWV gGMDPq18eOBCBcnCrmDC5RwSssDyE1Qm4BuNeMSJr1qU01aB2pnHkJxG6s3OnmB2 uOnCdLOpi4YNxnFrYhzCv7ZpAYOVDvdLMCSIjCgAVB3x/5B6YPlLFhMjj043gMgV 6y+Mim/bmOklOA5i1MbVSZG7YCOk4ZvyRUacZ9juJwmW1eGMfvlJWOKr14K2pSer VEXCJ59CwrtlGzNMMUlPCZIHhGMgWwsJXZwG0tyIwyCNA2SaR/Z74t0xgE36YKVw vG+hw3FVrAk= =0NZG -----END PGP SIGNATURE----- Merge tag 'omap-for-v4.19/omap1-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc SoC updates for omap1 for v4.19 merge window Mostly a series by Janusz Krzysztofik to clean up the GPIO and input handling for ams-delta. Because of the platform data changes, we decided that it's best to merge the related input changes also via the arm-soc tree so Dmitry Torokhov has acked the input changes. Also included is a change to constify gpio_leds from Arvind Yadav. * tag 'omap-for-v4.19/omap1-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP1: ams-delta: move late devices back to init_machine Input: ams_delta_serio: Get FIQ buffer from platform_data Input: ams_delta_serio: use IRQ resource ARM: OMAP1: Get rid of <mach/ams-delta-fiq.h> ARM: OMAP1: ams-delta FIQ: Keep serio input GPIOs requested ARM: OMAP1: ams-delta FIQ: don't use static GPIO numbers ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin Input: ams_delta_serio: Replace power GPIO with regulator Input: ams_delta_serio: use private structure Input: ams_delta_serio: convert to platform driver ARM: OMAP1: ams-delta: drop GPIO lookup table for serio device ARM: OMAP1: ams-delta: assign LED GPIO numbers from descriptors ARM: OMAP1: ams-delta: refactor late_init() ARM: OMAP1: constify gpio_led Signed-off-by: Olof Johansson <olof@lixom.net>hifive-unleashed-5.1
Olof Johansson
commit
5306c6ad0e
|
|
@ -10406,6 +10406,7 @@ F: arch/arm/plat-omap/
|
|||
F: arch/arm/configs/omap1_defconfig
|
||||
F: drivers/i2c/busses/i2c-omap.c
|
||||
F: include/linux/platform_data/i2c-omap.h
|
||||
F: include/linux/platform_data/ams-delta-fiq.h
|
||||
|
||||
OMAP2+ SUPPORT
|
||||
M: Tony Lindgren <tony@atomide.com>
|
||||
|
|
|
|||
|
|
@ -14,11 +14,12 @@
|
|||
*/
|
||||
|
||||
#include <linux/linkage.h>
|
||||
#include <linux/platform_data/ams-delta-fiq.h>
|
||||
|
||||
#include <asm/assembler.h>
|
||||
|
||||
#include <mach/board-ams-delta.h>
|
||||
#include <mach/ams-delta-fiq.h>
|
||||
|
||||
#include "ams-delta-fiq.h"
|
||||
#include "iomap.h"
|
||||
#include "soc.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -13,17 +13,20 @@
|
|||
* under the terms of the GNU General Public License version 2 as published by
|
||||
* the Free Software Foundation.
|
||||
*/
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/gpio/driver.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/platform_data/ams-delta-fiq.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <mach/board-ams-delta.h>
|
||||
|
||||
#include <asm/fiq.h>
|
||||
|
||||
#include <mach/ams-delta-fiq.h>
|
||||
#include "ams-delta-fiq.h"
|
||||
|
||||
static struct fiq_handler fh = {
|
||||
.name = "ams-delta-fiq"
|
||||
|
|
@ -34,20 +37,24 @@ static struct fiq_handler fh = {
|
|||
* The FIQ and IRQ isrs can both read and write it.
|
||||
* It is structured as a header section several 32bit slots,
|
||||
* followed by the circular buffer where the FIQ isr stores
|
||||
* keystrokes received from the qwerty keyboard.
|
||||
* See ams-delta-fiq.h for details of offsets.
|
||||
* keystrokes received from the qwerty keyboard. See
|
||||
* <linux/platform_data/ams-delta-fiq.h> for details of offsets.
|
||||
*/
|
||||
unsigned int fiq_buffer[1024];
|
||||
EXPORT_SYMBOL(fiq_buffer);
|
||||
static unsigned int fiq_buffer[1024];
|
||||
|
||||
static struct irq_chip *irq_chip;
|
||||
static struct irq_data *irq_data[16];
|
||||
static unsigned int irq_counter[16];
|
||||
|
||||
static const char *pin_name[16] __initconst = {
|
||||
[AMS_DELTA_GPIO_PIN_KEYBRD_DATA] = "keybrd_data",
|
||||
[AMS_DELTA_GPIO_PIN_KEYBRD_CLK] = "keybrd_clk",
|
||||
};
|
||||
|
||||
static irqreturn_t deferred_fiq(int irq, void *dev_id)
|
||||
{
|
||||
struct irq_data *d;
|
||||
int gpio, irq_num, fiq_count;
|
||||
struct irq_chip *irq_chip;
|
||||
|
||||
irq_chip = irq_get_chip(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK));
|
||||
|
||||
/*
|
||||
* For each handled GPIO interrupt, keep calling its interrupt handler
|
||||
|
|
@ -55,24 +62,21 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)
|
|||
*/
|
||||
for (gpio = AMS_DELTA_GPIO_PIN_KEYBRD_CLK;
|
||||
gpio <= AMS_DELTA_GPIO_PIN_HOOK_SWITCH; gpio++) {
|
||||
irq_num = gpio_to_irq(gpio);
|
||||
d = irq_data[gpio];
|
||||
irq_num = d->irq;
|
||||
fiq_count = fiq_buffer[FIQ_CNT_INT_00 + gpio];
|
||||
|
||||
if (irq_counter[gpio] < fiq_count &&
|
||||
gpio != AMS_DELTA_GPIO_PIN_KEYBRD_CLK) {
|
||||
struct irq_data *d = irq_get_irq_data(irq_num);
|
||||
|
||||
/*
|
||||
* handle_simple_irq() that OMAP GPIO edge
|
||||
* interrupts default to since commit 80ac93c27441
|
||||
* requires interrupt already acked and unmasked.
|
||||
*/
|
||||
if (irq_chip) {
|
||||
if (irq_chip->irq_ack)
|
||||
irq_chip->irq_ack(d);
|
||||
if (irq_chip->irq_unmask)
|
||||
irq_chip->irq_unmask(d);
|
||||
}
|
||||
if (irq_chip->irq_ack)
|
||||
irq_chip->irq_ack(d);
|
||||
if (irq_chip->irq_unmask)
|
||||
irq_chip->irq_unmask(d);
|
||||
}
|
||||
for (; irq_counter[gpio] < fiq_count; irq_counter[gpio]++)
|
||||
generic_handle_irq(irq_num);
|
||||
|
|
@ -80,14 +84,56 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)
|
|||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
void __init ams_delta_init_fiq(void)
|
||||
void __init ams_delta_init_fiq(struct gpio_chip *chip,
|
||||
struct platform_device *serio)
|
||||
{
|
||||
struct gpio_desc *gpiod, *data = NULL, *clk = NULL;
|
||||
void *fiqhandler_start;
|
||||
unsigned int fiqhandler_length;
|
||||
struct pt_regs FIQ_regs;
|
||||
unsigned long val, offset;
|
||||
int i, retval;
|
||||
|
||||
/* Store irq_chip location for IRQ handler use */
|
||||
irq_chip = chip->irq.chip;
|
||||
if (!irq_chip) {
|
||||
pr_err("%s: GPIO chip %s is missing IRQ function\n", __func__,
|
||||
chip->label);
|
||||
return;
|
||||
}
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(irq_data); i++) {
|
||||
gpiod = gpiochip_request_own_desc(chip, i, pin_name[i]);
|
||||
if (IS_ERR(gpiod)) {
|
||||
pr_err("%s: failed to get GPIO pin %d (%ld)\n",
|
||||
__func__, i, PTR_ERR(gpiod));
|
||||
return;
|
||||
}
|
||||
/* Store irq_data location for IRQ handler use */
|
||||
irq_data[i] = irq_get_irq_data(gpiod_to_irq(gpiod));
|
||||
|
||||
/*
|
||||
* FIQ handler takes full control over serio data and clk GPIO
|
||||
* pins. Initiaize them and keep requested so nobody can
|
||||
* interfere. Fail if any of those two couldn't be requested.
|
||||
*/
|
||||
switch (i) {
|
||||
case AMS_DELTA_GPIO_PIN_KEYBRD_DATA:
|
||||
data = gpiod;
|
||||
gpiod_direction_input(data);
|
||||
break;
|
||||
case AMS_DELTA_GPIO_PIN_KEYBRD_CLK:
|
||||
clk = gpiod;
|
||||
gpiod_direction_input(clk);
|
||||
break;
|
||||
default:
|
||||
gpiochip_free_own_desc(gpiod);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!data || !clk)
|
||||
goto out_gpio;
|
||||
|
||||
fiqhandler_start = &qwerty_fiqin_start;
|
||||
fiqhandler_length = &qwerty_fiqin_end - &qwerty_fiqin_start;
|
||||
pr_info("Installing fiq handler from %p, length 0x%x\n",
|
||||
|
|
@ -97,7 +143,7 @@ void __init ams_delta_init_fiq(void)
|
|||
if (retval) {
|
||||
pr_err("ams_delta_init_fiq(): couldn't claim FIQ, ret=%d\n",
|
||||
retval);
|
||||
return;
|
||||
goto out_gpio;
|
||||
}
|
||||
|
||||
retval = request_irq(INT_DEFERRED_FIQ, deferred_fiq,
|
||||
|
|
@ -105,7 +151,7 @@ void __init ams_delta_init_fiq(void)
|
|||
if (retval < 0) {
|
||||
pr_err("Failed to get deferred_fiq IRQ, ret=%d\n", retval);
|
||||
release_fiq(&fh);
|
||||
return;
|
||||
goto out_gpio;
|
||||
}
|
||||
/*
|
||||
* Since no set_type() method is provided by OMAP irq chip,
|
||||
|
|
@ -155,4 +201,29 @@ void __init ams_delta_init_fiq(void)
|
|||
offset = IRQ_ILR0_REG_OFFSET + (INT_GPIO_BANK1 - NR_IRQS_LEGACY) * 0x4;
|
||||
val = omap_readl(OMAP_IH1_BASE + offset) | 1;
|
||||
omap_writel(val, OMAP_IH1_BASE + offset);
|
||||
|
||||
/* Initialize serio device IRQ resource and platform_data */
|
||||
serio->resource[0].start = gpiod_to_irq(clk);
|
||||
serio->resource[0].end = serio->resource[0].start;
|
||||
serio->dev.platform_data = fiq_buffer;
|
||||
|
||||
/*
|
||||
* Since FIQ handler performs handling of GPIO registers for
|
||||
* "keybrd_clk" IRQ pin, ams_delta_serio driver used to set
|
||||
* handle_simple_irq() as active IRQ handler for that pin to avoid
|
||||
* bad interaction with gpio-omap driver. This is no longer needed
|
||||
* as handle_simple_irq() is now the default handler for OMAP GPIO
|
||||
* edge interrupts.
|
||||
* This comment replaces the obsolete code which has been removed
|
||||
* from the ams_delta_serio driver and stands here only as a reminder
|
||||
* of that dependency on gpio-omap driver behavior.
|
||||
*/
|
||||
|
||||
return;
|
||||
|
||||
out_gpio:
|
||||
if (data)
|
||||
gpiochip_free_own_desc(data);
|
||||
if (clk)
|
||||
gpiochip_free_own_desc(clk);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
|
||||
/*
|
||||
* arch/arm/mach-omap1/ams-delta-fiq.h
|
||||
*
|
||||
* Taken from the original Amstrad modifications to fiq.h
|
||||
*
|
||||
* Copyright (c) 2004 Amstrad Plc
|
||||
* Copyright (c) 2006 Matt Callow
|
||||
* Copyright (c) 2010 Janusz Krzysztofik
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
#ifndef __AMS_DELTA_FIQ_H
|
||||
#define __AMS_DELTA_FIQ_H
|
||||
|
||||
#include <mach/irqs.h>
|
||||
|
||||
/*
|
||||
* Interrupt number used for passing control from FIQ to IRQ.
|
||||
* IRQ12, described as reserved, has been selected.
|
||||
*/
|
||||
#define INT_DEFERRED_FIQ INT_1510_RES12
|
||||
/*
|
||||
* Base address of an interrupt handler that the INT_DEFERRED_FIQ belongs to.
|
||||
*/
|
||||
#if (INT_DEFERRED_FIQ < IH2_BASE)
|
||||
#define DEFERRED_FIQ_IH_BASE OMAP_IH1_BASE
|
||||
#else
|
||||
#define DEFERRED_FIQ_IH_BASE OMAP_IH2_BASE
|
||||
#endif
|
||||
|
||||
#ifndef __ASSEMBLER__
|
||||
extern unsigned char qwerty_fiqin_start, qwerty_fiqin_end;
|
||||
|
||||
extern void __init ams_delta_init_fiq(struct gpio_chip *chip,
|
||||
struct platform_device *pdev);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
@ -41,10 +41,10 @@
|
|||
#include <mach/mux.h>
|
||||
|
||||
#include <mach/hardware.h>
|
||||
#include <mach/ams-delta-fiq.h>
|
||||
#include "camera.h"
|
||||
#include <mach/usb.h>
|
||||
|
||||
#include "ams-delta-fiq.h"
|
||||
#include "iomap.h"
|
||||
#include "common.h"
|
||||
|
||||
|
|
@ -179,7 +179,10 @@ static struct resource latch1_resources[] = {
|
|||
},
|
||||
};
|
||||
|
||||
#define LATCH1_LABEL "latch1"
|
||||
|
||||
static struct bgpio_pdata latch1_pdata = {
|
||||
.label = LATCH1_LABEL,
|
||||
.base = LATCH1_GPIO_BASE,
|
||||
.ngpio = LATCH1_NGPIO,
|
||||
};
|
||||
|
|
@ -194,6 +197,15 @@ static struct platform_device latch1_gpio_device = {
|
|||
},
|
||||
};
|
||||
|
||||
#define LATCH1_PIN_LED_CAMERA 0
|
||||
#define LATCH1_PIN_LED_ADVERT 1
|
||||
#define LATCH1_PIN_LED_MAIL 2
|
||||
#define LATCH1_PIN_LED_HANDSFREE 3
|
||||
#define LATCH1_PIN_LED_VOICEMAIL 4
|
||||
#define LATCH1_PIN_LED_VOICE 5
|
||||
#define LATCH1_PIN_DOCKIT1 6
|
||||
#define LATCH1_PIN_DOCKIT2 7
|
||||
|
||||
static struct resource latch2_resources[] = {
|
||||
[0] = {
|
||||
.name = "dat",
|
||||
|
|
@ -398,38 +410,43 @@ static struct gpiod_lookup_table ams_delta_lcd_gpio_table = {
|
|||
},
|
||||
};
|
||||
|
||||
static const struct gpio_led gpio_leds[] __initconst = {
|
||||
{
|
||||
/*
|
||||
* Dynamically allocated GPIO numbers must be obtained fromm GPIO device
|
||||
* before they can be put in the gpio_led table. Before that happens,
|
||||
* initialize the table with invalid GPIO numbers, not 0.
|
||||
*/
|
||||
static struct gpio_led gpio_leds[] __initdata = {
|
||||
[LATCH1_PIN_LED_CAMERA] = {
|
||||
.name = "camera",
|
||||
.gpio = LATCH1_GPIO_BASE + 0,
|
||||
.gpio = -EINVAL,
|
||||
.default_state = LEDS_GPIO_DEFSTATE_OFF,
|
||||
#ifdef CONFIG_LEDS_TRIGGERS
|
||||
.default_trigger = "ams_delta_camera",
|
||||
#endif
|
||||
},
|
||||
{
|
||||
[LATCH1_PIN_LED_ADVERT] = {
|
||||
.name = "advert",
|
||||
.gpio = LATCH1_GPIO_BASE + 1,
|
||||
.gpio = -EINVAL,
|
||||
.default_state = LEDS_GPIO_DEFSTATE_OFF,
|
||||
},
|
||||
{
|
||||
[LATCH1_PIN_LED_MAIL] = {
|
||||
.name = "email",
|
||||
.gpio = LATCH1_GPIO_BASE + 2,
|
||||
.gpio = -EINVAL,
|
||||
.default_state = LEDS_GPIO_DEFSTATE_OFF,
|
||||
},
|
||||
{
|
||||
[LATCH1_PIN_LED_HANDSFREE] = {
|
||||
.name = "handsfree",
|
||||
.gpio = LATCH1_GPIO_BASE + 3,
|
||||
.gpio = -EINVAL,
|
||||
.default_state = LEDS_GPIO_DEFSTATE_OFF,
|
||||
},
|
||||
{
|
||||
[LATCH1_PIN_LED_VOICEMAIL] = {
|
||||
.name = "voicemail",
|
||||
.gpio = LATCH1_GPIO_BASE + 4,
|
||||
.gpio = -EINVAL,
|
||||
.default_state = LEDS_GPIO_DEFSTATE_OFF,
|
||||
},
|
||||
{
|
||||
[LATCH1_PIN_LED_VOICE] = {
|
||||
.name = "voice",
|
||||
.gpio = LATCH1_GPIO_BASE + 5,
|
||||
.gpio = -EINVAL,
|
||||
.default_state = LEDS_GPIO_DEFSTATE_OFF,
|
||||
},
|
||||
};
|
||||
|
|
@ -504,16 +521,70 @@ static struct platform_device cx20442_codec_device = {
|
|||
.id = -1,
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table ams_delta_serio_gpio_table = {
|
||||
static struct resource ams_delta_serio_resources[] = {
|
||||
{
|
||||
.flags = IORESOURCE_IRQ,
|
||||
/*
|
||||
* Initialize IRQ resource with invalid IRQ number.
|
||||
* It will be replaced with dynamically allocated GPIO IRQ
|
||||
* obtained from GPIO chip as soon as the chip is available.
|
||||
*/
|
||||
.start = -EINVAL,
|
||||
.end = -EINVAL,
|
||||
},
|
||||
};
|
||||
|
||||
static struct platform_device ams_delta_serio_device = {
|
||||
.name = "ams-delta-serio",
|
||||
.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),
|
||||
.resource = ams_delta_serio_resources,
|
||||
};
|
||||
|
||||
static struct regulator_consumer_supply keybrd_pwr_consumers[] = {
|
||||
/*
|
||||
* Initialize supply .dev_name with NULL. It will be replaced
|
||||
* with serio dev_name() as soon as the serio device is registered.
|
||||
*/
|
||||
REGULATOR_SUPPLY("vcc", NULL),
|
||||
};
|
||||
|
||||
static struct regulator_init_data keybrd_pwr_initdata = {
|
||||
.constraints = {
|
||||
.valid_ops_mask = REGULATOR_CHANGE_STATUS,
|
||||
},
|
||||
.num_consumer_supplies = ARRAY_SIZE(keybrd_pwr_consumers),
|
||||
.consumer_supplies = keybrd_pwr_consumers,
|
||||
};
|
||||
|
||||
static struct fixed_voltage_config keybrd_pwr_config = {
|
||||
.supply_name = "keybrd_pwr",
|
||||
.microvolts = 5000000,
|
||||
.gpio = AMS_DELTA_GPIO_PIN_KEYBRD_PWR,
|
||||
.enable_high = 1,
|
||||
.init_data = &keybrd_pwr_initdata,
|
||||
};
|
||||
|
||||
static struct platform_device keybrd_pwr_device = {
|
||||
.name = "reg-fixed-voltage",
|
||||
.id = PLATFORM_DEVID_AUTO,
|
||||
.dev = {
|
||||
.platform_data = &keybrd_pwr_config,
|
||||
},
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table keybrd_pwr_gpio_table = {
|
||||
.table = {
|
||||
GPIO_LOOKUP(OMAP_GPIO_LABEL, AMS_DELTA_GPIO_PIN_KEYBRD_DATA,
|
||||
"data", 0),
|
||||
GPIO_LOOKUP(OMAP_GPIO_LABEL, AMS_DELTA_GPIO_PIN_KEYBRD_CLK,
|
||||
"clock", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_KEYBRD_PWR,
|
||||
"power", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_KEYBRD_DATAOUT,
|
||||
"dataout", 0),
|
||||
GPIO_LOOKUP(LATCH2_LABEL, LATCH2_PIN_KEYBRD_PWR, NULL,
|
||||
GPIO_ACTIVE_HIGH),
|
||||
{ },
|
||||
},
|
||||
};
|
||||
|
|
@ -524,9 +595,7 @@ static struct platform_device *ams_delta_devices[] __initdata = {
|
|||
&ams_delta_kp_device,
|
||||
&ams_delta_camera_device,
|
||||
&ams_delta_audio_device,
|
||||
};
|
||||
|
||||
static struct platform_device *late_devices[] __initdata = {
|
||||
&ams_delta_serio_device,
|
||||
&ams_delta_nand_device,
|
||||
&ams_delta_lcd_device,
|
||||
&cx20442_codec_device,
|
||||
|
|
@ -534,14 +603,55 @@ static struct platform_device *late_devices[] __initdata = {
|
|||
|
||||
static struct gpiod_lookup_table *ams_delta_gpio_tables[] __initdata = {
|
||||
&ams_delta_audio_gpio_table,
|
||||
&ams_delta_serio_gpio_table,
|
||||
};
|
||||
|
||||
static struct gpiod_lookup_table *late_gpio_tables[] __initdata = {
|
||||
&keybrd_pwr_gpio_table,
|
||||
&ams_delta_lcd_gpio_table,
|
||||
&ams_delta_nand_gpio_table,
|
||||
};
|
||||
|
||||
/*
|
||||
* Some drivers may not use GPIO lookup tables but need to be provided
|
||||
* with GPIO numbers. The same applies to GPIO based IRQ lines - some
|
||||
* drivers may even not use GPIO layer but expect just IRQ numbers.
|
||||
* We could either define GPIO lookup tables then use them on behalf
|
||||
* of those devices, or we can use GPIO driver level methods for
|
||||
* identification of GPIO and IRQ numbers. For the purpose of the latter,
|
||||
* defina a helper function which identifies GPIO chips by their labels.
|
||||
*/
|
||||
static int gpiochip_match_by_label(struct gpio_chip *chip, void *data)
|
||||
{
|
||||
char *label = data;
|
||||
|
||||
return !strcmp(label, chip->label);
|
||||
}
|
||||
|
||||
static struct gpiod_hog ams_delta_gpio_hogs[] = {
|
||||
GPIO_HOG(LATCH2_LABEL, LATCH2_PIN_KEYBRD_DATAOUT, "keybrd_dataout",
|
||||
GPIO_ACTIVE_HIGH, GPIOD_OUT_LOW),
|
||||
{},
|
||||
};
|
||||
|
||||
/*
|
||||
* The purpose of this function is to take care of proper initialization of
|
||||
* devices and data structures which depend on GPIO lines provided by OMAP GPIO
|
||||
* banks but their drivers don't use GPIO lookup tables or GPIO layer at all.
|
||||
* The function may be called as soon as OMAP GPIO devices are probed.
|
||||
* Since that happens at postcore_initcall, it can be called successfully
|
||||
* from init_machine or later.
|
||||
* Dependent devices may be registered from within this function or later.
|
||||
*/
|
||||
static void __init omap_gpio_deps_init(void)
|
||||
{
|
||||
struct gpio_chip *chip;
|
||||
|
||||
chip = gpiochip_find(OMAP_GPIO_LABEL, gpiochip_match_by_label);
|
||||
if (!chip) {
|
||||
pr_err("%s: OMAP GPIO chip not found\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
ams_delta_init_fiq(chip, &ams_delta_serio_device);
|
||||
}
|
||||
|
||||
static void __init ams_delta_init(void)
|
||||
{
|
||||
/* mux pins for uarts */
|
||||
|
|
@ -562,6 +672,9 @@ static void __init ams_delta_init(void)
|
|||
omap_cfg_reg(J19_1610_CAM_D6);
|
||||
omap_cfg_reg(J18_1610_CAM_D7);
|
||||
|
||||
omap_gpio_deps_init();
|
||||
gpiod_add_hogs(ams_delta_gpio_hogs);
|
||||
|
||||
omap_serial_init();
|
||||
omap_register_i2c_bus(1, 100, NULL, 0);
|
||||
|
||||
|
|
@ -571,25 +684,38 @@ static void __init ams_delta_init(void)
|
|||
led_trigger_register_simple("ams_delta_camera",
|
||||
&ams_delta_camera_led_trigger);
|
||||
#endif
|
||||
gpio_led_register_device(-1, &leds_pdata);
|
||||
platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
|
||||
|
||||
/*
|
||||
* As soon as devices have been registered, assign their dev_names
|
||||
* to respective GPIO lookup tables before they are added.
|
||||
* As soon as regulator consumers have been registered, assign their
|
||||
* dev_names to consumer supply entries of respective regulators.
|
||||
*/
|
||||
keybrd_pwr_consumers[0].dev_name =
|
||||
dev_name(&ams_delta_serio_device.dev);
|
||||
|
||||
/*
|
||||
* Once consumer supply entries are populated with dev_names,
|
||||
* register regulator devices. At this stage only the keyboard
|
||||
* power regulator has its consumer supply table fully populated.
|
||||
*/
|
||||
platform_device_register(&keybrd_pwr_device);
|
||||
|
||||
/*
|
||||
* As soon as GPIO consumers have been registered, assign
|
||||
* their dev_names to respective GPIO lookup tables.
|
||||
*/
|
||||
ams_delta_audio_gpio_table.dev_id =
|
||||
dev_name(&ams_delta_audio_device.dev);
|
||||
/*
|
||||
* No device name is assigned to GPIO lookup table for serio device
|
||||
* as long as serio driver is not converted to platform device driver.
|
||||
*/
|
||||
keybrd_pwr_gpio_table.dev_id = dev_name(&keybrd_pwr_device.dev);
|
||||
ams_delta_nand_gpio_table.dev_id = dev_name(&ams_delta_nand_device.dev);
|
||||
ams_delta_lcd_gpio_table.dev_id = dev_name(&ams_delta_lcd_device.dev);
|
||||
|
||||
/*
|
||||
* Once GPIO lookup tables are populated with dev_names, register them.
|
||||
*/
|
||||
gpiod_add_lookup_tables(ams_delta_gpio_tables,
|
||||
ARRAY_SIZE(ams_delta_gpio_tables));
|
||||
|
||||
ams_delta_init_fiq();
|
||||
|
||||
omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1);
|
||||
|
||||
omapfb_set_lcd_config(&ams_delta_lcd_config);
|
||||
|
|
@ -643,35 +769,84 @@ static struct platform_device ams_delta_modem_device = {
|
|||
},
|
||||
};
|
||||
|
||||
static int __init late_init(void)
|
||||
/*
|
||||
* leds-gpio driver doesn't make use of GPIO lookup tables,
|
||||
* it has to be provided with GPIO numbers over platform data
|
||||
* if GPIO descriptor info can't be obtained from device tree.
|
||||
* We could either define GPIO lookup tables and use them on behalf
|
||||
* of the leds-gpio device, or we can use GPIO driver level methods
|
||||
* for identification of GPIO numbers as long as we don't support
|
||||
* device tree. Let's do the latter.
|
||||
*/
|
||||
static void __init ams_delta_led_init(struct gpio_chip *chip)
|
||||
{
|
||||
struct gpio_desc *gpiod;
|
||||
int i;
|
||||
|
||||
for (i = LATCH1_PIN_LED_CAMERA; i < LATCH1_PIN_DOCKIT1; i++) {
|
||||
gpiod = gpiochip_request_own_desc(chip, i, NULL);
|
||||
if (IS_ERR(gpiod)) {
|
||||
pr_warn("%s: %s GPIO %d request failed (%ld)\n",
|
||||
__func__, LATCH1_LABEL, i, PTR_ERR(gpiod));
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Assign GPIO numbers to LED device. */
|
||||
gpio_leds[i].gpio = desc_to_gpio(gpiod);
|
||||
|
||||
gpiochip_free_own_desc(gpiod);
|
||||
}
|
||||
|
||||
gpio_led_register_device(PLATFORM_DEVID_NONE, &leds_pdata);
|
||||
}
|
||||
|
||||
/*
|
||||
* The purpose of this function is to take care of assignment of GPIO numbers
|
||||
* to platform devices which depend on GPIO lines provided by Amstrad Delta
|
||||
* latch1 and/or latch2 GPIO devices but don't use GPIO lookup tables.
|
||||
* The function may be called as soon as latch1/latch2 GPIO devices are
|
||||
* initilized. Since basic-mmio-gpio driver is not registered before
|
||||
* device_initcall, this may happen at erliest during device_initcall_sync.
|
||||
* Dependent devices shouldn't be registered before that, their
|
||||
* registration may be performed from within this function or later.
|
||||
*/
|
||||
static int __init ams_delta_gpio_init(void)
|
||||
{
|
||||
struct gpio_chip *chip;
|
||||
int err;
|
||||
|
||||
if (!machine_is_ams_delta())
|
||||
return -ENODEV;
|
||||
|
||||
chip = gpiochip_find(LATCH1_LABEL, gpiochip_match_by_label);
|
||||
if (!chip)
|
||||
pr_err("%s: latch1 GPIO chip not found\n", __func__);
|
||||
else
|
||||
ams_delta_led_init(chip);
|
||||
|
||||
err = gpio_request_array(latch_gpios, ARRAY_SIZE(latch_gpios));
|
||||
if (err) {
|
||||
if (err)
|
||||
pr_err("Couldn't take over latch1/latch2 GPIO pins\n");
|
||||
return err;
|
||||
}
|
||||
|
||||
platform_add_devices(late_devices, ARRAY_SIZE(late_devices));
|
||||
return err;
|
||||
}
|
||||
device_initcall_sync(ams_delta_gpio_init);
|
||||
|
||||
/*
|
||||
* As soon as devices have been registered, assign their dev_names
|
||||
* to respective GPIO lookup tables before they are added.
|
||||
*/
|
||||
ams_delta_lcd_gpio_table.dev_id = dev_name(&ams_delta_lcd_device.dev);
|
||||
ams_delta_nand_gpio_table.dev_id = dev_name(&ams_delta_nand_device.dev);
|
||||
|
||||
gpiod_add_lookup_tables(late_gpio_tables, ARRAY_SIZE(late_gpio_tables));
|
||||
static int __init modem_nreset_init(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = platform_device_register(&modem_nreset_device);
|
||||
if (err) {
|
||||
if (err)
|
||||
pr_err("Couldn't register the modem regulator device\n");
|
||||
return err;
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
||||
static int __init ams_delta_modem_init(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
omap_cfg_reg(M14_1510_GPIO2);
|
||||
ams_delta_modem_ports[0].irq =
|
||||
|
|
@ -692,7 +867,22 @@ static int __init late_init(void)
|
|||
|
||||
err = platform_device_register(&ams_delta_modem_device);
|
||||
if (err)
|
||||
goto gpio_free;
|
||||
gpio_free(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __init late_init(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
err = modem_nreset_init();
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ams_delta_modem_init();
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
/*
|
||||
* Once the modem device is registered, the modem_nreset
|
||||
|
|
@ -708,7 +898,6 @@ static int __init late_init(void)
|
|||
|
||||
unregister:
|
||||
platform_device_unregister(&ams_delta_modem_device);
|
||||
gpio_free:
|
||||
gpio_free(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
|
||||
return err;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ static struct platform_device h2_kp_device = {
|
|||
.resource = h2_kp_resources,
|
||||
};
|
||||
|
||||
static struct gpio_led h2_gpio_led_pins[] = {
|
||||
static const struct gpio_led h2_gpio_led_pins[] = {
|
||||
{
|
||||
.name = "h2:red",
|
||||
.default_trigger = "heartbeat",
|
||||
|
|
|
|||
|
|
@ -326,7 +326,7 @@ static struct spi_board_info h3_spi_board_info[] __initdata = {
|
|||
},
|
||||
};
|
||||
|
||||
static struct gpio_led h3_gpio_led_pins[] = {
|
||||
static const struct gpio_led h3_gpio_led_pins[] = {
|
||||
{
|
||||
.name = "h3:red",
|
||||
.default_trigger = "heartbeat",
|
||||
|
|
|
|||
|
|
@ -292,7 +292,7 @@ static struct platform_device herald_gpiokeys_device = {
|
|||
};
|
||||
|
||||
/* LEDs for the Herald. These connect to the HTCPLD GPIO device. */
|
||||
static struct gpio_led gpio_leds[] = {
|
||||
static const struct gpio_led gpio_leds[] = {
|
||||
{"dpad", NULL, HTCPLD_GPIO_LED_DPAD, 0, 0, LEDS_GPIO_DEFSTATE_OFF},
|
||||
{"kbd", NULL, HTCPLD_GPIO_LED_KBD, 0, 0, LEDS_GPIO_DEFSTATE_OFF},
|
||||
{"vibrate", NULL, HTCPLD_GPIO_LED_VIBRATE, 0, 0, LEDS_GPIO_DEFSTATE_OFF},
|
||||
|
|
|
|||
|
|
@ -167,7 +167,7 @@ static struct platform_device *osk5912_devices[] __initdata = {
|
|||
&osk5912_cf_device,
|
||||
};
|
||||
|
||||
static struct gpio_led tps_leds[] = {
|
||||
static const struct gpio_led tps_leds[] = {
|
||||
/* NOTE: D9 and D2 have hardware blink support.
|
||||
* Also, D9 requires non-battery power.
|
||||
*/
|
||||
|
|
@ -385,7 +385,7 @@ static struct platform_device osk5912_lcd_device = {
|
|||
.id = -1,
|
||||
};
|
||||
|
||||
static struct gpio_led mistral_gpio_led_pins[] = {
|
||||
static const struct gpio_led mistral_gpio_led_pins[] = {
|
||||
{
|
||||
.name = "mistral:red",
|
||||
.default_trigger = "heartbeat",
|
||||
|
|
|
|||
|
|
@ -20,32 +20,33 @@
|
|||
* However, when used with the E3 mailboard that producecs non-standard
|
||||
* scancodes, a custom key table must be prepared and loaded from userspace.
|
||||
*/
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/platform_data/ams-delta-fiq.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/serio.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/module.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <mach/board-ams-delta.h>
|
||||
|
||||
#include <mach/ams-delta-fiq.h>
|
||||
#define DRIVER_NAME "ams-delta-serio"
|
||||
|
||||
MODULE_AUTHOR("Matt Callow");
|
||||
MODULE_DESCRIPTION("AMS Delta (E3) keyboard port driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
static struct serio *ams_delta_serio;
|
||||
struct ams_delta_serio {
|
||||
struct serio *serio;
|
||||
struct regulator *vcc;
|
||||
unsigned int *fiq_buffer;
|
||||
};
|
||||
|
||||
static int check_data(int data)
|
||||
static int check_data(struct serio *serio, int data)
|
||||
{
|
||||
int i, parity = 0;
|
||||
|
||||
/* check valid stop bit */
|
||||
if (!(data & 0x400)) {
|
||||
dev_warn(&ams_delta_serio->dev,
|
||||
"invalid stop bit, data=0x%X\n",
|
||||
data);
|
||||
dev_warn(&serio->dev, "invalid stop bit, data=0x%X\n", data);
|
||||
return SERIO_FRAME;
|
||||
}
|
||||
/* calculate the parity */
|
||||
|
|
@ -55,9 +56,9 @@ static int check_data(int data)
|
|||
}
|
||||
/* it should be odd */
|
||||
if (!(parity & 0x01)) {
|
||||
dev_warn(&ams_delta_serio->dev,
|
||||
"parity check failed, data=0x%X parity=0x%X\n",
|
||||
data, parity);
|
||||
dev_warn(&serio->dev,
|
||||
"parity check failed, data=0x%X parity=0x%X\n", data,
|
||||
parity);
|
||||
return SERIO_PARITY;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -65,127 +66,130 @@ static int check_data(int data)
|
|||
|
||||
static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id)
|
||||
{
|
||||
int *circ_buff = &fiq_buffer[FIQ_CIRC_BUFF];
|
||||
struct ams_delta_serio *priv = dev_id;
|
||||
int *circ_buff = &priv->fiq_buffer[FIQ_CIRC_BUFF];
|
||||
int data, dfl;
|
||||
u8 scancode;
|
||||
|
||||
fiq_buffer[FIQ_IRQ_PEND] = 0;
|
||||
priv->fiq_buffer[FIQ_IRQ_PEND] = 0;
|
||||
|
||||
/*
|
||||
* Read data from the circular buffer, check it
|
||||
* 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]++];
|
||||
fiq_buffer[FIQ_KEYS_CNT]--;
|
||||
if (fiq_buffer[FIQ_HEAD_OFFSET] == fiq_buffer[FIQ_BUF_LEN])
|
||||
fiq_buffer[FIQ_HEAD_OFFSET] = 0;
|
||||
data = circ_buff[priv->fiq_buffer[FIQ_HEAD_OFFSET]++];
|
||||
priv->fiq_buffer[FIQ_KEYS_CNT]--;
|
||||
if (priv->fiq_buffer[FIQ_HEAD_OFFSET] ==
|
||||
priv->fiq_buffer[FIQ_BUF_LEN])
|
||||
priv->fiq_buffer[FIQ_HEAD_OFFSET] = 0;
|
||||
|
||||
dfl = check_data(data);
|
||||
dfl = check_data(priv->serio, data);
|
||||
scancode = (u8) (data >> 1) & 0xFF;
|
||||
serio_interrupt(ams_delta_serio, scancode, dfl);
|
||||
serio_interrupt(priv->serio, scancode, dfl);
|
||||
}
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int ams_delta_serio_open(struct serio *serio)
|
||||
{
|
||||
/* enable keyboard */
|
||||
gpio_set_value(AMS_DELTA_GPIO_PIN_KEYBRD_PWR, 1);
|
||||
struct ams_delta_serio *priv = serio->port_data;
|
||||
|
||||
return 0;
|
||||
/* enable keyboard */
|
||||
return regulator_enable(priv->vcc);
|
||||
}
|
||||
|
||||
static void ams_delta_serio_close(struct serio *serio)
|
||||
{
|
||||
struct ams_delta_serio *priv = serio->port_data;
|
||||
|
||||
/* disable keyboard */
|
||||
gpio_set_value(AMS_DELTA_GPIO_PIN_KEYBRD_PWR, 0);
|
||||
regulator_disable(priv->vcc);
|
||||
}
|
||||
|
||||
static const struct gpio ams_delta_gpios[] __initconst_or_module = {
|
||||
{
|
||||
.gpio = AMS_DELTA_GPIO_PIN_KEYBRD_DATA,
|
||||
.flags = GPIOF_DIR_IN,
|
||||
.label = "serio-data",
|
||||
},
|
||||
{
|
||||
.gpio = AMS_DELTA_GPIO_PIN_KEYBRD_CLK,
|
||||
.flags = GPIOF_DIR_IN,
|
||||
.label = "serio-clock",
|
||||
},
|
||||
{
|
||||
.gpio = AMS_DELTA_GPIO_PIN_KEYBRD_PWR,
|
||||
.flags = GPIOF_OUT_INIT_LOW,
|
||||
.label = "serio-power",
|
||||
},
|
||||
{
|
||||
.gpio = AMS_DELTA_GPIO_PIN_KEYBRD_DATAOUT,
|
||||
.flags = GPIOF_OUT_INIT_LOW,
|
||||
.label = "serio-dataout",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init ams_delta_serio_init(void)
|
||||
static int ams_delta_serio_init(struct platform_device *pdev)
|
||||
{
|
||||
int err;
|
||||
struct ams_delta_serio *priv;
|
||||
struct serio *serio;
|
||||
int irq, err;
|
||||
|
||||
if (!machine_is_ams_delta())
|
||||
return -ENODEV;
|
||||
|
||||
ams_delta_serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
|
||||
if (!ams_delta_serio)
|
||||
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
|
||||
if (!priv)
|
||||
return -ENOMEM;
|
||||
|
||||
ams_delta_serio->id.type = SERIO_8042;
|
||||
ams_delta_serio->open = ams_delta_serio_open;
|
||||
ams_delta_serio->close = ams_delta_serio_close;
|
||||
strlcpy(ams_delta_serio->name, "AMS DELTA keyboard adapter",
|
||||
sizeof(ams_delta_serio->name));
|
||||
strlcpy(ams_delta_serio->phys, "GPIO/serio0",
|
||||
sizeof(ams_delta_serio->phys));
|
||||
priv->fiq_buffer = pdev->dev.platform_data;
|
||||
if (!priv->fiq_buffer)
|
||||
return -EINVAL;
|
||||
|
||||
err = gpio_request_array(ams_delta_gpios,
|
||||
ARRAY_SIZE(ams_delta_gpios));
|
||||
if (err) {
|
||||
pr_err("ams_delta_serio: Couldn't request gpio pins\n");
|
||||
goto serio;
|
||||
priv->vcc = devm_regulator_get(&pdev->dev, "vcc");
|
||||
if (IS_ERR(priv->vcc)) {
|
||||
err = PTR_ERR(priv->vcc);
|
||||
dev_err(&pdev->dev, "regulator request failed (%d)\n", err);
|
||||
/*
|
||||
* When running on a non-dt platform and requested regulator
|
||||
* is not available, devm_regulator_get() never returns
|
||||
* -EPROBE_DEFER as it is not able to justify if the regulator
|
||||
* may still appear later. On the other hand, the board can
|
||||
* still set full constriants flag at late_initcall in order
|
||||
* to instruct devm_regulator_get() to returnn a dummy one
|
||||
* if sufficient. Hence, if we get -ENODEV here, let's convert
|
||||
* it to -EPROBE_DEFER and wait for the board to decide or
|
||||
* let Deferred Probe infrastructure handle this error.
|
||||
*/
|
||||
if (err == -ENODEV)
|
||||
err = -EPROBE_DEFER;
|
||||
return err;
|
||||
}
|
||||
|
||||
err = request_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK),
|
||||
ams_delta_serio_interrupt, IRQ_TYPE_EDGE_RISING,
|
||||
"ams-delta-serio", 0);
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
if (irq < 0)
|
||||
return -ENXIO;
|
||||
|
||||
err = devm_request_irq(&pdev->dev, irq, ams_delta_serio_interrupt,
|
||||
IRQ_TYPE_EDGE_RISING, DRIVER_NAME, priv);
|
||||
if (err < 0) {
|
||||
pr_err("ams_delta_serio: couldn't request gpio interrupt %d\n",
|
||||
gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK));
|
||||
goto gpio;
|
||||
dev_err(&pdev->dev, "IRQ request failed (%d)\n", err);
|
||||
return err;
|
||||
}
|
||||
/*
|
||||
* Since GPIO register handling for keyboard clock pin is performed
|
||||
* at FIQ level, switch back from edge to simple interrupt handler
|
||||
* to avoid bad interaction.
|
||||
*/
|
||||
irq_set_handler(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK),
|
||||
handle_simple_irq);
|
||||
|
||||
serio_register_port(ams_delta_serio);
|
||||
dev_info(&ams_delta_serio->dev, "%s\n", ams_delta_serio->name);
|
||||
serio = kzalloc(sizeof(*serio), GFP_KERNEL);
|
||||
if (!serio)
|
||||
return -ENOMEM;
|
||||
|
||||
priv->serio = serio;
|
||||
|
||||
serio->id.type = SERIO_8042;
|
||||
serio->open = ams_delta_serio_open;
|
||||
serio->close = ams_delta_serio_close;
|
||||
strlcpy(serio->name, "AMS DELTA keyboard adapter", sizeof(serio->name));
|
||||
strlcpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys));
|
||||
serio->dev.parent = &pdev->dev;
|
||||
serio->port_data = priv;
|
||||
|
||||
serio_register_port(serio);
|
||||
|
||||
platform_set_drvdata(pdev, priv);
|
||||
|
||||
dev_info(&serio->dev, "%s\n", serio->name);
|
||||
|
||||
return 0;
|
||||
gpio:
|
||||
gpio_free_array(ams_delta_gpios,
|
||||
ARRAY_SIZE(ams_delta_gpios));
|
||||
serio:
|
||||
kfree(ams_delta_serio);
|
||||
return err;
|
||||
}
|
||||
module_init(ams_delta_serio_init);
|
||||
|
||||
static void __exit ams_delta_serio_exit(void)
|
||||
static int ams_delta_serio_exit(struct platform_device *pdev)
|
||||
{
|
||||
serio_unregister_port(ams_delta_serio);
|
||||
free_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0);
|
||||
gpio_free_array(ams_delta_gpios,
|
||||
ARRAY_SIZE(ams_delta_gpios));
|
||||
struct ams_delta_serio *priv = platform_get_drvdata(pdev);
|
||||
|
||||
serio_unregister_port(priv->serio);
|
||||
|
||||
return 0;
|
||||
}
|
||||
module_exit(ams_delta_serio_exit);
|
||||
|
||||
static struct platform_driver ams_delta_serio_driver = {
|
||||
.probe = ams_delta_serio_init,
|
||||
.remove = ams_delta_serio_exit,
|
||||
.driver = {
|
||||
.name = DRIVER_NAME
|
||||
},
|
||||
};
|
||||
module_platform_driver(ams_delta_serio_driver);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
|
||||
/*
|
||||
* arch/arm/mach-omap1/include/ams-delta-fiq.h
|
||||
* include/linux/platform_data/ams-delta-fiq.h
|
||||
*
|
||||
* Taken from the original Amstrad modifications to fiq.h
|
||||
*
|
||||
|
|
@ -11,24 +13,8 @@
|
|||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*/
|
||||
#ifndef __AMS_DELTA_FIQ_H
|
||||
#define __AMS_DELTA_FIQ_H
|
||||
|
||||
#include <mach/irqs.h>
|
||||
|
||||
/*
|
||||
* Interrupt number used for passing control from FIQ to IRQ.
|
||||
* IRQ12, described as reserved, has been selected.
|
||||
*/
|
||||
#define INT_DEFERRED_FIQ INT_1510_RES12
|
||||
/*
|
||||
* Base address of an interrupt handler that the INT_DEFERRED_FIQ belongs to.
|
||||
*/
|
||||
#if (INT_DEFERRED_FIQ < IH2_BASE)
|
||||
#define DEFERRED_FIQ_IH_BASE OMAP_IH1_BASE
|
||||
#else
|
||||
#define DEFERRED_FIQ_IH_BASE OMAP_IH2_BASE
|
||||
#endif
|
||||
#ifndef __LINUX_PLATFORM_DATA_AMS_DELTA_FIQ_H
|
||||
#define __LINUX_PLATFORM_DATA_AMS_DELTA_FIQ_H
|
||||
|
||||
/*
|
||||
* These are the offsets from the beginning of the fiq_buffer. They are put here
|
||||
|
|
@ -69,11 +55,4 @@
|
|||
|
||||
#define FIQ_CIRC_BUFF 30 /*Start of circular buffer */
|
||||
|
||||
#ifndef __ASSEMBLER__
|
||||
extern unsigned int fiq_buffer[];
|
||||
extern unsigned char qwerty_fiqin_start, qwerty_fiqin_end;
|
||||
|
||||
extern void __init ams_delta_init_fiq(void);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue