Author: gonzo
Date: Sat Oct 22 02:37:59 2016
New Revision: 307767
URL: https://svnweb.freebsd.org/changeset/base/307767

Log:
  MFC r306430
  
  Add touchscreen support for the official 7" RPi touch display
  
  Technically touchscreen chip is FT5406 but all hardware
  communication is performed by VideCore and only final results
  are presented to ARM part through memory region shared between
  VC and ARM.
  
  evdev is used as userland interface. FT5406 supports up to
  10 touchpoints, but for now driver emulates single touch device
  because I do not have GUI bits to test this functionality.
  
  Driver is not enabled in default config for RPI and RPI2
  
  Tested with: evdev-dump, tslib

Added:
  stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c
     - copied unchanged from r306430, 
head/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c
Modified:
  stable/11/sys/arm/broadcom/bcm2835/files.bcm283x
  stable/11/sys/boot/fdt/dts/arm/rpi.dts
  stable/11/sys/boot/fdt/dts/arm/rpi2.dts
Directory Properties:
  stable/11/   (props changed)

Copied: stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c (from r306430, 
head/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c)
==============================================================================
--- /dev/null   00:00:00 1970   (empty, because file is newly added)
+++ stable/11/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c Sat Oct 22 02:37:59 
2016        (r307767, copy of r306430, 
head/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c)
@@ -0,0 +1,337 @@
+/*-
+ * Copyright (C) 2016 Oleksandr Tymoshenko <go...@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/cpu.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+#include <sys/sysctl.h>
+#include <sys/selinfo.h>
+#include <sys/poll.h>
+#include <sys/uio.h>
+#include <sys/conf.h>
+#include <sys/kthread.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/evdev/input.h>
+#include <dev/evdev/evdev.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/intr.h>
+
+#include <arm/broadcom/bcm2835/bcm2835_mbox.h>
+#include <arm/broadcom/bcm2835/bcm2835_mbox_prop.h>
+#include <arm/broadcom/bcm2835/bcm2835_vcbus.h>
+
+#include "mbox_if.h"
+
+#ifdef DEBUG
+#define DPRINTF(fmt, ...) do {                 \
+       printf("%s:%u: ", __func__, __LINE__);  \
+       printf(fmt, ##__VA_ARGS__);             \
+} while (0)
+#else
+#define DPRINTF(fmt, ...)
+#endif
+
+#define        FT5406_LOCK(_sc)                \
+       mtx_lock(&(_sc)->sc_mtx)
+#define        FT5406_UNLOCK(_sc)              \
+       mtx_unlock(&(_sc)->sc_mtx)
+#define        FT5406_LOCK_INIT(_sc)   \
+       mtx_init(&_sc->sc_mtx, device_get_nameunit(_sc->sc_dev), \
+           "ft5406", MTX_DEF)
+#define        FT5406_LOCK_DESTROY(_sc)        \
+       mtx_destroy(&_sc->sc_mtx);
+#define        FT5406_LOCK_ASSERT(_sc) \
+       mtx_assert(&(_sc)->sc_mtx, MA_OWNED)
+
+#define        FT5406_DEVICE_MODE      0
+#define        FT5406_GESTURE_ID       1
+#define        FT5406_NUM_POINTS       2
+#define        FT5406_POINT_XH(n)      (0 + 3 + (n)*6)
+#define        FT5406_POINT_XL(n)      (1 + 3 + (n)*6)
+#define        FT5406_POINT_YH(n)      (2 + 3 + (n)*6)
+#define        FT5406_POINT_YL(n)      (3 + 3 + (n)*6)
+#define        FT5406_WINDOW_SIZE      64
+
+#define        GET_NUM_POINTS(buf)     (buf[FT5406_NUM_POINTS])
+#define        GET_X(buf, n)           (((buf[FT5406_POINT_XH(n)] & 0xf) << 8) 
| \
+                                   (buf[FT5406_POINT_XL(n)]))
+#define        GET_Y(buf, n)           (((buf[FT5406_POINT_YH(n)] & 0xf) << 8) 
| \
+                                   (buf[FT5406_POINT_YL(n)]))
+#define        GET_TOUCH_ID(buf, n)    ((buf[FT5406_POINT_YH(n)] >> 4) & 0xf)
+
+#define        NO_POINTS       99
+#define        SCREEN_WIDTH    800
+#define        SCREEN_HEIGHT   480
+
+struct ft5406ts_softc {
+       device_t                sc_dev;
+       struct mtx              sc_mtx;
+       struct proc             *sc_worker;
+
+       /* mbox buffer (mapped to KVA) */
+       uint8_t                 *touch_buf;
+
+       /* initial hook for waiting mbox intr */
+       struct intr_config_hook sc_init_hook;
+
+       struct evdev_dev        *sc_evdev;
+       int                     sc_detaching;
+};
+
+static void
+ft5406ts_worker(void *data)
+{
+       struct ft5406ts_softc *sc = (struct ft5406ts_softc *)data;
+       int points;
+       int id, new_x, new_y, i, new_pen_down, updated;
+       int x, y, pen_down;
+       uint8_t window[FT5406_WINDOW_SIZE];
+       int tick;
+
+       /* 60Hz */
+       tick = hz*17/1000;
+       if (tick == 0)
+               tick = 1;
+
+       x = y = -1;
+       pen_down = 0;
+
+       FT5406_LOCK(sc);
+       while(1) {
+               msleep(sc, &sc->sc_mtx, PCATCH | PZERO, "ft5406ts", tick);
+
+               if (sc->sc_detaching)
+                       break;
+
+               memcpy(window, sc->touch_buf, sizeof(window));
+               sc->touch_buf[FT5406_NUM_POINTS] = NO_POINTS;
+
+               points = GET_NUM_POINTS(window);
+               /*
+                * No update from VC - do nothing
+                */
+               if (points == NO_POINTS)
+                       continue;
+
+               /* No points and pen is already up */
+               if ((points == 0) && !pen_down)
+                       continue;
+
+               new_pen_down = 0;
+               for (i = 0; i < points; i++) {
+                       id = GET_TOUCH_ID(window, 0);
+                       /* For now consider only touch 0 */
+                       if (id != 0)
+                               continue;
+                       new_pen_down = 1;
+                       new_x = GET_X(window, 0);
+                       new_y = GET_Y(window, 0);
+               }
+
+               updated = 0;
+
+               if (new_x != x) {
+                       x = new_x;
+                       updated = 1;
+               }
+
+               if (new_y != y) {
+                       y = new_y;
+                       updated = 1;
+               }
+
+               if (new_pen_down != pen_down) {
+                       pen_down = new_pen_down;
+                       updated = 1;
+               }
+
+               if (updated) {
+                       evdev_push_event(sc->sc_evdev, EV_ABS, ABS_X, x);
+                       evdev_push_event(sc->sc_evdev, EV_ABS, ABS_Y, y);
+                       evdev_push_event(sc->sc_evdev, EV_KEY, BTN_TOUCH, 
pen_down);
+                       evdev_sync(sc->sc_evdev);
+               }
+       }
+       FT5406_UNLOCK(sc);
+
+       kproc_exit(0);
+}
+
+static void
+ft5406ts_init(void *arg)
+{
+       struct ft5406ts_softc *sc = arg;
+       struct bcm2835_mbox_tag_touchbuf msg;
+       uint32_t touchbuf;
+       int err;
+
+       /* release this hook (continue boot) */
+       config_intrhook_disestablish(&sc->sc_init_hook);
+
+       memset(&msg, 0, sizeof(msg));
+       msg.hdr.buf_size = sizeof(msg);
+       msg.hdr.code = BCM2835_MBOX_CODE_REQ;
+       msg.tag_hdr.tag = BCM2835_MBOX_TAG_GET_TOUCHBUF;
+       msg.tag_hdr.val_buf_size = sizeof(msg.body);
+       msg.tag_hdr.val_len = sizeof(msg.body);
+       msg.end_tag = 0;
+
+       /* call mailbox property */
+       err = bcm2835_mbox_property(&msg, sizeof(msg));
+       if (err) {
+               device_printf(sc->sc_dev, "failed to get touchbuf address\n");
+               return;
+       }
+
+       if (msg.body.resp.address == 0) {
+               device_printf(sc->sc_dev, "touchscreen not detected\n");
+               return;
+       }
+
+       touchbuf = VCBUS_TO_PHYS(msg.body.resp.address);
+       sc->touch_buf = (uint8_t*)pmap_mapdev(touchbuf, FT5406_WINDOW_SIZE);
+
+       sc->sc_evdev = evdev_alloc();
+       evdev_set_name(sc->sc_evdev, device_get_desc(sc->sc_dev));
+       evdev_set_phys(sc->sc_evdev, device_get_nameunit(sc->sc_dev));
+       evdev_set_id(sc->sc_evdev, BUS_VIRTUAL, 0, 0, 0);
+       evdev_support_prop(sc->sc_evdev, INPUT_PROP_DIRECT);
+       evdev_support_event(sc->sc_evdev, EV_SYN);
+       evdev_support_event(sc->sc_evdev, EV_ABS);
+       evdev_support_event(sc->sc_evdev, EV_KEY);
+
+       evdev_support_abs(sc->sc_evdev, ABS_X, 0, 0,
+           SCREEN_WIDTH, 0, 0, 0);
+       evdev_support_abs(sc->sc_evdev, ABS_Y, 0, 0,
+           SCREEN_HEIGHT, 0, 0, 0);
+
+       evdev_support_key(sc->sc_evdev, BTN_TOUCH);
+
+       err = evdev_register(sc->sc_evdev);
+       if (err) {
+               evdev_free(sc->sc_evdev);
+               return;
+       }
+
+       sc->touch_buf[FT5406_NUM_POINTS] = NO_POINTS;
+       if (kproc_create(ft5406ts_worker, (void*)sc, &sc->sc_worker, 0, 0,
+           "ft5406ts_worker") != 0) {
+               printf("failed to create ft5406ts_worker\n");
+       }
+}
+
+static int
+ft5406ts_probe(device_t dev)
+{
+
+       if (!ofw_bus_is_compatible(dev, "rpi,rpi-ft5406"))
+               return (ENXIO);
+
+       device_set_desc(dev, "FT5406 touchscreen (VC memory interface)");
+
+       return (BUS_PROBE_DEFAULT);
+}
+
+static int
+ft5406ts_attach(device_t dev)
+{
+       struct ft5406ts_softc *sc;
+
+       /* set self dev */
+       sc = device_get_softc(dev);
+       sc->sc_dev = dev;
+
+       /* register callback for using mbox when interrupts are enabled */
+       sc->sc_init_hook.ich_func = ft5406ts_init;
+       sc->sc_init_hook.ich_arg = sc;
+
+       if (config_intrhook_establish(&sc->sc_init_hook) != 0) {
+               device_printf(dev, "config_intrhook_establish failed\n");
+               return (ENOMEM);
+       }
+
+       FT5406_LOCK_INIT(sc);
+
+       return (0);
+}
+
+static int
+ft5406ts_detach(device_t dev)
+{
+       struct ft5406ts_softc *sc;
+
+       sc = device_get_softc(dev);
+
+       FT5406_LOCK(sc);
+       if (sc->sc_worker)
+               sc->sc_detaching = 1;
+
+       if (sc->sc_evdev)
+               evdev_free(sc->sc_evdev);
+       FT5406_UNLOCK(sc);
+
+       FT5406_LOCK_DESTROY(sc);
+
+       return (0);
+}
+
+static device_method_t ft5406ts_methods[] = {
+       /* Device interface */
+       DEVMETHOD(device_probe,         ft5406ts_probe),
+       DEVMETHOD(device_attach,        ft5406ts_attach),
+       DEVMETHOD(device_detach,        ft5406ts_detach),
+
+       DEVMETHOD_END
+};
+
+static devclass_t ft5406ts_devclass;
+static driver_t ft5406ts_driver = {
+       "ft5406ts",
+       ft5406ts_methods,
+       sizeof(struct ft5406ts_softc),
+};
+
+DRIVER_MODULE(ft5406ts, ofwbus, ft5406ts_driver, ft5406ts_devclass, 0, 0);

