diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2016-08-15 19:27:40 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2016-08-15 19:27:40 +0100 |
| commit | 5de569a890be505e0ec46d2b1c9691f0405a17c6 (patch) | |
| tree | dfccc18e70f240c154630305c8b837b38d6855d5 | |
| parent | 31b937e4709a4f5b1dd9da5bab9bd394fa9ba570 (diff) | |
| download | kernel-5de569a890be505e0ec46d2b1c9691f0405a17c6.tar.gz kernel-5de569a890be505e0ec46d2b1c9691f0405a17c6.tar.xz kernel-5de569a890be505e0ec46d2b1c9691f0405a17c6.zip | |
Enable Atmel i2c TPM on ARM platforms, Add upstream patch to fix boot on Jetson TK1
| -rw-r--r-- | ARM-tegra-fix-erroneous-address-in-dts.patch | 51 | ||||
| -rw-r--r-- | config-arm-generic | 1 | ||||
| -rw-r--r-- | kernel.spec | 6 |
3 files changed, 58 insertions, 0 deletions
diff --git a/ARM-tegra-fix-erroneous-address-in-dts.patch b/ARM-tegra-fix-erroneous-address-in-dts.patch new file mode 100644 index 000000000..88521751a --- /dev/null +++ b/ARM-tegra-fix-erroneous-address-in-dts.patch @@ -0,0 +1,51 @@ +From b5c86b7496d74f6e454bcab5166efa023e1f0459 Mon Sep 17 00:00:00 2001 +From: Ralf Ramsauer <ralf@ramses-pyramidenbau.de> +Date: Mon, 18 Jul 2016 11:46:48 +0200 +Subject: [PATCH 1731/1791] ARM: tegra: fix erroneous address in dts + +c90bb7b enabled the high speed UARTs of the Jetson TK1. Due to a merge +quirk, wrong addresses were introduced. Fix it and use the correct +addresses. + +Thierry let me know, that there is another patch (b5896f67ab3c in +linux-next) in preparation which removes all the '0,' prefixes of unit +addresses on Tegra124 and is planned to go upstream in 4.8, so +this patch will get reverted then. + +But for the moment, this patch is necessary to fix current misbehaviour. + +Fixes: c90bb7b9b9 ("ARM: tegra: Add high speed UARTs to Jetson TK1 device tree") +Signed-off-by: Ralf Ramsauer <ralf@ramses-pyramidenbau.de> +Acked-by: Thierry Reding <thierry.reding@gmail.com> +Cc: stable@vger.kernel.org # v4.7 +Cc: linux-tegra@vger.kernel.org +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +--- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts +index e52b824..6403e0d 100644 +--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts ++++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts +@@ -1382,7 +1382,7 @@ + * Pin 41: BR_UART1_TXD + * Pin 44: BR_UART1_RXD + */ +- serial@70006000 { ++ serial@0,70006000 { + compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; + status = "okay"; + }; +@@ -1394,7 +1394,7 @@ + * Pin 71: UART2_CTS_L + * Pin 74: UART2_RTS_L + */ +- serial@70006040 { ++ serial@0,70006040 { + compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; + status = "okay"; + }; +-- +2.9.2 + diff --git a/config-arm-generic b/config-arm-generic index f81cdb1f8..f8d6052d6 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -80,6 +80,7 @@ CONFIG_CRYPTO_SHA1_ARM=y CONFIG_CRYPTO_SHA256_ARM=y CONFIG_CRYPTO_SHA1_ARM_NEON=y CONFIG_CRYPTO_SHA512_ARM=y +CONFIG_TCG_TIS_I2C_ATMEL=m # EDAC CONFIG_EDAC=y diff --git a/kernel.spec b/kernel.spec index 9b6bdbb97..c543fdc5c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -519,6 +519,8 @@ Patch431: bcm283x-upstream-fixes.patch Patch432: arm-i.MX6-Utilite-device-dtb.patch +Patch433: ARM-tegra-fix-erroneous-address-in-dts.patch + Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch Patch466: input-kill-stupid-messages.patch @@ -2174,6 +2176,10 @@ fi # # %changelog +* Mon Aug 15 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Enable Atmel i2c TPM on ARM platforms +- Add upstream patch to fix boot on Jetson TK1 + * Mon Aug 08 2016 Josh Boyer <jwboyer@fedoraproject.org> - Build CONFIG_POWERNV_CPUFREQ in on ppc64* (rhbz 1351346) |