openwrtv4/target/linux/brcm2708/patches-4.1/0139-rpi-ft5406-Use-firmware-API.patch
John Crispin 22b3e521b5 brcm2708: update 4.1 patches
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

SVN-Revision: 46640
2015-08-17 06:04:32 +00:00

138 lines
4 KiB
Diff

From 193a0cacacc91b8c5c3224d0090f342ccd64f45c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
Date: Tue, 21 Jul 2015 19:09:39 +0200
Subject: [PATCH 139/148] rpi-ft5406: Use firmware API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
---
arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts | 1 +
drivers/input/touchscreen/rpi-ft5406.c | 74 ++++++++++-------------
2 files changed, 32 insertions(+), 43 deletions(-)
--- a/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
+++ b/arch/arm/boot/dts/overlays/rpi-ft5406-overlay.dts
@@ -9,6 +9,7 @@
__overlay__ {
rpi_ft5406: rpi_ft5406 {
compatible = "rpi,rpi-ft5406";
+ firmware = <&firmware>;
status = "okay";
};
};
--- a/drivers/input/touchscreen/rpi-ft5406.c
+++ b/drivers/input/touchscreen/rpi-ft5406.c
@@ -21,7 +21,7 @@
#include <linux/kthread.h>
#include <linux/platform_device.h>
#include <asm/io.h>
-#include <linux/platform_data/mailbox-bcm2708.h>
+#include <soc/bcm2835/raspberrypi-firmware.h>
#define MAXIMUM_SUPPORTED_POINTS 10
struct ft5406_regs {
@@ -49,23 +49,6 @@ struct ft5406 {
struct task_struct * thread;
};
-
-/* tag part of the message */
-struct vc_msg_tag {
- uint32_t tag_id; /* the message id */
- uint32_t buffer_size; /* size of the buffer (which in this case is always 8 bytes) */
- uint32_t data_size; /* amount of data being sent or received */
- uint32_t val; /* data buffer */
-};
-
-/* message structure to be sent to videocore */
-struct vc_msg {
- uint32_t msg_size; /* simply, sizeof(struct vc_msg) */
- uint32_t request_code; /* holds various information like the success and number of bytes returned (refer to mailboxes wiki) */
- struct vc_msg_tag tag; /* the tag structure above to make */
- uint32_t end_tag; /* an end identifier, should be set to NULL */
-};
-
/* Thread to poll for touchscreen events
*
* This thread polls the memory based register copy of the ft5406 registers
@@ -136,11 +119,37 @@ static int ft5406_probe(struct platform_
{
int ret;
struct input_dev * input_dev = input_allocate_device();
- struct vc_msg request;
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) {
@@ -174,36 +183,15 @@ static int ft5406_probe(struct platform_
return ret;
}
- memset(&request, 0, sizeof request);
-
- request.msg_size = sizeof request;
- request.request_code = VCMSG_PROCESS_REQUEST;
- request.tag.tag_id = VCMSG_GET_TOUCHBUF;
- request.tag.buffer_size = 4;
- request.tag.data_size = 4;
-
- bcm_mailbox_property(&request, sizeof(request));
-
- if(request.request_code == VCMSG_REQUEST_SUCCESSFUL && request.tag.val != 0)
- {
- dev_dbg(&pdev->dev, "Got TS buffer 0x%x\n", request.tag.val);
- }
- else
- {
- input_unregister_device(input_dev);
- kzfree(ts);
- return -1;
- }
-
// mmap the physical memory
- request.tag.val &= ~0xc0000000;
- ts->ts_base = ioremap(request.tag.val, sizeof(*ts->regs));
+ 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 -1;
+ return -ENOMEM;
}
ts->regs = (struct ft5406_regs *) ts->ts_base;