apalis-imx6: add support for the new capasitive touch display

The atmel_mxt_ts controller needs to be enabled in the dtb,
done here for the ixora v1.1 dtb. Said dtb is also changed
to be the default dtb in the u-boot config.

Existing u-boot patch is updated to include console=tty1 removal
for all toradex boards.

Task-number: QTBUG-63344
Change-Id: Idaba988c2a0a5916c8fe6b6f11cc75981a9a28e2
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>

3 files changed, 103 insertions, 0 deletions

diff --git a/meta-toradex-extras/conf/layer.conf b/meta-toradex-extras/conf/layer.conf
new file mode 100644
index 0000000..e39649f
--- /dev/null
+++ b/meta-toradex-extras/conf/layer.conf
@@ -0,0 +1,40 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+# We have a conf and classes directory, append to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have a recipes directory, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes*/*/*.bb \
+            ${LAYERDIR}/recipes*/*/*.bbappend \
+            "
+
+BBFILE_COLLECTIONS += "b2qt_toradex"
+BBFILE_PATTERN_b2qt_toradex := "^${LAYERDIR}/"
+BBFILE_PRIORITY_b2qt_toradex = "20"
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
new file mode 100644
index 0000000..1535234
--- /dev/null
+++ b/meta-toradex-extras/recipes/linux/linux-toradex/0001-Enable-atmel-mxt-multitouch-controller.patch
@@ -0,0 +1,31 @@
+From 37a2e407172b37a880d04c5a7721aeff498854ad 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
+
+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(-)
+
+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
+--- 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>;
+                interrupt-parent = <&gpio6>;
+                interrupts = <10 IRQ_TYPE_EDGE_FALLING>;
+-               status = "disabled";
+        };
+ 
+        pcap@10 {
+@@ -176,6 +175,7 @@
+                gpios = <&gpio6 10 0 /* MXM3 11, Pen down interrupt */
+                         &gpio6  9 0 /* MXM3 13, Reset */
+                        >;
++               status = "disabled";
+        };
+ 
+        /* M41T0M6 real time clock on carrier board */
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.1-2.0.x.bbappend
new file mode 100644
index 0000000..eadfa15
--- /dev/null
+++ b/meta-toradex-extras/recipes/linux/linux-toradex_4.1-2.0.x.bbappend
@@ -0,0 +1,32 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Enable-atmel-mxt-multitouch-controller.patch"