diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-06-20 14:50:04 +0200 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-06-20 14:50:38 +0200 |
commit | 602bafecdbbbcb171dccae5ce07178e2c5a920d0 (patch) | |
tree | 3c4b40212dd90e6680be82ca323bb20c844bc16f /target/linux/brcm2708/patches-4.4/0079-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch | |
parent | d7863315dd05777620fd133bb6880674fd3a00bd (diff) | |
download | master-187ad058-602bafecdbbbcb171dccae5ce07178e2c5a920d0.tar.gz master-187ad058-602bafecdbbbcb171dccae5ce07178e2c5a920d0.tar.bz2 master-187ad058-602bafecdbbbcb171dccae5ce07178e2c5a920d0.zip |
brcm2708: update to latest version
As usual these patches were extracted from the raspberry pi repo:
https://github.com/raspberrypi/linux/commits/rpi-4.4.y
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0079-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.4/0079-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch | 290 |
1 files changed, 0 insertions, 290 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0079-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch b/target/linux/brcm2708/patches-4.4/0079-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch deleted file mode 100644 index 0b3f67848d..0000000000 --- a/target/linux/brcm2708/patches-4.4/0079-rpi-ft5406-Add-touchscreen-driver-for-pi-LCD-display.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 6fb12ee15eb9b0f5b6fea66c861a9db8ec6671ed Mon Sep 17 00:00:00 2001 -From: Gordon Hollingworth <gordon@raspberrypi.org> -Date: Tue, 12 May 2015 14:47:56 +0100 -Subject: [PATCH 079/170] rpi-ft5406: Add touchscreen driver for pi LCD display - -Fix driver detection failure Check that the buffer response is non-zero meaning the touchscreen was detected - -rpi-ft5406: Use firmware API ---- - drivers/input/touchscreen/Kconfig | 7 + - drivers/input/touchscreen/Makefile | 1 + - drivers/input/touchscreen/rpi-ft5406.c | 246 +++++++++++++++++++++++++++++++++ - 3 files changed, 254 insertions(+) - create mode 100644 drivers/input/touchscreen/rpi-ft5406.c - ---- a/drivers/input/touchscreen/Kconfig -+++ b/drivers/input/touchscreen/Kconfig -@@ -608,6 +608,13 @@ config TOUCHSCREEN_EDT_FT5X06 - To compile this driver as a module, choose M here: the - module will be called edt-ft5x06. - -+config TOUCHSCREEN_RPI_FT5406 -+ tristate "Raspberry Pi FT5406 driver" -+ depends on RASPBERRYPI_FIRMWARE -+ help -+ Say Y here to enable the Raspberry Pi memory based FT5406 device -+ -+ - config TOUCHSCREEN_MIGOR - tristate "Renesas MIGO-R touchscreen" - depends on SH_MIGOR && I2C ---- a/drivers/input/touchscreen/Makefile -+++ b/drivers/input/touchscreen/Makefile -@@ -29,6 +29,7 @@ obj-$(CONFIG_TOUCHSCREEN_DA9034) += da90 - obj-$(CONFIG_TOUCHSCREEN_DA9052) += da9052_tsi.o - obj-$(CONFIG_TOUCHSCREEN_DYNAPRO) += dynapro.o - obj-$(CONFIG_TOUCHSCREEN_EDT_FT5X06) += edt-ft5x06.o -+obj-$(CONFIG_TOUCHSCREEN_RPI_FT5406) += rpi-ft5406.o - obj-$(CONFIG_TOUCHSCREEN_HAMPSHIRE) += hampshire.o - obj-$(CONFIG_TOUCHSCREEN_GUNZE) += gunze.o - obj-$(CONFIG_TOUCHSCREEN_EETI) += eeti_ts.o ---- /dev/null -+++ b/drivers/input/touchscreen/rpi-ft5406.c -@@ -0,0 +1,246 @@ -+/* -+ * Driver for memory based ft5406 touchscreen -+ * -+ * Copyright (C) 2015 Raspberry Pi -+ * -+ * -+ * 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. -+ */ -+ -+ -+#include <linux/module.h> -+#include <linux/interrupt.h> -+#include <linux/input.h> -+#include <linux/irq.h> -+#include <linux/delay.h> -+#include <linux/slab.h> -+#include <linux/bitops.h> -+#include <linux/input/mt.h> -+#include <linux/kthread.h> -+#include <linux/platform_device.h> -+#include <asm/io.h> -+#include <soc/bcm2835/raspberrypi-firmware.h> -+ -+#define MAXIMUM_SUPPORTED_POINTS 10 -+struct ft5406_regs { -+ uint8_t device_mode; -+ uint8_t gesture_id; -+ uint8_t num_points; -+ struct ft5406_touch { -+ uint8_t xh; -+ uint8_t xl; -+ uint8_t yh; -+ uint8_t yl; -+ uint8_t res1; -+ uint8_t res2; -+ } point[MAXIMUM_SUPPORTED_POINTS]; -+}; -+ -+#define SCREEN_WIDTH 800 -+#define SCREEN_HEIGHT 480 -+ -+struct ft5406 { -+ struct platform_device * pdev; -+ struct input_dev * input_dev; -+ void __iomem * ts_base; -+ struct ft5406_regs * regs; -+ struct task_struct * thread; -+}; -+ -+/* Thread to poll for touchscreen events -+ * -+ * This thread polls the memory based register copy of the ft5406 registers -+ * using the number of points register to know whether the copy has been -+ * updated (we write 99 to the memory copy, the GPU will write between -+ * 0 - 10 points) -+ */ -+static int ft5406_thread(void *arg) -+{ -+ struct ft5406 *ts = (struct ft5406 *) arg; -+ struct ft5406_regs regs; -+ int known_ids = 0; -+ -+ while(!kthread_should_stop()) -+ { -+ // 60fps polling -+ msleep_interruptible(17); -+ memcpy_fromio(®s, ts->regs, sizeof(*ts->regs)); -+ writel(99, &ts->regs->num_points); -+ // Do not output if theres no new information (num_points is 99) -+ // or we have no touch points and don't need to release any -+ if(!(regs.num_points == 99 || (regs.num_points == 0 && known_ids == 0))) -+ { -+ int i; -+ int modified_ids = 0, released_ids; -+ for(i = 0; i < regs.num_points; i++) -+ { -+ int x = (((int) regs.point[i].xh & 0xf) << 8) + regs.point[i].xl; -+ int y = (((int) regs.point[i].yh & 0xf) << 8) + regs.point[i].yl; -+ int touchid = (regs.point[i].yh >> 4) & 0xf; -+ -+ modified_ids |= 1 << touchid; -+ -+ if(!((1 << touchid) & known_ids)) -+ dev_dbg(&ts->pdev->dev, "x = %d, y = %d, touchid = %d\n", x, y, touchid); -+ -+ input_mt_slot(ts->input_dev, touchid); -+ input_mt_report_slot_state(ts->input_dev, MT_TOOL_FINGER, 1); -+ -+ input_report_abs(ts->input_dev, ABS_MT_POSITION_X, x); -+ input_report_abs(ts->input_dev, ABS_MT_POSITION_Y, y); -+ -+ } -+ -+ released_ids = known_ids & ~modified_ids; -+ for(i = 0; released_ids && i < MAXIMUM_SUPPORTED_POINTS; i++) -+ { -+ if(released_ids & (1<<i)) -+ { -+ dev_dbg(&ts->pdev->dev, "Released %d, known = %x modified = %x\n", i, known_ids, modified_ids); -+ input_mt_slot(ts->input_dev, i); -+ input_mt_report_slot_state(ts->input_dev, MT_TOOL_FINGER, 0); -+ modified_ids &= ~(1 << i); -+ } -+ } -+ known_ids = modified_ids; -+ -+ input_mt_report_pointer_emulation(ts->input_dev, true); -+ input_sync(ts->input_dev); -+ } -+ -+ } -+ -+ return 0; -+} -+ -+static int ft5406_probe(struct platform_device *pdev) -+{ -+ int ret; -+ struct input_dev * input_dev = input_allocate_device(); -+ struct ft5406 * ts; -+ struct device_node *fw_node; -+ struct rpi_firmware *fw; -+ u32 touchbuf; -+ -+ dev_info(&pdev->dev, "Probing device\n"); -+ -+ fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0); -+ if (!fw_node) { -+ dev_err(&pdev->dev, "Missing firmware node\n"); -+ return -ENOENT; -+ } -+ -+ fw = rpi_firmware_get(fw_node); -+ if (!fw) -+ return -EPROBE_DEFER; -+ -+ ret = rpi_firmware_property(fw, RPI_FIRMWARE_FRAMEBUFFER_GET_TOUCHBUF, -+ &touchbuf, sizeof(touchbuf)); -+ if (ret) { -+ dev_err(&pdev->dev, "Failed to get touch buffer\n"); -+ return ret; -+ } -+ -+ if (!touchbuf) { -+ dev_err(&pdev->dev, "Touchscreen not detected\n"); -+ return -ENODEV; -+ } -+ -+ dev_dbg(&pdev->dev, "Got TS buffer 0x%x\n", touchbuf); -+ -+ ts = kzalloc(sizeof(struct ft5406), GFP_KERNEL); -+ -+ if (!ts || !input_dev) { -+ ret = -ENOMEM; -+ dev_err(&pdev->dev, "Failed to allocate memory\n"); -+ return ret; -+ } -+ ts->input_dev = input_dev; -+ platform_set_drvdata(pdev, ts); -+ ts->pdev = pdev; -+ -+ input_dev->name = "FT5406 memory based driver"; -+ -+ __set_bit(EV_KEY, input_dev->evbit); -+ __set_bit(EV_SYN, input_dev->evbit); -+ __set_bit(EV_ABS, input_dev->evbit); -+ -+ input_set_abs_params(input_dev, ABS_MT_POSITION_X, 0, -+ SCREEN_WIDTH, 0, 0); -+ input_set_abs_params(input_dev, ABS_MT_POSITION_Y, 0, -+ SCREEN_HEIGHT, 0, 0); -+ -+ input_mt_init_slots(input_dev, MAXIMUM_SUPPORTED_POINTS, INPUT_MT_DIRECT); -+ -+ input_set_drvdata(input_dev, ts); -+ -+ ret = input_register_device(input_dev); -+ if (ret) { -+ dev_err(&pdev->dev, "could not register input device, %d\n", -+ ret); -+ return ret; -+ } -+ -+ // mmap the physical memory -+ touchbuf &= ~0xc0000000; -+ ts->ts_base = ioremap(touchbuf, sizeof(*ts->regs)); -+ if(ts->ts_base == NULL) -+ { -+ dev_err(&pdev->dev, "Failed to map physical address\n"); -+ input_unregister_device(input_dev); -+ kzfree(ts); -+ return -ENOMEM; -+ } -+ -+ ts->regs = (struct ft5406_regs *) ts->ts_base; -+ -+ // create thread to poll the touch events -+ ts->thread = kthread_run(ft5406_thread, ts, "ft5406"); -+ if(ts->thread == NULL) -+ { -+ dev_err(&pdev->dev, "Failed to create kernel thread"); -+ iounmap(ts->ts_base); -+ input_unregister_device(input_dev); -+ kzfree(ts); -+ } -+ -+ return 0; -+} -+ -+static int ft5406_remove(struct platform_device *pdev) -+{ -+ struct ft5406 *ts = (struct ft5406 *) platform_get_drvdata(pdev); -+ -+ dev_info(&pdev->dev, "Removing rpi-ft5406\n"); -+ -+ kthread_stop(ts->thread); -+ iounmap(ts->ts_base); -+ input_unregister_device(ts->input_dev); -+ kzfree(ts); -+ -+ return 0; -+} -+ -+static const struct of_device_id ft5406_match[] = { -+ { .compatible = "rpi,rpi-ft5406", }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, ft5406_match); -+ -+static struct platform_driver ft5406_driver = { -+ .driver = { -+ .name = "rpi-ft5406", -+ .owner = THIS_MODULE, -+ .of_match_table = ft5406_match, -+ }, -+ .probe = ft5406_probe, -+ .remove = ft5406_remove, -+}; -+ -+module_platform_driver(ft5406_driver); -+ -+MODULE_AUTHOR("Gordon Hollingworth"); -+MODULE_DESCRIPTION("Touchscreen driver for memory based FT5406"); -+MODULE_LICENSE("GPL"); |