summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-06-18 03:39:48 +0200
committerStefan Agner <stefan.agner@toradex.com>2018-06-18 09:27:47 +0200
commit9026b9397dcb2e7fb150fcc7976c344d73392ab8 (patch)
treecfb96d5e7d980f5faf4ae6088e3ab3314d4cea94
parent8987b7e1754cbafc8e39682f093c8136a79a606b (diff)
linux-toradex-mainline: update to 4.14.50
Drop commit c35b518f9ba0 ("clk: tegra: Fix pll_u rate configuration") which meanwhile got merged into stable. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0019-clk-tegra-Fix-pll_u-rate-configuration.patch60
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline_4.14.bb7
2 files changed, 3 insertions, 64 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0019-clk-tegra-Fix-pll_u-rate-configuration.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0019-clk-tegra-Fix-pll_u-rate-configuration.patch
deleted file mode 100644
index 9c846b2..0000000
--- a/recipes-kernel/linux/linux-toradex-mainline-4.14/0019-clk-tegra-Fix-pll_u-rate-configuration.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 03f99b544b9e6e1e79bb73c9e35d3ea7047e706c Mon Sep 17 00:00:00 2001
-Message-Id: <03f99b544b9e6e1e79bb73c9e35d3ea7047e706c.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.com>
-Date: Fri, 23 Feb 2018 00:04:51 +0100
-Subject: [PATCH 19/27] clk: tegra: Fix pll_u rate configuration
-
-Turns out latest upstream U-Boot does not configure/enable pll_u which
-leaves it at some default rate of 500 kHz:
-
-root@apalis-t30:~# cat /sys/kernel/debug/clk/clk_summary | grep pll_u
- pll_u 3 3 0 500000 0
-
-Of course this won't quite work leading to the following messages:
-
-[ 6.559593] usb 2-1: new full-speed USB device number 2 using tegra-
-ehci
-[ 11.759173] usb 2-1: device descriptor read/64, error -110
-[ 27.119453] usb 2-1: device descriptor read/64, error -110
-[ 27.389217] usb 2-1: new full-speed USB device number 3 using tegra-
-ehci
-[ 32.559454] usb 2-1: device descriptor read/64, error -110
-[ 47.929777] usb 2-1: device descriptor read/64, error -110
-[ 48.049658] usb usb2-port1: attempt power cycle
-[ 48.759475] usb 2-1: new full-speed USB device number 4 using tegra-
-ehci
-[ 59.349457] usb 2-1: device not accepting address 4, error -110
-[ 59.509449] usb 2-1: new full-speed USB device number 5 using tegra-
-ehci
-[ 70.069457] usb 2-1: device not accepting address 5, error -110
-[ 70.079721] usb usb2-port1: unable to enumerate USB device
-
-Fix this by actually allowing the rate also being set from within
-the Linux kernel.
-
-Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-Tested-by: Jon Hunter <jonathanh@nvidia.com>
-Signed-off-by: Thierry Reding <treding@nvidia.com>
-(cherry picked from commit c35b518f9ba06c9de79fb3ff62eed7462d804995)
----
- drivers/clk/tegra/clk-pll.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/clk/tegra/clk-pll.c b/drivers/clk/tegra/clk-pll.c
-index 7c369e21c91c..830d1c87fa7c 100644
---- a/drivers/clk/tegra/clk-pll.c
-+++ b/drivers/clk/tegra/clk-pll.c
-@@ -1151,6 +1151,8 @@ static const struct clk_ops tegra_clk_pllu_ops = {
- .enable = clk_pllu_enable,
- .disable = clk_pll_disable,
- .recalc_rate = clk_pll_recalc_rate,
-+ .round_rate = clk_pll_round_rate,
-+ .set_rate = clk_pll_set_rate,
- };
-
- static int _pll_fixed_mdiv(struct tegra_clk_pll_params *pll_params,
---
-2.14.4
-
diff --git a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
index a7fbd24..b625096 100644
--- a/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
+++ b/recipes-kernel/linux/linux-toradex-mainline_4.14.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
inherit kernel siteinfo
include conf/tdx_version.conf
-LINUX_VERSION ?= "4.14.30"
+LINUX_VERSION ?= "4.14.50"
LOCALVERSION = "-${PR}"
PR = "${TDX_VER_ITEM}"
@@ -35,7 +35,6 @@ 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://0019-clk-tegra-Fix-pll_u-rate-configuration.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 \
@@ -51,8 +50,8 @@ SRC_URI = " \
${GENERIC_PATCHES} \
${MACHINE_PATCHES} \
"
-SRC_URI[md5sum] = "1f25f5abe06404f9c3d41fbf25d8a22e"
-SRC_URI[sha256sum] = "7c5bb02feb48f1b7ab9a9c3ff051f325c0c6474fb0e25d9d7bcee91b2cfe6645"
+SRC_URI[md5sum] = "0d397a2e14669a97d54c1b82ab2b1994"
+SRC_URI[sha256sum] = "703a8d013b25dc428d936f72858fa0c702c22cb3114a040fb9bb47562e4ea2ac"
# For CI use one could use the following instead (plus patches still of course)
LINUX_VERSION_use-head-next ?= "4.14"