3 files changed, 14 insertions, 9 deletions

diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf
index 213a535..3a43fd7 100644
--- a/meta-toradex-extras/conf/layer.conf
+++ b/meta-toradex-extras/conf/layer.conf
@@ -40,3 +40,7 @@ BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/"
 BBFILE_PRIORITY_b2qt_toradex = "20"
 
 LAYERSERIES_COMPAT_b2qt_toradex = "sumo"
+
+# override toradex layer COMPATs
+LAYERSERIES_COMPAT_toradex-bsp-common-layer = "sumo"
+LAYERSERIES_COMPAT_toradex-nxp-layer = "sumo"
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch
index 1535234..1f63fee 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch
+++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch
@@ -1,4 +1,4 @@
-From 37a2e407172b37a880d04c5a7721aeff498854ad Mon Sep 17 00:00:00 2001
+From 823475bf681e1dbb4ad8e43935232ae39b918d9c Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 6 Oct 2017 15:54:35 +0300
 Subject: [PATCH] Enable atmel mxt multitouch controller for ixora v1.1 dtb
@@ -6,24 +6,25 @@ Subject: [PATCH] Enable atmel mxt multitouch controller for ixora v1.1 dtb
 Need to disable fusion touch to get the new atmel mxt multitouch
 controller to work.
 ---
- arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
-index 354bf80d..1181502 100644
+index 26525e24a6c7..78a1011c1ea2 100644
 --- a/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
 +++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora-v1.1.dtsi
-@@ -166,7 +166,6 @@
-                reg = <0x4a>;
+@@ -160,7 +160,7 @@
                 interrupt-parent = <&gpio6>;
                 interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+                reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */
 -               status = "disabled";
++               status = "okay";
         };
  
         pcap@10 {
-@@ -176,6 +175,7 @@
-                gpios = <&gpio6 10 0 /* MXM3 11, Pen down interrupt */
-                         &gpio6  9 0 /* MXM3 13, Reset */
+@@ -170,6 +170,7 @@
+                gpios = <&gpio6 10 GPIO_ACTIVE_HIGH /* MXM3 11, Pen down interrupt */
+                         &gpio6  9 GPIO_ACTIVE_HIGH /* MXM3 13, Reset */
                         >;
 +               status = "disabled";
         };
diff --git a/meta-toradex-extras/recipes/linux/linux-toradex_4.1-2.0.x.bbappend b/meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend
index eadfa15..eadfa15 100644
--- a/meta-toradex-extras/recipes/linux/linux-toradex_4.1-2.0.x.bbappend
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.9-1.0.x.bbappend