Modified: stable/11/sys/arm/broadcom/bcm2835/files.bcm283x
==============================================================================
--- stable/11/sys/arm/broadcom/bcm2835/files.bcm283x    Sat Oct 22 02:31:49 
2016        (r307766)
+++ stable/11/sys/arm/broadcom/bcm2835/files.bcm283x    Sat Oct 22 02:37:59 
2016        (r307767)
@@ -6,6 +6,7 @@ arm/broadcom/bcm2835/bcm2835_cpufreq.c          
 arm/broadcom/bcm2835/bcm2835_dma.c             standard
 arm/broadcom/bcm2835/bcm2835_fb.c              optional sc
 arm/broadcom/bcm2835/bcm2835_fbd.c             optional vt
+arm/broadcom/bcm2835/bcm2835_ft5406.c          optional evdev bcm2835_ft5406
 arm/broadcom/bcm2835/bcm2835_gpio.c            optional gpio
 arm/broadcom/bcm2835/bcm2835_intr.c            standard
 arm/broadcom/bcm2835/bcm2835_machdep.c         standard

Modified: stable/11/sys/boot/fdt/dts/arm/rpi.dts
==============================================================================
--- stable/11/sys/boot/fdt/dts/arm/rpi.dts      Sat Oct 22 02:31:49 2016        
(r307766)
+++ stable/11/sys/boot/fdt/dts/arm/rpi.dts      Sat Oct 22 02:37:59 2016        
(r307767)
@@ -322,6 +322,11 @@
                broadcom,depth = <0>;           /* Set by VideoCore */
        };
 
+       rpi_ft5406 { 
+               compatible = "rpi,rpi-ft5406"; 
+               status = "okay"; 
+       }; 
+
        leds {
                compatible = "gpio-leds";
 

Modified: stable/11/sys/boot/fdt/dts/arm/rpi2.dts
==============================================================================
--- stable/11/sys/boot/fdt/dts/arm/rpi2.dts     Sat Oct 22 02:31:49 2016        
(r307766)
+++ stable/11/sys/boot/fdt/dts/arm/rpi2.dts     Sat Oct 22 02:37:59 2016        
(r307767)
@@ -337,6 +337,11 @@
                broadcom,depth = <0>;           /* Set by VideoCore */
        };
 
+       rpi_ft5406 { 
+               compatible = "rpi,rpi-ft5406"; 
+               status = "okay"; 
+       }; 
+
        leds {
                compatible = "gpio-leds";
 
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to