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>
This commit is contained in:
Olof Johansson
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user