From 6c6deb7e8b728eab357aff5b3f50c5890d7e8484 Mon Sep 17 00:00:00 2001
From: Sebastian Sumpf <sebastian.sumpf@genode-labs.com>
Date: Thu, 24 Sep 2020 14:11:44 +0200
Subject: [PATCH] dde_linux: add touch to i.MX8 recipe

Add touch screen and event filter to drivers interactive package.

issue #3900
---
 .../drivers_interactive-imx8q_evk/archives    |  2 +
 .../drivers.config                            | 97 ++++++++++++++++++-
 2 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/repos/dde_linux/recipes/pkg/drivers_interactive-imx8q_evk/archives b/repos/dde_linux/recipes/pkg/drivers_interactive-imx8q_evk/archives
index 911aad26a9..3ebb4efcf3 100644
--- a/repos/dde_linux/recipes/pkg/drivers_interactive-imx8q_evk/archives
+++ b/repos/dde_linux/recipes/pkg/drivers_interactive-imx8q_evk/archives
@@ -1,3 +1,5 @@
+_/src/event_filter
+_/src/imx8q_evk_drivers
 _/src/imx8_fb_drv
 _/src/platform_drv
 _/src/usb_host_drv
diff --git a/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/drivers.config b/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/drivers.config
index 19fab72224..364f36d87c 100644
--- a/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/drivers.config
+++ b/repos/dde_linux/recipes/raw/drivers_interactive-imx8q_evk/drivers.config
@@ -31,6 +31,43 @@
 		<resource name="RAM" quantum="1M"/>
 		<provides> <service name="Platform"/> </provides>
 		<config>
+
+			<!-- GPIO banks -->
+			<device name="gpio1">
+				<io_mem address="0x30200000" size="0x10000"/>
+				<irq number="96"/>
+				<irq number="97"/>
+			</device>
+
+			<device name="gpio2">
+				<io_mem address="0x30210000" size="0x10000"/>
+				<irq number="98"/>
+				<irq number="99"/>
+			</device>
+
+			<device name="gpio3">
+				<io_mem address="0x30220000" size="0x10000"/>
+				<irq number="100"/>
+				<irq number="101"/>
+			</device>
+
+			<device name="gpio4">
+				<io_mem address="0x30230000" size="0x10000"/>
+				<irq number="102"/>
+				<irq number="103"/>
+			</device>
+
+			<device name="gpio5">
+				<io_mem address="0x30240000" size="0x10000"/>
+				<irq number="104"/>
+				<irq number="105"/>
+			</device>
+
+			<device name="synaptics_dsx">
+				<io_mem address="0x30a20000" size="0x10000"/>
+				<irq number="67"/>
+			</device>
+
 			<device name="usb_host_2">
 				<io_mem       address="0x38200000" size="0x10000"/>
 				<irq          number="73"/>
@@ -118,10 +155,37 @@
 				<device name="mipi_dsi"/>
 				<device name="src"/>
 			</policy>
+			<policy label="gpio_drv -> ">
+				<device name="gpio1"/>
+				<device name="gpio2"/>
+				<device name="gpio3"/>
+				<device name="gpio4"/>
+				<device name="gpio5"/>
+			</policy>
+			<policy label="touch_drv -> "> <device name="synaptics_dsx"/> </policy>
 		</config>
 		<route> <any-service> <parent/> </any-service> </route>
 	</start>
 
+	<start name="event_filter">
+		<resource name="RAM" quantum="1M" />
+		<provides> <service name="Event" /> </provides>
+		<config>
+			<output>
+				<merge>
+					<input name="usb_hid_drv"/>
+					<input name="touch_drv"/>
+				</merge>
+			</output>
+			<policy label="usb_hid_drv -> "  input="usb_hid_drv"/>
+			<policy label="touch_drv -> " input="touch_drv"/>
+		</config>
+		<route>
+			<service name="Event"> <parent/> </service>
+			<any-service> <parent/> </any-service>
+		</route>
+	</start>
+
 	<start name="usb_drv" caps="150">
 		<binary name="imx8q_evk_usb_host_drv"/>
 		<resource name="RAM" quantum="12M"/>
@@ -148,7 +212,7 @@
 		<config use_report="yes"/>
 		<route>
 			<service name="ROM" label="report"> <child name="report_rom"/> </service>
-			<service name="Event"> <parent/> </service>
+			<service name="Event"> <child name="event_filter"/> </service>
 			<service name="RM">    <parent/> </service>
 			<service name="ROM">   <parent/> </service>
 			<service name="PD">    <parent/> </service>
@@ -159,6 +223,37 @@
 		</route>
 	</start>
 
+	<start name="gpio_drv" caps="150">
+		<binary name="imx_gpio_drv"/>
+		<resource name="RAM" quantum="2M"/>
+		<provides><service name="Gpio"/></provides>
+		<route>
+			<service name="RM">       <parent/> </service>
+			<service name="ROM">   <parent/> </service>
+			<service name="PD">       <parent/> </service>
+			<service name="CPU">      <parent/> </service>
+			<service name="LOG">      <parent/> </service>
+			<service name="Platform"> <child name="platform_drv"/> </service>
+		</route>
+	</start>
+
+	<start name="touch_drv" caps="150">
+		<binary name="imx8_synaptics_touch_drv"/>
+		<resource name="RAM" quantum="5M"/>
+		<provides><service name="Input"/></provides>
+		<route>
+			<service name="RM">       <parent/> </service>
+			<service name="ROM">      <parent/> </service>
+			<service name="PD">       <parent/> </service>
+			<service name="CPU">      <parent/> </service>
+			<service name="LOG">      <parent/> </service>
+			<service name="Timer">    <parent/> </service>
+			<service name="Event">    <child name="event_filter"/> </service>
+			<service name="Platform"> <child name="platform_drv"/> </service>
+			<service name="Gpio"> <child name="gpio_drv"/> </service>
+		</route>
+	</start>
+
 	<start name="fb_drv" caps="250">
 		<binary name="imx8_fb_drv"/>
 		<resource name="RAM" quantum="40M"/>