diff options
12 files changed, 111 insertions, 177 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0001-toradex_apalis_tk1_t30-customize-defconfig.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0001-apalis-t30-tk1-mainline-customize-defconfig.patch index fc3904b..e281c89 100644 --- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0001-toradex_apalis_tk1_t30-customize-defconfig.patch +++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0001-apalis-t30-tk1-mainline-customize-defconfig.patch @@ -1,15 +1,16 @@ -From 8d39626d07718220b426e9be045df8ed9d1fd707 Mon Sep 17 00:00:00 2001 -Message-Id: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> +From fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3 Mon Sep 17 00:00:00 2001 +Message-Id: <fb4764e8eb658d35e8fc62ae79c77e1f6e2b0ef3.1529072479.git.marcel.ziswiler@toradex.com> From: Dominik Sliwa <dominik.sliwa@toradex.com> Date: Thu, 15 Dec 2016 10:40:06 +0100 -Subject: [PATCH 1/8] toradex_apalis_tk1_t30: customize defconfig +Subject: [PATCH 01/27] apalis-t30/tk1-mainline: customize defconfig +Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> --- arch/arm/configs/tegra_defconfig | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig -index 6678f29..cb97ea2 100644 +index 6678f2929356..cb97ea2db1e0 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -104,9 +104,21 @@ CONFIG_USB_PEGASUS=y @@ -80,5 +81,5 @@ index 6678f29..cb97ea2 100644 CONFIG_TMPFS=y CONFIG_TMPFS_POSIX_ACL=y -- -2.9.5 +2.14.4 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 9c4436d..324294b 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 fc37cb5b5f68acc1548ebdc7750d5e04dd616bde Mon Sep 17 00:00:00 2001 -Message-Id: <fc37cb5b5f68acc1548ebdc7750d5e04dd616bde.1510580437.git.marcel.ziswiler@toradex.com> -In-Reply-To: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> -References: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> +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: Marcel Ziswiler <marcel.ziswiler@toradex.com> Date: Thu, 15 Dec 2016 10:24:58 +0100 -Subject: [PATCH 2/8] apalis_t30/tk1: fix pcie clock and reset not conforming +Subject: [PATCH 02/27] apalis_t30/tk1: fix pcie clock and reset not conforming to specification Fix PCIe clock and reset not conforming to specification by moving PCIe @@ -29,7 +29,7 @@ a2f63805703b43d55d91ae17f10d0049bf0f625e) 1 file changed, 88 insertions(+) diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c -index 1987fec..5c7916b 100644 +index 1987fec1f126..5c7916b5de73 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -51,6 +51,34 @@ @@ -149,5 +149,5 @@ index 1987fec..5c7916b 100644 static void tegra_pcie_port_enable(struct tegra_pcie_port *port) -- -2.9.5 +2.14.4 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 7ff1c96..459ba10 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 3facf94b99d303357bb7d2188174eae38401f294 Mon Sep 17 00:00:00 2001 -Message-Id: <3facf94b99d303357bb7d2188174eae38401f294.1510580437.git.marcel.ziswiler@toradex.com> -In-Reply-To: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> -References: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> +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: Marcel Ziswiler <marcel.ziswiler@toradex.com> Date: Thu, 15 Dec 2016 10:55:11 +0100 -Subject: [PATCH 3/8] igb: integrate tools only device support +Subject: [PATCH 03/27] 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, @@ -12,7 +12,6 @@ not for driver. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com> - (cherry picked from toradex_tk1_l4t_r21.5 commit 783780c43fd4e1473fb64790c8b9e0adb2be04a3) (cherry picked from tegra commit @@ -24,7 +23,7 @@ Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com> 3 files changed, 6 insertions(+) diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c -index c37cc8b..d38d8a7 100644 +index c37cc8bccf47..d38d8a76ce92 100644 --- a/drivers/net/ethernet/intel/igb/e1000_82575.c +++ b/drivers/net/ethernet/intel/igb/e1000_82575.c @@ -625,6 +625,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) @@ -44,7 +43,7 @@ index c37cc8b..d38d8a7 100644 mac->type = e1000_i211; break; diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h -index 6c9485a..a3827f1 100644 +index 6c9485ab4b57..a3827f182df9 100644 --- a/drivers/net/ethernet/intel/igb/e1000_hw.h +++ b/drivers/net/ethernet/intel/igb/e1000_hw.h @@ -58,6 +58,8 @@ struct e1000_hw; @@ -57,7 +56,7 @@ index 6c9485a..a3827f1 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 ea69af2..a060fc2 100644 +index d1a44a84c97e..77e74be9c70d 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[] = { @@ -71,5 +70,5 @@ index ea69af2..a060fc2 100644 { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_FIBER), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_I210_SERDES), board_82575 }, -- -2.9.5 +2.14.4 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 0613617..ed97b36 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 d912735d53757d9b525ee7f016020400be458867 Mon Sep 17 00:00:00 2001 -Message-Id: <d912735d53757d9b525ee7f016020400be458867.1510580437.git.marcel.ziswiler@toradex.com> -In-Reply-To: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> -References: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> +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: Marcel Ziswiler <marcel.ziswiler@toradex.com> Date: Thu, 15 Dec 2016 10:55:54 +0100 -Subject: [PATCH 4/8] apalis_t30/tk1: igb: no nvm and Ethernet MAC address +Subject: [PATCH 04/27] apalis_t30/tk1: igb: no nvm and Ethernet MAC address handling Only warn rather than fail on NVM validation failures on Apalis T30 and @@ -28,7 +28,6 @@ blank NVMs as well as iNVMs programmed with Intel's defaults. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com> - (cherry picked from toradex_tk1_l4t_r21.5 commit 70efa60d96c9f05d91d8875eee97446df7f9e877) (cherry picked from tegra commit @@ -38,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 a060fc2..c872c15 100644 +index 77e74be9c70d..c2e8a3654119 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -55,6 +55,7 @@ @@ -133,5 +132,5 @@ index a060fc2..c872c15 100644 igb_set_default_mac_filter(adapter); -- -2.9.5 +2.14.4 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 54bae71..a029a83 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 0a6205b902807ab567285048b5094bdbbca4d262 Mon Sep 17 00:00:00 2001 -Message-Id: <0a6205b902807ab567285048b5094bdbbca4d262.1510580437.git.marcel.ziswiler@toradex.com> -In-Reply-To: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> -References: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> +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: Marcel Ziswiler <marcel.ziswiler@toradex.com> Date: Thu, 15 Dec 2016 10:56:26 +0100 -Subject: [PATCH 5/8] mmc: tegra: apalis-tk1: hack to make sd1 functional +Subject: [PATCH 05/27] 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 @@ -12,7 +12,6 @@ SDMMC_VENDOR_MISC_CNTRL_0 register's SDMMC_SPARE1 bits being set to Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com> - (cherry picked from toradex_tk1_l4t_r21.5 commit fc14b7601e5ca587afd97936ef3fd599f4e9281c) --- @@ -20,7 +19,7 @@ fc14b7601e5ca587afd97936ef3fd599f4e9281c) 1 file changed, 11 insertions(+) diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c -index 0cd6fa8..327883d 100644 +index 0cd6fa80db66..327883d86b33 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -43,6 +43,7 @@ @@ -49,5 +48,5 @@ index 0cd6fa8..327883d 100644 sdhci_writel(host, clk_ctrl, SDHCI_TEGRA_VENDOR_CLOCK_CTRL); -- -2.9.5 +2.14.4 diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0006-tegra_defconfig-snapd-squashfs-configuration.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0006-apalis-colibri_t30-apalis-tk1-snapd-squashfs-configu.patch index c8fa537..a007629 100644 --- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0006-tegra_defconfig-snapd-squashfs-configuration.patch +++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0006-apalis-colibri_t30-apalis-tk1-snapd-squashfs-configu.patch @@ -1,20 +1,25 @@ -From b05bf63df5d97e6260ea26ca90247613abc38c08 Mon Sep 17 00:00:00 2001 -Message-Id: <b05bf63df5d97e6260ea26ca90247613abc38c08.1510580437.git.marcel.ziswiler@toradex.com> -In-Reply-To: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> -References: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> +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: Marcel Ziswiler <marcel.ziswiler@toradex.com> Date: Sun, 18 Jun 2017 01:23:26 +0200 -Subject: [PATCH 6/8] tegra_defconfig: snapd squashfs configuration +Subject: [PATCH 06/27] apalis/colibri_t30, apalis-tk1: snapd squashfs + configuration Prepare for snapd integration. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> +Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com> +(downstream tegra commit a24d47d56d9f5a6ed1ec3a42c6d9ccf5748bc2ba) +(downstream toradex_tk1_l4t_r21.5 commit +f328e55a793497870c533eac0ac21cb735a82e6d) --- arch/arm/configs/tegra_defconfig | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig -index cb97ea2..cfe997c 100644 +index cb97ea2db1e0..cfe997c617fc 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@ -295,7 +295,12 @@ CONFIG_AUTOFS4_FS=y @@ -32,5 +37,5 @@ index cb97ea2..cfe997c 100644 CONFIG_SQUASHFS_XZ=y CONFIG_NFS_FS=y -- -2.9.5 +2.14.4 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 359cbc0..617992c 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,10 +1,7 @@ -From b2fd39d0358d3a8847835ef57cc32f1ab2821e40 Mon Sep 17 00:00:00 2001 -Message-Id: <b2fd39d0358d3a8847835ef57cc32f1ab2821e40.1510580437.git.marcel.ziswiler@toradex.com> -In-Reply-To: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> -References: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> +From 4957a2f1f2205214b2ca325872a7508fa91e1096 Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler <marcel.ziswiler@toradex.com> -Date: Mon, 2 Oct 2017 09:27:16 +0200 -Subject: [PATCH 7/8] ARM: tegra: apalis-tk1: support v1.2 hardware revision +Date: Sat, 10 Feb 2018 02:38:06 +0100 +Subject: ARM: tegra: apalis-tk1: Support v1.2 hardware revision Support the V1.2 hardware revision with the following pin muxing changes: @@ -19,19 +16,20 @@ Usb_vbus_en0_pn4 and usb_vbus_en1_pn5 previously used as USB power enable signals are now used as GPIO3 and GPIO4. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> +Signed-off-by: Thierry Reding <treding@nvidia.com> --- arch/arm/boot/dts/Makefile | 1 + - arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 299 ++++ - arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2070 +++++++++++++++++++++++ - 3 files changed, 2370 insertions(+) + arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 250 +++ + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 2052 +++++++++++++++++++++++ + 3 files changed, 2303 insertions(+) create mode 100644 arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts 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 faf46ab..8451af8 100644 +index ade7a38..9d88274 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -960,6 +960,7 @@ dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \ +@@ -1022,6 +1022,7 @@ dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \ tegra114-tn7.dtb dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \ tegra124-apalis-eval.dtb \ @@ -41,49 +39,13 @@ index faf46ab..8451af8 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..c61eb59 +index 0000000..8a8d5fa --- /dev/null +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts -@@ -0,0 +1,299 @@ +@@ -0,0 +1,250 @@ ++// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* -+ * Copyright 2016-2017 Toradex AG -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * version 2 as published by the Free Software Foundation. -+ * -+ * This file is distributed in the hope that it will be useful -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. ++ * Copyright 2016-2018 Toradex AG + */ + +/dts-v1/; @@ -161,7 +123,7 @@ index 0000000..c61eb59 + + /* M41T0M6 real time clock on carrier board */ + rtc@68 { -+ compatible = "st,m41t00"; ++ compatible = "st,m41t0"; + reg = <0x68>; + }; + }; @@ -178,7 +140,8 @@ index 0000000..c61eb59 + }; + + /* -+ * I2C4 (DDC): I2C4_SDA/SCL (DDC) on MXM3 pin 205/207 (e.g. display EDID) ++ * I2C4 (DDC): I2C4_SDA/SCL (DDC) on MXM3 pin 205/207 ++ * (e.g. display EDID) + */ + hdmi_ddc: i2c@7000c700 { + status = "okay"; @@ -272,8 +235,7 @@ index 0000000..c61eb59 + + backlight: backlight { + compatible = "pwm-backlight"; -+ /* BKL1_PWM */ -+ pwms = <&pwm 3 5000000>; ++ pwms = <&pwm 3 5000000>; /* BKL1_PWM */ + brightness-levels = <255 231 223 207 191 159 127 0>; + default-brightness-level = <6>; + /* BKL1_ON */ @@ -323,72 +285,23 @@ index 0000000..c61eb59 +}; + +&gpio { -+ lan_reset_n { -+ gpio-hog; -+ gpios = <TEGRA_GPIO(S, 2) GPIO_ACTIVE_HIGH>; -+ output-high; -+ line-name = "LAN_RESET_N"; -+ }; -+ ++ /* 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"; + }; -+ -+ 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-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi new file mode 100644 -index 0000000..c2b14e69 +index 0000000..bb67edb --- /dev/null +++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi -@@ -0,0 +1,2070 @@ +@@ -0,0 +1,2052 @@ ++// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* -+ * Copyright 2016-2017 Toradex AG -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * version 2 as published by the Free Software Foundation. -+ * -+ * This file is distributed in the hope that it will be useful -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. ++ * Copyright 2016-2018 Toradex AG + */ + +#include "tegra124.dtsi" @@ -2420,6 +2333,24 @@ index 0000000..c2b14e69 + }; + }; +}; ++ ++&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"; ++ }; ++}; -- -2.9.5 +cgit v1.1 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 50d7407..f97269c 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,11 +1,11 @@ -From ea64a271a36553990bb2a6cb40edfd929d8e6e88 Mon Sep 17 00:00:00 2001 -Message-Id: <ea64a271a36553990bb2a6cb40edfd929d8e6e88.1510580437.git.marcel.ziswiler@toradex.com> -In-Reply-To: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> -References: <8d39626d07718220b426e9be045df8ed9d1fd707.1510580437.git.marcel.ziswiler@toradex.com> +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: Marcel Ziswiler <marcel.ziswiler@toradex.com> Date: Mon, 13 Nov 2017 14:37:25 +0100 -Subject: [PATCH 8/8] apalis-tk1: fix pcie reset for reliable gigabit ethernet - operation +Subject: [PATCH 08/27] apalis-tk1: fix pcie reset for reliable gigabit + ethernet operation It turns out that the current PCIe reset implementation is not quite working reliably due to some Intel i210 errata. Fix this by making sure @@ -23,7 +23,7 @@ Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com> 1 file changed, 72 insertions(+) diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c -index 5c7916b..0c62371 100644 +index 5c7916b5de73..0c6237159243 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -71,8 +71,12 @@ @@ -136,5 +136,5 @@ index 5c7916b..0c62371 100644 err = clk_prepare_enable(pcie->afi_clk); -- -2.9.5 +2.14.4 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 8be8142..6e4752d 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,7 @@ From b6d7974d10b30bf3baed7e50d8e574f5184cfdd1 Mon Sep 17 00:00:00 2001 From: Thierry Reding <treding@nvidia.com> Date: Wed, 7 Feb 2018 18:45:54 +0100 -Subject: [PATCH] drm/tegra: gem: Reshuffle declarations +Subject: 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 +12,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 8eb9fd24ef0e..1fcf94dce45c 100644 +index 8eb9fd2..1fcf94d 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 +29,5 @@ index 8eb9fd24ef0e..1fcf94dce45c 100644 struct drm_gem_object *gem, int flags); -- -2.15.1 +cgit v1.1 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 2e80852..7fb4233 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,7 @@ From 04c0746663bd3ae3cce5e02d5b32c8ade2a833b8 Mon Sep 17 00:00:00 2001 From: Thierry Reding <treding@nvidia.com> Date: Wed, 7 Feb 2018 18:45:55 +0100 -Subject: [PATCH] drm/tegra: gem: Make __tegra_gem_mmap() available more widely +Subject: 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,7 +16,7 @@ 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 49b9bf28f872..d3b3aa148225 100644 +index 49b9bf2..d3b3aa1 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 = { @@ -48,7 +48,7 @@ index 49b9bf28f872..d3b3aa148225 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 1fcf94dce45c..6bd7dd7e55b4 100644 +index 1fcf94d..6bd7dd7 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 +60,5 @@ index 1fcf94dce45c..6bd7dd7e55b4 100644 struct dma_buf *tegra_gem_prime_export(struct drm_device *drm, -- -2.15.1 +cgit v1.1 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 7aa85ae..646073d 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,7 @@ From b8f3f500e09c2c457efc2fcbfe8b7f815f2e6a0e Mon Sep 17 00:00:00 2001 From: Thierry Reding <treding@nvidia.com> Date: Wed, 7 Feb 2018 18:45:56 +0100 -Subject: [PATCH] drm/tegra: fb: Implement ->fb_mmap() callback +Subject: 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 +19,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 001cb77e2f59..0786159edef3 100644 +index 001cb77..0786159 100644 --- a/drivers/gpu/drm/tegra/fb.c +++ b/drivers/gpu/drm/tegra/fb.c -@@ -224,12 +224,28 @@ struct drm_framebuffer *tegra_fb_create(struct drm_device *drm, +@@ -224,12 +224,28 @@ unreference: } #ifdef CONFIG_DRM_FBDEV_EMULATION @@ -52,5 +52,5 @@ index 001cb77e2f59..0786159edef3 100644 static int tegra_fbdev_probe(struct drm_fb_helper *helper, -- -2.15.1 +cgit v1.1 diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb index 6f23ae8..f90c5ea 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb @@ -17,13 +17,13 @@ PR = "${TDX_VER_ITEM}" PV = "${LINUX_VERSION}" S = "${WORKDIR}/linux-${PV}" TK1-PATCHES = " \ - file://0001-toradex_apalis_tk1_t30-customize-defconfig.patch \ + file://0001-apalis-t30-tk1-mainline-customize-defconfig.patch \ file://0002-apalis_t30-tk1-fix-pcie-clock-and-reset-not-conformi.patch \ file://0003-igb-integrate-tools-only-device-support.patch \ file://0004-apalis_t30-tk1-igb-no-nvm-and-Ethernet-MAC-address-h.patch \ file://0005-mmc-tegra-apalis-tk1-hack-to-make-sd1-functional.patch \ - file://0006-tegra_defconfig-snapd-squashfs-configuration.patch \ - file://0007-ARM-tegra-apalis-tk1-support-v1.2-hardware-revision.patch \ + file://0006-apalis-colibri_t30-apalis-tk1-snapd-squashfs-configu.patch \ + file://0007-ARM-tegra-apalis-tk1-Support-v1.2-hardware-revision.patch \ file://0008-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch \ file://0009-drm-tegra-gem-Reshuffle-declarations.patch \ file://0010-drm-tegra-gem-Make-__tegra_gem_mmap-available-more-w.patch \ |