summaryrefslogtreecommitdiff
path: root/recipes-kernel/linux
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-07-11 15:57:59 +0200
committerStefan Agner <stefan.agner@toradex.com>2018-07-27 16:42:39 +0200
commit1ab789fdf72302417ed4aa94393ba6068844a7ad (patch)
tree15886f1a481555b09bc755f690d0555d084c8f9c /recipes-kernel/linux
parentfc04a6072ca96f1de703550ba8119089290b5d38 (diff)
apalis-t30/tk1-mainline: update patchset
Latest additions: - 0024-apalis_t30-enable-broken-hpi-on-emmc.patch Avoid a rare soft lockup upon installing an image from within Tezi. - 0025-tegra_defconfig-disable-sound-in-tezi-configuration.patch Avoid keyboard/mouse being unresponsive for 10-15 Seconds. - 0026-apalis_t30-fix-mmc1-cmd-pull-up.patch Avoid issues with higher speed SD cards. - 0027-apalis_t30-pull-up-sd-card-detect-pins.patch Avoid floating SD card detect pins. - 0028-Revert-mmc-tegra-Disable-UHS-I-modes-for-Tegra124.patch Allow for UHS-I modes on TK1. - 0029-mmc-tegra-fix-eMMC-DDR-mode.patch Fix eMMC DDR mode. - 0030-apalis-tk1-enable-ddr52-mode-on-emmc.patch Enable eMMC DDR mode. - 0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch Avoid re-ordering of SDMMC controller instances. - 0032-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch Fix PCIe gigabit bring-up issue on Apalis TK1. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'recipes-kernel/linux')
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0001-apalis-t30-tk1-mainline-customize-defconfig.patch6
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0002-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0003-igb-integrate-tools-only-device-support.patch12
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0004-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch12
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0005-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0006-apalis-colibri_t30-apalis-tk1-snapd-squashfs-configu.patch10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0007-ARM-tegra-apalis-tk1-Support-v1.2-hardware-revision.patch17
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0008-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0009-drm-tegra-gem-Reshuffle-declarations.patch11
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0010-drm-tegra-gem-Make-__tegra_gem_mmap-available-more-w.patch20
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0011-drm-tegra-fb-Implement-fb_mmap-callback.patch13
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0012-apalis-tk1-support-for-k20-mfd.patch16
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0013-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra30.patch13
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0014-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra114-124.patch10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0016-Revert-mmc-core-simplify-ida-handling.patch10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0017-mmc-read-mmc-alias-from-device-tree.patch10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0018-apalis-t30-mainline-force-fixed-ids-for-sdmmc-contro.patch10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0019-ARM-tegra-apalis-tk1-Fix-high-speed-UART-compatible.patch (renamed from recipes-kernel/linux/linux-toradex-mainline-4.14/0020-ARM-tegra-apalis-tk1-Fix-high-speed-UART-compatible.patch)14
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0020-apalis-t30-tk1-mainline-igb-avoid-nvm-checksum-failu.patch (renamed from recipes-kernel/linux/linux-toradex-mainline-4.14/0021-apalis-t30-tk1-mainline-igb-avoid-nvm-checksum-failu.patch)12
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0021-apalis_t30-fix-can2.patch (renamed from recipes-kernel/linux/linux-toradex-mainline-4.14/0022-apalis_t30-fix-can2.patch)10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0022-mfd-as3722-disable-auto-power-on-when-AC-OK.patch (renamed from recipes-kernel/linux/linux-toradex-mainline-4.14/0023-mfd-as3722-disable-auto-power-on-when-AC-OK.patch)10
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0023-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch48
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0024-apalis_t30-enable-broken-hpi-on-emmc.patch39
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0025-tegra_defconfig-disable-sound-in-tezi-configuration.patch54
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0026-apalis_t30-fix-mmc1-cmd-pull-up.patch41
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0027-apalis_t30-pull-up-sd-card-detect-pins.patch41
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0028-Revert-mmc-tegra-Disable-UHS-I-modes-for-Tegra124.patch31
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0029-mmc-tegra-fix-eMMC-DDR-mode.patch33
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0030-apalis-tk1-enable-ddr52-mode-on-emmc.patch49
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch104
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0032-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch329
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/apalis-t30-mainline/0033-apalis-t30-mainline-apply-pcie-fix-hacks.patch (renamed from recipes-kernel/linux/linux-toradex-mainline-4.14/apalis-t30-mainline/0024-apalis-t30-mainline-apply-pcie-fix-hacks.patch)12
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline_4.14.bb20
34 files changed, 926 insertions, 131 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0001-apalis-t30-tk1-mainline-customize-defconfig.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0001-apalis-t30-tk1-mainline-customize-defconfig.patch
index e281c89..7bc0054 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0001-apalis-t30-tk1-mainline-customize-defconfig.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0001-apalis-t30-tk1-mainline-customize-defconfig.patch
@@ -1,8 +1,8 @@
-From fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3 Mon Sep 17 00:00:00 2001
-Message-Id: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 6654e1bd342708a683daf47e7558455f709a3e7e Mon Sep 17 00:00:00 2001
+Message-Id: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Dominik Sliwa <dominik.sliwa@toradex.com>
Date: Thu, 15 Dec 2016 10:40:06 +0100
-Subject: [PATCH 01/27] apalis-t30/tk1-mainline: customize defconfig
+Subject: [PATCH 01/33] apalis-t30/tk1-mainline: customize defconfig
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0002-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0002-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch
index 324294b..c462ac7 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0002-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0002-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch
@@ -1,10 +1,10 @@
-From 94c486ca26222a3e87d780f2c55a7b618e5ebc88 Mon Sep 17 00:00:00 2001
-Message-Id: <94c486ca26222a3e87d780f2c55a7b618e5ebc88.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From a7c1d4dfb4404c892823aa809993f00426d039bc Mon Sep 17 00:00:00 2001
+Message-Id: <a7c1d4dfb4404c892823aa809993f00426d039bc.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 15 Dec 2016 10:24:58 +0100
-Subject: [PATCH 02/27] apalis_t30/tk1: fix pcie clock and reset not conforming
+Subject: [PATCH 02/33] apalis_t30/tk1: fix pcie clock and reset not conforming
to specification
Fix PCIe clock and reset not conforming to specification by moving PCIe
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0003-igb-integrate-tools-only-device-support.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0003-igb-integrate-tools-only-device-support.patch
index 459ba10..a9765a2 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0003-igb-integrate-tools-only-device-support.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0003-igb-integrate-tools-only-device-support.patch
@@ -1,10 +1,10 @@
-From e311535be20637969de2ebb95aa2ffbf5ff9e2c3 Mon Sep 17 00:00:00 2001
-Message-Id: <e311535be20637969de2ebb95aa2ffbf5ff9e2c3.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From b0d16f4567ffe86b2e4611cb61ebf9fd74eee481 Mon Sep 17 00:00:00 2001
+Message-Id: <b0d16f4567ffe86b2e4611cb61ebf9fd74eee481.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 15 Dec 2016 10:55:11 +0100
-Subject: [PATCH 03/27] igb: integrate tools only device support
+Subject: [PATCH 03/33] igb: integrate tools only device support
Springville/i211 with a blank Flash/iNVM use different PCI IDs. Extend
the driver to load despite i210/i211 data sheets claiming tools only,
@@ -56,7 +56,7 @@ index 6c9485ab4b57..a3827f182df9 100644
#define E1000_DEV_ID_I210_FIBER 0x1536
#define E1000_DEV_ID_I210_SERDES 0x1537
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index d1a44a84c97e..77e74be9c70d 100644
+index 6ca580cdfd84..94ac43034033 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -77,7 +77,9 @@ static const struct pci_device_id igb_pci_tbl[] = {
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0004-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0004-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch
index ed97b36..4fa1ccb 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0004-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0004-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch
@@ -1,10 +1,10 @@
-From a95cc31636707dad8392bcdae4404524224c27ad Mon Sep 17 00:00:00 2001
-Message-Id: <a95cc31636707dad8392bcdae4404524224c27ad.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 934ba9a81ce07365edb96fcbf227783d0372bdb9 Mon Sep 17 00:00:00 2001
+Message-Id: <934ba9a81ce07365edb96fcbf227783d0372bdb9.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 15 Dec 2016 10:55:54 +0100
-Subject: [PATCH 04/27] apalis_t30/tk1: igb: no nvm and Ethernet MAC address
+Subject: [PATCH 04/33] apalis_t30/tk1: igb: no nvm and Ethernet MAC address
handling
Only warn rather than fail on NVM validation failures on Apalis T30 and
@@ -37,7 +37,7 @@ c4c3c7449bdb15c53bfebb0a29c73b24ea810d23)
1 file changed, 57 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index 77e74be9c70d..c2e8a3654119 100644
+index 94ac43034033..e9d6a8742826 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -55,6 +55,7 @@
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0005-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0005-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch
index a029a83..5058e25 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0005-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0005-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch
@@ -1,10 +1,10 @@
-From ad8c244322d0ad03cd94f1acd24b1139b2d36857 Mon Sep 17 00:00:00 2001
-Message-Id: <ad8c244322d0ad03cd94f1acd24b1139b2d36857.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 2c1a2558212cb107d67fc8bad8bc05de33924961 Mon Sep 17 00:00:00 2001
+Message-Id: <2c1a2558212cb107d67fc8bad8bc05de33924961.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 15 Dec 2016 10:56:26 +0100
-Subject: [PATCH 05/27] mmc: tegra: apalis-tk1: hack to make sd1 functional
+Subject: [PATCH 05/33] mmc: tegra: apalis-tk1: hack to make sd1 functional
Disable the external loopback and use the internal loopback as per
SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits being set to
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0006-apalis-colibri_t30-apalis-tk1-snapd-squashfs-configu.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0006-apalis-colibri_t30-apalis-tk1-snapd-squashfs-configu.patch
index a007629..0ba77dd 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0006-apalis-colibri_t30-apalis-tk1-snapd-squashfs-configu.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0006-apalis-colibri_t30-apalis-tk1-snapd-squashfs-configu.patch
@@ -1,10 +1,10 @@
-From 3a447704e56902115638917c4072c8e50bea851e Mon Sep 17 00:00:00 2001
-Message-Id: <3a447704e56902115638917c4072c8e50bea851e.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 8457755081b1f33ffcaceb101fdd31acc3e10d64 Mon Sep 17 00:00:00 2001
+Message-Id: <8457755081b1f33ffcaceb101fdd31acc3e10d64.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Sun, 18 Jun 2017 01:23:26 +0200
-Subject: [PATCH 06/27] apalis/colibri_t30, apalis-tk1: snapd squashfs
+Subject: [PATCH 06/33] apalis/colibri_t30, apalis-tk1: snapd squashfs
configuration
Prepare for snapd integration.
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0007-ARM-tegra-apalis-tk1-Support-v1.2-hardware-revision.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0007-ARM-tegra-apalis-tk1-Support-v1.2-hardware-revision.patch
index 617992c..7b20a77 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0007-ARM-tegra-apalis-tk1-Support-v1.2-hardware-revision.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0007-ARM-tegra-apalis-tk1-Support-v1.2-hardware-revision.patch
@@ -1,7 +1,10 @@
-From 4957a2f1f2205214b2ca325872a7508fa91e1096 Mon Sep 17 00:00:00 2001
+From c98f7e071cb3f133a05b325e3123b212f15dba31 Mon Sep 17 00:00:00 2001
+Message-Id: <c98f7e071cb3f133a05b325e3123b212f15dba31.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Sat, 10 Feb 2018 02:38:06 +0100
-Subject: ARM: tegra: apalis-tk1: Support v1.2 hardware revision
+Subject: [PATCH 07/33] ARM: tegra: apalis-tk1: Support v1.2 hardware revision
Support the V1.2 hardware revision with the following pin muxing
changes:
@@ -26,10 +29,10 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
create mode 100644 arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index ade7a38..9d88274 100644
+index eff87a344566..56aa9647db64 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -1022,6 +1022,7 @@ dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \
+@@ -961,6 +961,7 @@ dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \
tegra114-tn7.dtb
dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \
tegra124-apalis-eval.dtb \
@@ -39,7 +42,7 @@ index ade7a38..9d88274 100644
tegra124-nyan-blaze.dtb \
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
new file mode 100644
-index 0000000..8a8d5fa
+index 000000000000..8a8d5fa0ecd1
--- /dev/null
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -0,0 +1,250 @@
@@ -295,7 +298,7 @@ index 0000000..8a8d5fa
+};
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
new file mode 100644
-index 0000000..bb67edb
+index 000000000000..bb67edb016c5
--- /dev/null
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -0,0 +1,2052 @@
@@ -2352,5 +2355,5 @@ index 0000000..bb67edb
+ };
+};
--
-cgit v1.1
+2.14.4
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0008-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0008-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch
index f97269c..7b44fdc 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0008-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0008-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch
@@ -1,10 +1,10 @@
-From f8ab701354544ed62591ea343c881efee973740d Mon Sep 17 00:00:00 2001
-Message-Id: <f8ab701354544ed62591ea343c881efee973740d.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 4a3ae8e688872fdc63a2d7af1f3b48b3eba3b975 Mon Sep 17 00:00:00 2001
+Message-Id: <4a3ae8e688872fdc63a2d7af1f3b48b3eba3b975.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Mon, 13 Nov 2017 14:37:25 +0100
-Subject: [PATCH 08/27] apalis-tk1: fix pcie reset for reliable gigabit
+Subject: [PATCH 08/33] apalis-tk1: fix pcie reset for reliable gigabit
ethernet operation
It turns out that the current PCIe reset implementation is not quite
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0009-drm-tegra-gem-Reshuffle-declarations.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0009-drm-tegra-gem-Reshuffle-declarations.patch
index 6e4752d..a06dffd 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0009-drm-tegra-gem-Reshuffle-declarations.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0009-drm-tegra-gem-Reshuffle-declarations.patch
@@ -1,7 +1,10 @@
-From b6d7974d10b30bf3baed7e50d8e574f5184cfdd1 Mon Sep 17 00:00:00 2001
+From a8aeca9abdda04e5690c2208bc8fe6532a8fb798 Mon Sep 17 00:00:00 2001
+Message-Id: <a8aeca9abdda04e5690c2208bc8fe6532a8fb798.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Thierry Reding <treding@nvidia.com>
Date: Wed, 7 Feb 2018 18:45:54 +0100
-Subject: drm/tegra: gem: Reshuffle declarations
+Subject: [PATCH 09/33] drm/tegra: gem: Reshuffle declarations
Move declarations in the gem.h header file into the same order as the
corresponding definitions in gem.c.
@@ -12,7 +15,7 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h
-index 8eb9fd2..1fcf94d 100644
+index 8eb9fd24ef0e..1fcf94dce45c 100644
--- a/drivers/gpu/drm/tegra/gem.h
+++ b/drivers/gpu/drm/tegra/gem.h
@@ -68,10 +68,10 @@ void tegra_bo_free_object(struct drm_gem_object *gem);
@@ -29,5 +32,5 @@ index 8eb9fd2..1fcf94d 100644
struct drm_gem_object *gem,
int flags);
--
-cgit v1.1
+2.14.4
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0010-drm-tegra-gem-Make-__tegra_gem_mmap-available-more-w.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0010-drm-tegra-gem-Make-__tegra_gem_mmap-available-more-w.patch
index 7fb4233..b8ca0cb 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0010-drm-tegra-gem-Make-__tegra_gem_mmap-available-more-w.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0010-drm-tegra-gem-Make-__tegra_gem_mmap-available-more-w.patch
@@ -1,7 +1,11 @@
-From 04c0746663bd3ae3cce5e02d5b32c8ade2a833b8 Mon Sep 17 00:00:00 2001
+From 67619709309f73e21c785901e3535048fd05b62f Mon Sep 17 00:00:00 2001
+Message-Id: <67619709309f73e21c785901e3535048fd05b62f.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Thierry Reding <treding@nvidia.com>
Date: Wed, 7 Feb 2018 18:45:55 +0100
-Subject: drm/tegra: gem: Make __tegra_gem_mmap() available more widely
+Subject: [PATCH 10/33] drm/tegra: gem: Make __tegra_gem_mmap() available more
+ widely
This function allows mapping a GEM object into a virtual memory address
space, which makes it useful outside of the GEM code.
@@ -16,10 +20,10 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
-index 49b9bf2..d3b3aa1 100644
+index ab1e53d434e8..8d702dfe817e 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
-@@ -459,8 +459,7 @@ const struct vm_operations_struct tegra_bo_vm_ops = {
+@@ -460,8 +460,7 @@ const struct vm_operations_struct tegra_bo_vm_ops = {
.close = drm_gem_vm_close,
};
@@ -29,7 +33,7 @@ index 49b9bf2..d3b3aa1 100644
{
struct tegra_bo *bo = to_tegra_bo(gem);
-@@ -507,7 +506,7 @@ int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma)
+@@ -508,7 +507,7 @@ int tegra_drm_mmap(struct file *file, struct vm_area_struct *vma)
gem = vma->vm_private_data;
@@ -38,7 +42,7 @@ index 49b9bf2..d3b3aa1 100644
}
static struct sg_table *
-@@ -600,7 +599,7 @@ static int tegra_gem_prime_mmap(struct dma_buf *buf, struct vm_area_struct *vma)
+@@ -601,7 +600,7 @@ static int tegra_gem_prime_mmap(struct dma_buf *buf, struct vm_area_struct *vma)
if (err < 0)
return err;
@@ -48,7 +52,7 @@ index 49b9bf2..d3b3aa1 100644
static void *tegra_gem_prime_vmap(struct dma_buf *buf)
diff --git a/drivers/gpu/drm/tegra/gem.h b/drivers/gpu/drm/tegra/gem.h
-index 1fcf94d..6bd7dd7 100644
+index 1fcf94dce45c..6bd7dd7e55b4 100644
--- a/drivers/gpu/drm/tegra/gem.h
+++ b/drivers/gpu/drm/tegra/gem.h
@@ -70,6 +70,7 @@ int tegra_bo_dumb_create(struct drm_file *file, struct drm_device *drm,
@@ -60,5 +64,5 @@ index 1fcf94d..6bd7dd7 100644
struct dma_buf *tegra_gem_prime_export(struct drm_device *drm,
--
-cgit v1.1
+2.14.4
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0011-drm-tegra-fb-Implement-fb_mmap-callback.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0011-drm-tegra-fb-Implement-fb_mmap-callback.patch
index 646073d..0bc4e54 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0011-drm-tegra-fb-Implement-fb_mmap-callback.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0011-drm-tegra-fb-Implement-fb_mmap-callback.patch
@@ -1,7 +1,10 @@
-From b8f3f500e09c2c457efc2fcbfe8b7f815f2e6a0e Mon Sep 17 00:00:00 2001
+From 3d6b20bdedc331561dd04a1ac48f4eea61ddda4c Mon Sep 17 00:00:00 2001
+Message-Id: <3d6b20bdedc331561dd04a1ac48f4eea61ddda4c.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Thierry Reding <treding@nvidia.com>
Date: Wed, 7 Feb 2018 18:45:56 +0100
-Subject: drm/tegra: fb: Implement ->fb_mmap() callback
+Subject: [PATCH 11/33] drm/tegra: fb: Implement ->fb_mmap() callback
This fixes hangs with legacy applications that use the mmap() syscall on
the fbdev device to map framebuffer memory. The fbdev implementation for
@@ -19,10 +22,10 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
1 file changed, 16 insertions(+)
diff --git a/drivers/gpu/drm/tegra/fb.c b/drivers/gpu/drm/tegra/fb.c
-index 001cb77..0786159 100644
+index 80540c1c66dc..4681e184f125 100644
--- a/drivers/gpu/drm/tegra/fb.c
+++ b/drivers/gpu/drm/tegra/fb.c
-@@ -224,12 +224,28 @@ unreference:
+@@ -201,12 +201,28 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm,
}
#ifdef CONFIG_DRM_FBDEV_EMULATION
@@ -52,5 +55,5 @@ index 001cb77..0786159 100644
static int tegra_fbdev_probe(struct drm_fb_helper *helper,
--
-cgit v1.1
+2.14.4
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0012-apalis-tk1-support-for-k20-mfd.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0012-apalis-tk1-support-for-k20-mfd.patch
index e410e4c..3042ca4 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0012-apalis-tk1-support-for-k20-mfd.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0012-apalis-tk1-support-for-k20-mfd.patch
@@ -1,10 +1,10 @@
-From babab7769aa903d7602c24d4422bca72b5903093 Mon Sep 17 00:00:00 2001
-Message-Id: <babab7769aa903d7602c24d4422bca72b5903093.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 55301c43044ec23e14509a5515a868b7ae995aa1 Mon Sep 17 00:00:00 2001
+Message-Id: <55301c43044ec23e14509a5515a868b7ae995aa1.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Dominik Sliwa <dominik.sliwa@toradex.com>
Date: Wed, 18 Apr 2018 12:22:26 +0200
-Subject: [PATCH 12/27] apalis-tk1: support for k20 mfd
+Subject: [PATCH 12/33] apalis-tk1: support for k20 mfd
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
@@ -41,10 +41,10 @@ Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
create mode 100644 include/linux/mfd/apalis-tk1-k20.h
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
-index c2b14e693cda..bca22e2a6dcb 100644
+index bb67edb016c5..93cf49c10954 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
-@@ -1792,6 +1792,34 @@
+@@ -1756,6 +1756,34 @@
spi@7000d600 {
status = "okay";
spi-max-frequency = <25000000>;
@@ -389,7 +389,7 @@ index 000000000000..7b44f93df85b
+MODULE_AUTHOR("Dominik Sliwa <dominik.sliwa@toradex.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
-index 1d13bf03c758..38da40c0f19b 100644
+index 369a2c632e46..d4ec5fad1467 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -116,6 +116,12 @@ config AD7923
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0013-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra30.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0013-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra30.patch
index f60ce2d..8a1dc12 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0013-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra30.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0013-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra30.patch
@@ -1,7 +1,10 @@
-From 061e20e9899e2fef170135a5d68f62d2a9514b3b Mon Sep 17 00:00:00 2001
+From 6c165ae3ea4fc94f606abb16b00eab01245c1ee9 Mon Sep 17 00:00:00 2001
+Message-Id: <6c165ae3ea4fc94f606abb16b00eab01245c1ee9.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Dmitry Osipenko <digetx@gmail.com>
Date: Tue, 19 Dec 2017 05:58:07 +0300
-Subject: usb: chipidea: tegra: Use aligned DMA on Tegra30
+Subject: [PATCH 13/33] usb: chipidea: tegra: Use aligned DMA on Tegra30
USB Ethernet gadget now works on Tegra30.
@@ -13,10 +16,10 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c
-index 7b65a10..7f4d2b6 100644
+index bfcee2702d50..85ae796b75b1 100644
--- a/drivers/usb/chipidea/ci_hdrc_tegra.c
+++ b/drivers/usb/chipidea/ci_hdrc_tegra.c
-@@ -29,7 +29,7 @@ static const struct tegra_udc_soc_info tegra20_udc_soc_info = {
+@@ -32,7 +32,7 @@ static const struct tegra_udc_soc_info tegra20_udc_soc_info = {
};
static const struct tegra_udc_soc_info tegra30_udc_soc_info = {
@@ -26,5 +29,5 @@ index 7b65a10..7f4d2b6 100644
static const struct tegra_udc_soc_info tegra114_udc_soc_info = {
--
-cgit v1.1
+2.14.4
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0014-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra114-124.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0014-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra114-124.patch
index 0410751..c00c05d 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0014-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra114-124.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0014-usb-chipidea-tegra-Use-aligned-DMA-on-Tegra114-124.patch
@@ -1,10 +1,10 @@
-From bf0fcafdd7388c74abb0e646fa31d0032ce9a635 Mon Sep 17 00:00:00 2001
-Message-Id: <bf0fcafdd7388c74abb0e646fa31d0032ce9a635.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 7c6c2b214f72d0e250bb549c2e5e50a8e28b8075 Mon Sep 17 00:00:00 2001
+Message-Id: <7c6c2b214f72d0e250bb549c2e5e50a8e28b8075.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Dmitry Osipenko <digetx-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Date: Tue, 19 Dec 2017 05:58:07 +0300
-Subject: [PATCH 14/27] usb: chipidea: tegra: Use aligned DMA on Tegra114/124
+Subject: [PATCH 14/33] usb: chipidea: tegra: Use aligned DMA on Tegra114/124
USB Ethernet gadget now works on Tegra114 and Tegra124.
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch
index 1ce78a1..dd8d127 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0015-Revert-mmc-core-fix-error-path-in-mmc_host_alloc.patch
@@ -1,10 +1,10 @@
-From 221424e20f51fd7e9603da30c4ad0970b2dfd868 Mon Sep 17 00:00:00 2001
-Message-Id: <221424e20f51fd7e9603da30c4ad0970b2dfd868.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 12e25f531b9d910ed72ad5b6dd5e5b36a3f664aa Mon Sep 17 00:00:00 2001
+Message-Id: <12e25f531b9d910ed72ad5b6dd5e5b36a3f664aa.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 19 Apr 2018 13:49:00 +0200
-Subject: [PATCH 15/27] Revert "mmc: core: fix error path in mmc_host_alloc"
+Subject: [PATCH 15/33] Revert "mmc: core: fix error path in mmc_host_alloc"
This reverts commit 1ed2171944888cf6787990a0f6387b717ba72e24.
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0016-Revert-mmc-core-simplify-ida-handling.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0016-Revert-mmc-core-simplify-ida-handling.patch
index 4a8ba85..582dce2 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0016-Revert-mmc-core-simplify-ida-handling.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0016-Revert-mmc-core-simplify-ida-handling.patch
@@ -1,10 +1,10 @@
-From 50a063a5271868aaf17ee86741e6452a6c405a50 Mon Sep 17 00:00:00 2001
-Message-Id: <50a063a5271868aaf17ee86741e6452a6c405a50.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From b74554415a51457783875820b41f3c37abb01cdc Mon Sep 17 00:00:00 2001
+Message-Id: <b74554415a51457783875820b41f3c37abb01cdc.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 19 Apr 2018 13:49:30 +0200
-Subject: [PATCH 16/27] Revert "mmc: core: simplify ida handling"
+Subject: [PATCH 16/33] Revert "mmc: core: simplify ida handling"
This reverts commit 7413d1f509eb0ee605973c1a6da9911700c80012.
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0017-mmc-read-mmc-alias-from-device-tree.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0017-mmc-read-mmc-alias-from-device-tree.patch
index 1fdf688..57fbe91 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0017-mmc-read-mmc-alias-from-device-tree.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0017-mmc-read-mmc-alias-from-device-tree.patch
@@ -1,10 +1,10 @@
-From 1caa89027b94c5d52f9459890f123ebb6fb5d5a9 Mon Sep 17 00:00:00 2001
-Message-Id: <1caa89027b94c5d52f9459890f123ebb6fb5d5a9.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 4db90f3efa119cfcfc55df16b1ee1f4d5d0a7528 Mon Sep 17 00:00:00 2001
+Message-Id: <4db90f3efa119cfcfc55df16b1ee1f4d5d0a7528.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Stefan Agner <stefan@agner.ch>
Date: Fri, 29 Apr 2016 10:32:17 -0700
-Subject: [PATCH 17/27] mmc: read mmc alias from device tree
+Subject: [PATCH 17/33] mmc: read mmc alias from device tree
To get the SD/MMC host device ID, read the alias from the device
tree.
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0018-apalis-t30-mainline-force-fixed-ids-for-sdmmc-contro.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0018-apalis-t30-mainline-force-fixed-ids-for-sdmmc-contro.patch
index 80ab0cb..4a2955a 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0018-apalis-t30-mainline-force-fixed-ids-for-sdmmc-contro.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0018-apalis-t30-mainline-force-fixed-ids-for-sdmmc-contro.patch
@@ -1,10 +1,10 @@
-From 84faf19eb6451b55bd34e39a08555e1ebe623088 Mon Sep 17 00:00:00 2001
-Message-Id: <84faf19eb6451b55bd34e39a08555e1ebe623088.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From fc10da7a4d39c99adef1cfe3bd79505da47aeb6f Mon Sep 17 00:00:00 2001
+Message-Id: <fc10da7a4d39c99adef1cfe3bd79505da47aeb6f.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 19 Apr 2018 14:01:58 +0200
-Subject: [PATCH 18/27] apalis-t30-mainline: force fixed ids for sdmmc
+Subject: [PATCH 18/33] apalis-t30-mainline: force fixed ids for sdmmc
controllers
The following, together with the previous 3 kernel patches, forces a
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0020-ARM-tegra-apalis-tk1-Fix-high-speed-UART-compatible.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0019-ARM-tegra-apalis-tk1-Fix-high-speed-UART-compatible.patch
index 813dc86..7f74461 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0020-ARM-tegra-apalis-tk1-Fix-high-speed-UART-compatible.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0019-ARM-tegra-apalis-tk1-Fix-high-speed-UART-compatible.patch
@@ -1,10 +1,10 @@
-From 50c22d845d9ec7de671d5fa4993304593d449ef4 Mon Sep 17 00:00:00 2001
-Message-Id: <50c22d845d9ec7de671d5fa4993304593d449ef4.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From dcb6b8c0c1175002f3d368ad0bac2122bfa038a0 Mon Sep 17 00:00:00 2001
+Message-Id: <dcb6b8c0c1175002f3d368ad0bac2122bfa038a0.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 3 May 2018 09:46:46 +0200
-Subject: [PATCH 20/27] ARM: tegra: apalis-tk1: Fix high speed UART compatible
+Subject: [PATCH 19/33] ARM: tegra: apalis-tk1: Fix high speed UART compatible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -23,10 +23,10 @@ Signed-off-by: Thierry Reding <treding@nvidia.com>
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
-index bca22e2a6dcb..21cdc3117ca2 100644
+index 93cf49c10954..0620dcbe5817 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
-@@ -1572,15 +1572,15 @@
+@@ -1536,15 +1536,15 @@
};
serial@70006040 {
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0021-apalis-t30-tk1-mainline-igb-avoid-nvm-checksum-failu.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0020-apalis-t30-tk1-mainline-igb-avoid-nvm-checksum-failu.patch
index 2a323ad..e29e0ac 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0021-apalis-t30-tk1-mainline-igb-avoid-nvm-checksum-failu.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0020-apalis-t30-tk1-mainline-igb-avoid-nvm-checksum-failu.patch
@@ -1,10 +1,10 @@
-From 8c72a22b01f1db78a0bd7c982c4db394eb9a166f Mon Sep 17 00:00:00 2001
-Message-Id: <8c72a22b01f1db78a0bd7c982c4db394eb9a166f.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 860eb2cc7b67c4173186c677259ac3c95ed80cab Mon Sep 17 00:00:00 2001
+Message-Id: <860eb2cc7b67c4173186c677259ac3c95ed80cab.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Tue, 12 Jun 2018 09:47:30 +0200
-Subject: [PATCH 21/27] apalis-t30/tk1-mainline: igb: avoid nvm checksum
+Subject: [PATCH 20/33] apalis-t30/tk1-mainline: igb: avoid nvm checksum
failure
This avoids the following error in case the iNVM of the i210/i211 is not
@@ -19,7 +19,7 @@ Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
-index c2e8a3654119..2207d0d1906c 100644
+index e9d6a8742826..66f78b27ed53 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2533,7 +2533,7 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0022-apalis_t30-fix-can2.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0021-apalis_t30-fix-can2.patch
index f535c56..d394d57 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0022-apalis_t30-fix-can2.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0021-apalis_t30-fix-can2.patch
@@ -1,10 +1,10 @@
-From c76e3da5c5e5d1c94ffcc6a5c73d916c7af8060e Mon Sep 17 00:00:00 2001
-Message-Id: <c76e3da5c5e5d1c94ffcc6a5c73d916c7af8060e.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 7b35e59d9c78029407b9dbc9ac726fdbacdb507a Mon Sep 17 00:00:00 2001
+Message-Id: <7b35e59d9c78029407b9dbc9ac726fdbacdb507a.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Tue, 12 Jun 2018 14:39:50 +0200
-Subject: [PATCH 22/27] apalis_t30: fix can2
+Subject: [PATCH 21/33] apalis_t30: fix can2
CAN2 currently fails on probe as follows:
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0023-mfd-as3722-disable-auto-power-on-when-AC-OK.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0022-mfd-as3722-disable-auto-power-on-when-AC-OK.patch
index 568d50d..fd4608c 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0023-mfd-as3722-disable-auto-power-on-when-AC-OK.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0022-mfd-as3722-disable-auto-power-on-when-AC-OK.patch
@@ -1,10 +1,10 @@
-From a7e721386ede46fbb0d78abcccc0f235b257cfe9 Mon Sep 17 00:00:00 2001
-Message-Id: <a7e721386ede46fbb0d78abcccc0f235b257cfe9.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From 039b32b6cc7132a1613466c29a7f6dcdaa2ba22b Mon Sep 17 00:00:00 2001
+Message-Id: <039b32b6cc7132a1613466c29a7f6dcdaa2ba22b.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Thu, 14 Jun 2018 05:40:06 +0200
-Subject: [PATCH 23/27] mfd: as3722: disable auto power on when AC OK
+Subject: [PATCH 22/33] mfd: as3722: disable auto power on when AC OK
On ams AS3722, power on when AC OK is enabled by default.
Making this option as disable by default and enable only
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0023-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0023-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch
new file mode 100644
index 0000000..940476a
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0023-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch
@@ -0,0 +1,48 @@
+From dbef03b4e18e548eeeaf62133af3591e4cc1ce95 Mon Sep 17 00:00:00 2001
+Message-Id: <dbef03b4e18e548eeeaf62133af3591e4cc1ce95.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Fri, 22 Jun 2018 10:23:41 +0200
+Subject: [PATCH 23/33] apalis-tk1: mfd: k20: update api header for fw version
+ 1.1 support
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ include/linux/mfd/apalis-tk1-k20-api.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/linux/mfd/apalis-tk1-k20-api.h b/include/linux/mfd/apalis-tk1-k20-api.h
+index 85bbf9f28ca4..199b433c3d96 100644
+--- a/include/linux/mfd/apalis-tk1-k20-api.h
++++ b/include/linux/mfd/apalis-tk1-k20-api.h
+@@ -48,7 +48,7 @@
+ #define APALIS_TK1_K20_CAN_DEV_OFFSET(x) (x ? APALIS_TK1_K20_CAN_OFFSET : 0)
+
+ /* 0x30-0x3F Reserved */
+-/* 0x40-0x62 CAN1 registers same layout as CAN0*/
++/* 0x40-0x62 CAN1 registers same layout as CAN0 */
+ /* 0x63-0x6F Reserved */
+
+ /* ADC Registers */
+@@ -104,7 +104,8 @@
+ #define APALIS_TK1_K20_TSC_IRQ 4
+ #define APALIS_TK1_K20_GPIO_IRQ 5
+
+-#define APALIS_TK1_K20_FW_VER 0x10
++#define APALIS_TK1_K20_FW_VER 0x11
++#define APALIS_TK1_K20_TESTER_FW_VER 0xFE
+
+ #define FW_MINOR (APALIS_TK1_K20_FW_VER & 0x0F)
+ #define FW_MAJOR ((APALIS_TK1_K20_FW_VER & 0xF0) >> 4)
+@@ -112,7 +113,6 @@
+ #define TK1_K20_SENTINEL 0x55
+ #define TK1_K20_INVAL 0xAA
+
+-#define APALIS_TK1_K20_NUMREGS 0x3f
+ #define APALIS_TK1_K20_IRQ_REG_CNT 1
+ #define APALIS_TK1_K20_IRQ_PER_REG 8
+
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0024-apalis_t30-enable-broken-hpi-on-emmc.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0024-apalis_t30-enable-broken-hpi-on-emmc.patch
new file mode 100644
index 0000000..b9ef12e
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0024-apalis_t30-enable-broken-hpi-on-emmc.patch
@@ -0,0 +1,39 @@
+From cd57d1b777e57b6b8087d119bbccdcf23353d55a Mon Sep 17 00:00:00 2001
+Message-Id: <cd57d1b777e57b6b8087d119bbccdcf23353d55a.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 11 Jul 2018 10:08:41 +0200
+Subject: [PATCH 24/33] apalis_t30: enable broken-hpi on emmc
+
+Avoid eMMC issues by specifying broken-hpi.
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ arch/arm/boot/dts/tegra30-apalis.dtsi | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
+index 4b022b50782b..82eb7538b8c1 100644
+--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
++++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
+@@ -698,8 +698,16 @@
+ /* eMMC */
+ sdhci@78000600 {
+ status = "okay";
++ #address-cells = <1>;
++ #size-cells = <0>;
+ bus-width = <8>;
+ non-removable;
++
++ emmc: emmc@0 {
++ reg = <0>;
++ compatible = "mmc-card";
++ broken-hpi;
++ };
+ };
+
+ clocks {
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0025-tegra_defconfig-disable-sound-in-tezi-configuration.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0025-tegra_defconfig-disable-sound-in-tezi-configuration.patch
new file mode 100644
index 0000000..db52bff
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0025-tegra_defconfig-disable-sound-in-tezi-configuration.patch
@@ -0,0 +1,54 @@
+From e2aab7d9ffcfc98b9d1c572a744ce2ef321254bc Mon Sep 17 00:00:00 2001
+Message-Id: <e2aab7d9ffcfc98b9d1c572a744ce2ef321254bc.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 11 Jul 2018 10:10:50 +0200
+Subject: [PATCH 25/33] tegra_defconfig: disable sound in tezi configuration
+
+Avoid keyboard/mouse unresponsiveness on Apalis T30 caused by Tezi
+polling plug input devices from HDA controller.
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ arch/arm/configs/tegra_defconfig | 24 ------------------------
+ 1 file changed, 24 deletions(-)
+
+diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
+index e8c9bdafa1b9..1297ecfa6209 100644
+--- a/arch/arm/configs/tegra_defconfig
++++ b/arch/arm/configs/tegra_defconfig
+@@ -205,30 +205,6 @@ CONFIG_BACKLIGHT_PWM=y
+ CONFIG_FRAMEBUFFER_CONSOLE=y
+ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+ CONFIG_LOGO=y
+-CONFIG_SOUND=y
+-CONFIG_SND=y
+-# CONFIG_SND_SUPPORT_OLD_API is not set
+-# CONFIG_SND_DRIVERS is not set
+-CONFIG_SND_HDA_TEGRA=y
+-CONFIG_SND_HDA_INPUT_BEEP=y
+-CONFIG_SND_HDA_PATCH_LOADER=y
+-CONFIG_SND_HDA_CODEC_REALTEK=y
+-CONFIG_SND_HDA_CODEC_HDMI=y
+-# CONFIG_SND_ARM is not set
+-# CONFIG_SND_SPI is not set
+-# CONFIG_SND_USB is not set
+-CONFIG_SND_SOC=y
+-CONFIG_SND_SOC_TEGRA=y
+-CONFIG_SND_SOC_TEGRA20_I2S=y
+-CONFIG_SND_SOC_TEGRA30_I2S=y
+-CONFIG_SND_SOC_TEGRA_RT5640=y
+-CONFIG_SND_SOC_TEGRA_WM8753=y
+-CONFIG_SND_SOC_TEGRA_WM8903=y
+-CONFIG_SND_SOC_TEGRA_WM9712=y
+-CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
+-CONFIG_SND_SOC_TEGRA_ALC5632=y
+-CONFIG_SND_SOC_TEGRA_MAX98090=y
+-CONFIG_SND_SOC_TEGRA_SGTL5000=y
+ CONFIG_USB=y
+ CONFIG_USB_XHCI_HCD=y
+ CONFIG_USB_XHCI_TEGRA=m
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0026-apalis_t30-fix-mmc1-cmd-pull-up.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0026-apalis_t30-fix-mmc1-cmd-pull-up.patch
new file mode 100644
index 0000000..37c1895
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0026-apalis_t30-fix-mmc1-cmd-pull-up.patch
@@ -0,0 +1,41 @@
+From 6942904ff6f6c2ecb4fa26f9e1fc1b28ceb851d9 Mon Sep 17 00:00:00 2001
+Message-Id: <6942904ff6f6c2ecb4fa26f9e1fc1b28ceb851d9.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 11 Jul 2018 10:31:07 +0200
+Subject: [PATCH 26/33] apalis_t30: fix mmc1 cmd pull-up
+
+Fix MMC1 cmd pin pull-up causing issues on carrier boards without
+external pull-up.
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ arch/arm/boot/dts/tegra30-apalis.dtsi | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
+index 82eb7538b8c1..f97b705abd0d 100644
+--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
++++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
+@@ -167,14 +167,14 @@
+
+ /* Apalis MMC1 */
+ sdmmc3_clk_pa6 {
+- nvidia,pins = "sdmmc3_clk_pa6",
+- "sdmmc3_cmd_pa7";
++ nvidia,pins = "sdmmc3_clk_pa6";
+ nvidia,function = "sdmmc3";
+ nvidia,pull = <TEGRA_PIN_PULL_NONE>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ };
+ sdmmc3_dat0_pb7 {
+- nvidia,pins = "sdmmc3_dat0_pb7",
++ nvidia,pins = "sdmmc3_cmd_pa7",
++ "sdmmc3_dat0_pb7",
+ "sdmmc3_dat1_pb6",
+ "sdmmc3_dat2_pb5",
+ "sdmmc3_dat3_pb4",
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0027-apalis_t30-pull-up-sd-card-detect-pins.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0027-apalis_t30-pull-up-sd-card-detect-pins.patch
new file mode 100644
index 0000000..c97d49f
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0027-apalis_t30-pull-up-sd-card-detect-pins.patch
@@ -0,0 +1,41 @@
+From a9ff91c77ce8693f394a48d16869cb443a0f4169 Mon Sep 17 00:00:00 2001
+Message-Id: <a9ff91c77ce8693f394a48d16869cb443a0f4169.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 11 Jul 2018 10:32:47 +0200
+Subject: [PATCH 27/33] apalis_t30: pull-up sd card detect pins
+
+In order to avoid any floating SD card detect pins as may e.g. happen on
+Ixora V1.1A pull them all up.
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ arch/arm/boot/dts/tegra30-apalis.dtsi | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi
+index f97b705abd0d..785d9b109d8e 100644
+--- a/arch/arm/boot/dts/tegra30-apalis.dtsi
++++ b/arch/arm/boot/dts/tegra30-apalis.dtsi
+@@ -190,7 +190,7 @@
+ pv3 {
+ nvidia,pins = "pv3";
+ nvidia,function = "rsvd2";
+- nvidia,pull = <TEGRA_PIN_PULL_NONE>;
++ nvidia,pull = <TEGRA_PIN_PULL_UP>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+ };
+@@ -256,7 +256,7 @@
+ clk2_req_pcc5 {
+ nvidia,pins = "clk2_req_pcc5";
+ nvidia,function = "rsvd2";
+- nvidia,pull = <TEGRA_PIN_PULL_NONE>;
++ nvidia,pull = <TEGRA_PIN_PULL_UP>;
+ nvidia,tristate = <TEGRA_PIN_DISABLE>;
+ nvidia,enable-input = <TEGRA_PIN_ENABLE>;
+ };
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0028-Revert-mmc-tegra-Disable-UHS-I-modes-for-Tegra124.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0028-Revert-mmc-tegra-Disable-UHS-I-modes-for-Tegra124.patch
new file mode 100644
index 0000000..e47fb22
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0028-Revert-mmc-tegra-Disable-UHS-I-modes-for-Tegra124.patch
@@ -0,0 +1,31 @@
+From 65cea0704a8a7665fcf31fe9388b4050f7656813 Mon Sep 17 00:00:00 2001
+Message-Id: <65cea0704a8a7665fcf31fe9388b4050f7656813.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 11 Jul 2018 10:37:25 +0200
+Subject: [PATCH 28/33] Revert "mmc: tegra: Disable UHS-I modes for Tegra124"
+
+This reverts commit 70ad7f7e40af31e7ab4a1719602542856b7ea856.
+---
+ drivers/mmc/host/sdhci-tegra.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
+index 327883d86b33..c83115860cf4 100644
+--- a/drivers/mmc/host/sdhci-tegra.c
++++ b/drivers/mmc/host/sdhci-tegra.c
+@@ -409,6 +409,10 @@ static const struct sdhci_pltfm_data sdhci_tegra124_pdata = {
+
+ static const struct sdhci_tegra_soc_data soc_data_tegra124 = {
+ .pdata = &sdhci_tegra124_pdata,
++ .nvquirks = NVQUIRK_ENABLE_SDR50 |
++ NVQUIRK_ENABLE_DDR50 |
++ NVQUIRK_ENABLE_SDR104 |
++ NVQUIRK_HAS_PADCALIB,
+ };
+
+ static const struct sdhci_pltfm_data sdhci_tegra210_pdata = {
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0029-mmc-tegra-fix-eMMC-DDR-mode.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0029-mmc-tegra-fix-eMMC-DDR-mode.patch
new file mode 100644
index 0000000..fadb534
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0029-mmc-tegra-fix-eMMC-DDR-mode.patch
@@ -0,0 +1,33 @@
+From 7641e3bc8feb2ebeb36ccf0877a70f1985e54dd8 Mon Sep 17 00:00:00 2001
+Message-Id: <7641e3bc8feb2ebeb36ccf0877a70f1985e54dd8.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Stefan Agner <stefan@agner.ch>
+Date: Tue, 10 Jul 2018 16:04:20 +0200
+Subject: [PATCH 29/33] mmc: tegra: fix eMMC DDR mode
+
+Make sure the clock is also doubled when using eMMC DDR modes.
+
+Signed-off-by: Stefan Agner <stefan@agner.ch>
+Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ drivers/mmc/host/sdhci-tegra.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
+index c83115860cf4..3b6d504bef45 100644
+--- a/drivers/mmc/host/sdhci-tegra.c
++++ b/drivers/mmc/host/sdhci-tegra.c
+@@ -239,7 +239,8 @@ static void tegra_sdhci_set_uhs_signaling(struct sdhci_host *host,
+ struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+ struct sdhci_tegra *tegra_host = sdhci_pltfm_priv(pltfm_host);
+
+- if (timing == MMC_TIMING_UHS_DDR50)
++ if (timing == MMC_TIMING_UHS_DDR50 ||
++ timing == MMC_TIMING_MMC_DDR52)
+ tegra_host->ddr_signaling = true;
+
+ return sdhci_set_uhs_signaling(host, timing);
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0030-apalis-tk1-enable-ddr52-mode-on-emmc.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0030-apalis-tk1-enable-ddr52-mode-on-emmc.patch
new file mode 100644
index 0000000..4111cb5
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0030-apalis-tk1-enable-ddr52-mode-on-emmc.patch
@@ -0,0 +1,49 @@
+From 41eac99552d6f0c1895e31b868d0a7cfa8334b4e Mon Sep 17 00:00:00 2001
+Message-Id: <41eac99552d6f0c1895e31b868d0a7cfa8334b4e.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 11 Jul 2018 10:38:06 +0200
+Subject: [PATCH 30/33] apalis-tk1: enable ddr52 mode on emmc
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 5 +++++
+ arch/arm/boot/dts/tegra124-apalis.dtsi | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+index 0620dcbe5817..08e4b08e26f8 100644
+--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
++++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+@@ -1939,6 +1939,11 @@
+ status = "okay";
+ bus-width = <8>;
+ non-removable;
++ vmmc-supply = <&reg_3v3>; /* VCC */
++ vqmmc-supply = <&vddio_1v8>; /* VCCQ */
++ /* SDR104/DDR50/SDR50 bits in CAPA2 is not supported */
++ sdhci-caps-mask = <0x7 0x0>;
++ mmc-ddr-1_8v;
+ };
+
+ /* CPU DFLL clock */
+diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
+index 8f80a8cf6a05..a19844e61adc 100644
+--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
++++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
+@@ -1949,6 +1949,11 @@
+ status = "okay";
+ bus-width = <8>;
+ non-removable;
++ vmmc-supply = <&reg_3v3>; /* VCC */
++ vqmmc-supply = <&vddio_1v8>; /* VCCQ */
++ /* SDR104/DDR50/SDR50 bits in CAPA2 is not supported */
++ sdhci-caps-mask = <0x7 0x0>;
++ mmc-ddr-1_8v;
+ };
+
+ /* CPU DFLL clock */
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch
new file mode 100644
index 0000000..1a38fd1
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch
@@ -0,0 +1,104 @@
+From afd589352be71175ac13a3c7139eae7724a37460 Mon Sep 17 00:00:00 2001
+Message-Id: <afd589352be71175ac13a3c7139eae7724a37460.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 11 Jul 2018 10:58:19 +0200
+Subject: [PATCH 31/33] apalis-tk1: force fixed ids for sdmmc controllers
+
+The following, together with kernel patches, forces a fixed assignment
+between device id and sdmmc controller.
+
+I.e. the eMMC on SDMMC4 will be /dev/mmcblk0.
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ arch/arm/boot/dts/tegra124-apalis-eval.dts | 16 ++++++++++++++--
+ arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 16 ++++++++++++++--
+ 2 files changed, 28 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
+index ecffcd115fa7..7e2b9cf84741 100644
+--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
++++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
+@@ -49,6 +49,18 @@
+ compatible = "toradex,apalis-tk1-eval", "toradex,apalis-tk1",
+ "nvidia,tegra124";
+
++ aliases {
++ /*
++ * The following, together with kernel patches, forces a fixed
++ * assignment between device id and SDMMC controllers.
++ *
++ * I.e. the eMMC on SDMMC4 will be /dev/mmcblk0.
++ */
++ mmc0 = "/sdhci@700b0600"; /* eMMC */
++ mmc1 = &mmc1; /* MMC1 slot */
++ mmc2 = &sd1; /* SD1 slot */
++ };
++
+ aliases {
+ rtc0 = "/i2c@7000c000/rtc@68";
+ rtc1 = "/i2c@7000d000/pmic@40";
+@@ -176,7 +188,7 @@
+ };
+
+ /* Apalis MMC1 */
+- sdhci@700b0000 {
++ mmc1: sdhci@700b0000 {
+ status = "okay";
+ /* MMC1_CD# */
+ cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
+@@ -185,7 +197,7 @@
+ };
+
+ /* Apalis SD1 */
+- sdhci@700b0400 {
++ sd1: sdhci@700b0400 {
+ status = "okay";
+ /* SD1_CD# */
+ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
+diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+index 8a8d5fa0ecd1..046a415d5db8 100644
+--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
++++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+@@ -13,6 +13,18 @@
+ compatible = "toradex,apalis-tk1-v1.2-eval", "toradex,apalis-tk1-eval",
+ "toradex,apalis-tk1", "nvidia,tegra124";
+
++ aliases {
++ /*
++ * The following, together with kernel patches, forces a fixed
++ * assignment between device id and SDMMC controllers.
++ *
++ * I.e. the eMMC on SDMMC4 will be /dev/mmcblk0.
++ */
++ mmc0 = "/sdhci@700b0600"; /* eMMC */
++ mmc1 = &mmc1; /* MMC1 slot */
++ mmc2 = &sd1; /* SD1 slot */
++ };
++
+ aliases {
+ rtc0 = "/i2c@7000c000/rtc@68";
+ rtc1 = "/i2c@7000d000/pmic@40";
+@@ -140,7 +152,7 @@
+ };
+
+ /* Apalis MMC1 */
+- sdhci@700b0000 {
++ mmc1: sdhci@700b0000 {
+ status = "okay";
+ /* MMC1_CD# */
+ cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
+@@ -149,7 +161,7 @@
+ };
+
+ /* Apalis SD1 */
+- sdhci@700b0400 {
++ sd1: sdhci@700b0400 {
+ status = "okay";
+ /* SD1_CD# */
+ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0032-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0032-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch
new file mode 100644
index 0000000..e0f2483
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0032-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch
@@ -0,0 +1,329 @@
+From 7e4a3d7ee5cf304ce0c5a5be6e1dcb7cafc34a1b Mon Sep 17 00:00:00 2001
+Message-Id: <7e4a3d7ee5cf304ce0c5a5be6e1dcb7cafc34a1b.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 11 Jul 2018 15:44:16 +0200
+Subject: [PATCH 32/33] apalis-tk1: fix pcie reset for reliable gigabit
+ ethernet operation
+
+It turns out that the forward port of the current PCIe reset
+implementation was not quite working reliably due to differences in
+regulator naming. Another shortcoming was that it currently resets
+multiple times due to not differentiating which PCIe port needs
+resetting. Improve this by doing specific reset per port only.
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 10 --
+ arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 20 ---
+ arch/arm/boot/dts/tegra124-apalis.dtsi | 2 -
+ drivers/pci/host/pci-tegra.c | 171 ++++++++++++++----------
+ 4 files changed, 103 insertions(+), 100 deletions(-)
+
+diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+index 046a415d5db8..4f2e4766379d 100644
+--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
++++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+@@ -250,13 +250,3 @@
+ vin-supply = <&reg_5v0>;
+ };
+ };
+-
+-&gpio {
+- /* Apalis GPIO7 MXM3 pin 15 PLX PEX 8605 PCIe Switch Reset */
+- pex_perst_n {
+- gpio-hog;
+- gpios = <TEGRA_GPIO(DD, 1) GPIO_ACTIVE_HIGH>;
+- output-high;
+- line-name = "PEX_PERST_N";
+- };
+-};
+diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+index 08e4b08e26f8..1336e8caf95d 100644
+--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
++++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+@@ -1721,14 +1721,12 @@
+ regulator-name = "+V3.3_ETH(ldo9)";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+- regulator-always-on;
+ };
+
+ ldo10 {
+ regulator-name = "+V3.3_ETH(ldo10)";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+- regulator-always-on;
+ };
+
+ ldo11 {
+@@ -2065,21 +2063,3 @@
+ };
+ };
+ };
+-
+-&gpio {
+- /* I210 Gigabit Ethernet Controller Reset */
+- lan_reset_n {
+- gpio-hog;
+- gpios = <TEGRA_GPIO(S, 2) GPIO_ACTIVE_HIGH>;
+- output-high;
+- line-name = "LAN_RESET_N";
+- };
+-
+- /* Control MXM3 pin 26 Reset Module Output Carrier Input */
+- reset_moci_ctrl {
+- gpio-hog;
+- gpios = <TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
+- output-high;
+- line-name = "RESET_MOCI_CTRL";
+- };
+-};
+diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
+index a19844e61adc..00920c26f60a 100644
+--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
++++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
+@@ -1756,14 +1756,12 @@
+ regulator-name = "+V3.3_ETH(ldo9)";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+- regulator-always-on;
+ };
+
+ ldo10 {
+ regulator-name = "+V3.3_ETH(ldo10)";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+- regulator-always-on;
+ };
+
+ ldo11 {
+diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
+index 0c6237159243..0e19ff52275e 100644
+--- a/drivers/pci/host/pci-tegra.c
++++ b/drivers/pci/host/pci-tegra.c
+@@ -333,6 +333,9 @@ struct tegra_pcie {
+ struct regulator_bulk_data *supplies;
+ unsigned int num_supplies;
+
++#ifdef CONFIG_MACH_APALIS_T30
++ int pci_reset_status;
++#endif
+ #ifdef CONFIG_MACH_APALIS_TK1
+ struct regulator *regulator_apalis_tk1_ldo9;
+ struct regulator *regulator_apalis_tk1_ldo10;
+@@ -584,58 +587,82 @@ static void tegra_pcie_port_reset(struct tegra_pcie_port *port)
+ unsigned long value;
+
+ #if defined(CONFIG_MACH_APALIS_T30) || defined(CONFIG_MACH_APALIS_TK1)
++#ifdef CONFIG_MACH_APALIS_T30
+ /*
+- * Reset PLX PEX 8605 PCIe Switch plus PCIe devices on Apalis Evaluation
+- * Board
++ * Apalis PCIe aka port 1 and Apalis Type Specific 4 Lane PCIe aka port
++ * 0 share the same RESET_MOCI therefore only assert it once for both
++ * ports to avoid loosing the previously brought up port again.
+ */
+- if (g_pex_perst)
+- gpio_request(PEX_PERST_N, "PEX_PERST_N");
+- gpio_request(RESET_MOCI_N, "RESET_MOCI_N");
+- if (g_pex_perst)
+- gpio_direction_output(PEX_PERST_N, 0);
+- gpio_direction_output(RESET_MOCI_N, 0);
+-
++ if ((port->index == 1) || (port->index == 0)) {
++ /* only do it once per init cycle */
++ if (port->pcie->pci_reset_status % 2 == 0) {
++#endif
+ #ifdef CONFIG_MACH_APALIS_TK1
+- /* Reset I210 Gigabit Ethernet Controller */
+- if (LAN_RESET_N) {
+- gpio_request(LAN_RESET_N, "LAN_RESET_N");
+- gpio_direction_output(LAN_RESET_N, 0);
++ if (port->index == 0) { /* Apalis PCIe */
++#endif
++ /*
++ * Reset PLX PEX 8605 PCIe Switch plus PCIe devices on Apalis Evaluation
++ * Board
++ */
++ if (g_pex_perst)
++ gpio_request(PEX_PERST_N, "PEX_PERST_N");
++ gpio_request(RESET_MOCI_N, "RESET_MOCI_N");
++ if (g_pex_perst)
++ gpio_direction_output(PEX_PERST_N, 0);
++ gpio_direction_output(RESET_MOCI_N, 0);
++#ifdef CONFIG_MACH_APALIS_T30
++ }
++#endif
+ }
++#ifdef CONFIG_MACH_APALIS_TK1
++ if (port->index == 1) { /* I210 Gigabit Ethernet Controller (On-module) */
++ /* Reset I210 Gigabit Ethernet Controller */
++ if (LAN_RESET_N >= 0) {
++ gpio_request(LAN_RESET_N, "LAN_RESET_N");
++ gpio_direction_output(LAN_RESET_N, 0);
++ }
+
+- /*
+- * Make sure we don't get any back feeding from LAN_WAKE_N resp.
+- * DEV_OFF_N
+- */
+- gpio_request(LAN_WAKE_N, "LAN_WAKE_N");
+- gpio_request(LAN_DEV_OFF_N, "LAN_DEV_OFF_N");
+- gpio_direction_output(LAN_WAKE_N, 0);
+- gpio_direction_output(LAN_DEV_OFF_N, 0);
+-
+- /* Make sure LDO9 and LDO10 are initially disabled @ 0V */
+- if (regulator_is_enabled(port->pcie->regulator_apalis_tk1_ldo9))
+- regulator_disable(port->pcie->regulator_apalis_tk1_ldo9);
+- if (regulator_is_enabled(port->pcie->regulator_apalis_tk1_ldo10))
+- regulator_disable(port->pcie->regulator_apalis_tk1_ldo10);
++ /*
++ * Make sure we don't get any back feeding from LAN_WAKE_N resp.
++ * DEV_OFF_N
++ */
++ gpio_request(LAN_WAKE_N, "LAN_WAKE_N");
++ gpio_request(LAN_DEV_OFF_N, "LAN_DEV_OFF_N");
++ gpio_direction_output(LAN_WAKE_N, 0);
++ gpio_direction_output(LAN_DEV_OFF_N, 0);
++
++ /* Make sure LDO9 and LDO10 are initially disabled @ 0V */
++ if (regulator_is_enabled(port->pcie->regulator_apalis_tk1_ldo9)) {
++ value = regulator_enable(port->pcie->regulator_apalis_tk1_ldo9);
++ if (regulator_disable(port->pcie->regulator_apalis_tk1_ldo9) < 0)
++ pr_err("failed disabling +V3.3_ETH(ldo9)\n");
++ }
++ if (regulator_is_enabled(port->pcie->regulator_apalis_tk1_ldo10)) {
++ value = regulator_enable(port->pcie->regulator_apalis_tk1_ldo10);
++ if (regulator_disable(port->pcie->regulator_apalis_tk1_ldo10) <0)
++ pr_err("failed disabling +V3.3_ETH(ldo10)\n");
++ }
+
+- mdelay(100);
++ mdelay(100);
+
+- /* Make sure LAN_WAKE_N gets re-configured as a GPIO input */
+- gpio_direction_input(LAN_WAKE_N);
++ /* Make sure LAN_WAKE_N gets re-configured as a GPIO input */
++ gpio_direction_input(LAN_WAKE_N);
+
+- /* Make sure controller gets enabled by disabling DEV_OFF_N */
+- gpio_set_value(LAN_DEV_OFF_N, 1);
++ /* Make sure controller gets enabled by disabling DEV_OFF_N */
++ gpio_set_value(LAN_DEV_OFF_N, 1);
+
+- /*
+- * Enable LDO9 and LDO10 for +V3.3_ETH on patched prototype
+- * V1.0A and sample V1.0B and newer modules
+- */
+- if (regulator_enable(port->pcie->regulator_apalis_tk1_ldo9) < 0) {
+- pr_err("pcie: couldn't enable regulator i210_vdd3p3_ldo9\n");
+- return;
+- }
+- if (regulator_enable(port->pcie->regulator_apalis_tk1_ldo10) < 0) {
+- pr_err("pcie: couldn't enable regulator i210_vdd3p3_ldo10\n");
+- return;
++ /*
++ * Enable LDO9 and LDO10 for +V3.3_ETH on patched prototype
++ * V1.0A and sample V1.0B and newer modules
++ */
++ if (regulator_enable(port->pcie->regulator_apalis_tk1_ldo9) < 0) {
++ pr_err("pcie: couldn't enable regulator +V3.3_ETH(ldo9)\n");
++ return;
++ }
++ if (regulator_enable(port->pcie->regulator_apalis_tk1_ldo10) < 0) {
++ pr_err("pcie: couldn't enable regulator +V3.3_ETH(ldo10)\n");
++ return;
++ }
+ }
+ #endif /* CONFIG_MACH_APALIS_TK1 */
+ #endif /* CONFIG_MACH_APALIS_T30 || CONFIG_MACH_APALIS_TK1 */
+@@ -652,25 +679,38 @@ static void tegra_pcie_port_reset(struct tegra_pcie_port *port)
+ afi_writel(port->pcie, value, ctrl);
+
+ #if defined(CONFIG_MACH_APALIS_T30) || defined(CONFIG_MACH_APALIS_TK1)
++#ifdef CONFIG_MACH_APALIS_T30
++ if ((port->index == 1) || (port->index == 0)) {
++ /* only do it once per init cycle */
++ if (port->pcie->pci_reset_status % 2 == 0) {
++#endif
+ #ifdef CONFIG_MACH_APALIS_TK1
+- gpio_set_value(LAN_RESET_N, 1);
+-#endif /* CONFIG_MACH_APALIS_TK1 */
+-
+- /* Must be asserted for 100 ms after power and clocks are stable */
+- if (g_pex_perst)
+- gpio_set_value(PEX_PERST_N, 1);
+- /*
+- * Err_5: PEX_REFCLK_OUTpx/nx Clock Outputs is not Guaranteed Until
+- * 900 us After PEX_PERST# De-assertion
+- */
+- if (g_pex_perst)
+- mdelay(1);
+- gpio_set_value(RESET_MOCI_N, 1);
++ if (port->index == 0) { /* Apalis PCIe */
++#endif
++ /* Must be asserted for 100 ms after power and clocks are stable */
++ if (g_pex_perst)
++ gpio_set_value(PEX_PERST_N, 1);
++ /*
++ * Err_5: PEX_REFCLK_OUTpx/nx Clock Outputs is not Guaranteed Until
++ * 900 us After PEX_PERST# De-assertion
++ */
++ if (g_pex_perst)
++ mdelay(1);
++ gpio_set_value(RESET_MOCI_N, 1);
++#ifdef CONFIG_MACH_APALIS_T30
++ }
++ port->pcie->pci_reset_status++;
++#endif
++ }
+
+ #ifdef CONFIG_MACH_APALIS_TK1
+- /* Release I210 Gigabit Ethernet Controller Reset */
+- if (LAN_RESET_N)
+- gpio_set_value(LAN_RESET_N, 1);
++ mdelay(5);
++
++ if (port->index == 1) { /* I210 Gigabit Ethernet Controller (On-module) */
++ /* Release I210 Gigabit Ethernet Controller Reset */
++ if (LAN_RESET_N >= 0)
++ gpio_set_value(LAN_RESET_N, 1);
++ }
+ #endif /* CONFIG_MACH_APALIS_TK1 */
+ #endif /* CONFIG_MACH_APALIS_T30 || CONFIG_MACH_APALIS_TK1 */
+ }
+@@ -1232,25 +1272,20 @@ static int tegra_pcie_power_on(struct tegra_pcie *pcie)
+
+ #ifdef CONFIG_MACH_APALIS_TK1
+ if (pcie->regulator_apalis_tk1_ldo9 == NULL) {
+- pcie->regulator_apalis_tk1_ldo9 = regulator_get(pcie->dev, "i210_vdd3p3_ldo9");
++ pcie->regulator_apalis_tk1_ldo9 = regulator_get(pcie->dev, "+V3.3_ETH(ldo9)");
+ if (IS_ERR(pcie->regulator_apalis_tk1_ldo9)) {
+- pr_err("pcie: couldn't get regulator i210_vdd3p3_ldo9\n");
++ pr_err("pcie: couldn't get regulator +V3.3_ETH(ldo9)\n");
+ pcie->regulator_apalis_tk1_ldo9 = 0;
+ }
+ }
+
+ if (pcie->regulator_apalis_tk1_ldo10 == NULL) {
+- pcie->regulator_apalis_tk1_ldo10 = regulator_get(pcie->dev, "i210_vdd3p3_ldo10");
++ pcie->regulator_apalis_tk1_ldo10 = regulator_get(pcie->dev, "+V3.3_ETH(ldo10)");
+ if (IS_ERR(pcie->regulator_apalis_tk1_ldo10)) {
+- pr_err("pcie: couldn't get regulator i210_vdd3p3_ldo10\n");
++ pr_err("pcie: couldn't get regulator +V3.3_ETH(ldo10)\n");
+ pcie->regulator_apalis_tk1_ldo10 = 0;
+ }
+ }
+-
+- if (pcie->regulator_apalis_tk1_ldo9)
+- err = regulator_enable(pcie->regulator_apalis_tk1_ldo9);
+- if (pcie->regulator_apalis_tk1_ldo10)
+- err = regulator_enable(pcie->regulator_apalis_tk1_ldo10);
+ #endif /* CONFIG_MACH_APALIS_TK1 */
+
+ reset_control_deassert(pcie->afi_rst);
+--
+2.14.4
+
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/apalis-t30-mainline/0024-apalis-t30-mainline-apply-pcie-fix-hacks.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/apalis-t30-mainline/0033-apalis-t30-mainline-apply-pcie-fix-hacks.patch
index 22975ec..d6539d0 100644
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/apalis-t30-mainline/0024-apalis-t30-mainline-apply-pcie-fix-hacks.patch
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/apalis-t30-mainline/0033-apalis-t30-mainline-apply-pcie-fix-hacks.patch
@@ -1,10 +1,10 @@
-From 50c98b667b749119f705504d0a4ff752c27be5ec Mon Sep 17 00:00:00 2001
-Message-Id: <50c98b667b749119f705504d0a4ff752c27be5ec.1529072479.git.marcel.ziswiler@toradex.com>
-In-Reply-To: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
-References: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com>
+From f91b1e8680a93b6d33af3380e24bd2f9501c30c5 Mon Sep 17 00:00:00 2001
+Message-Id: <f91b1e8680a93b6d33af3380e24bd2f9501c30c5.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Date: Fri, 20 Apr 2018 10:07:58 +0200
-Subject: [PATCH 24/27] apalis-t30-mainline: apply pcie fix hacks
+Subject: [PATCH 33/33] apalis-t30-mainline: apply pcie fix hacks
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
@@ -12,7 +12,7 @@ Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
-index 0c6237159243..bdc7e7592cc8 100644
+index 0e19ff52275e..ad7385525964 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -51,8 +51,8 @@
diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
index 9db0268..6d534c1 100644
--- a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
+++ b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
@@ -36,15 +36,25 @@ GENERIC_PATCHES = " \
file://0016-Revert-mmc-core-simplify-ida-handling.patch \
file://0017-mmc-read-mmc-alias-from-device-tree.patch \
file://0018-apalis-t30-mainline-force-fixed-ids-for-sdmmc-contro.patch \
- file://0020-ARM-tegra-apalis-tk1-Fix-high-speed-UART-compatible.patch \
- file://0021-apalis-t30-tk1-mainline-igb-avoid-nvm-checksum-failu.patch \
- file://0022-apalis_t30-fix-can2.patch \
- file://0023-mfd-as3722-disable-auto-power-on-when-AC-OK.patch \
+ file://0019-ARM-tegra-apalis-tk1-Fix-high-speed-UART-compatible.patch \
+ file://0020-apalis-t30-tk1-mainline-igb-avoid-nvm-checksum-failu.patch \
+ file://0021-apalis_t30-fix-can2.patch \
+ file://0022-mfd-as3722-disable-auto-power-on-when-AC-OK.patch \
+ file://0023-apalis-tk1-mfd-k20-update-api-header-for-fw-version-.patch \
+ file://0024-apalis_t30-enable-broken-hpi-on-emmc.patch \
+ file://0025-tegra_defconfig-disable-sound-in-tezi-configuration.patch \
+ file://0026-apalis_t30-fix-mmc1-cmd-pull-up.patch \
+ file://0027-apalis_t30-pull-up-sd-card-detect-pins.patch \
+ file://0028-Revert-mmc-tegra-Disable-UHS-I-modes-for-Tegra124.patch \
+ file://0029-mmc-tegra-fix-eMMC-DDR-mode.patch \
+ file://0030-apalis-tk1-enable-ddr52-mode-on-emmc.patch \
+ file://0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch \
+ file://0032-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch \
"
MACHINE_PATCHES = " \
"
MACHINE_PATCHES_apalis-t30-mainline = " \
- file://0024-apalis-t30-mainline-apply-pcie-fix-hacks.patch \
+ file://0033-apalis-t30-mainline-apply-pcie-fix-hacks.patch \
"
SRC_URI = " \
https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \