[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-158-g20f0dea56
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-158-g20f0dea56
|
From: Sébastien S. <ss...@us...> - 2020-01-09 12:57:02
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 20f0dea56739f151ced8b0b2993358c35813abdf (commit)
via 04e2324e8a54182af541bde1a830e195e06a159d (commit)
from fda1b7ca0e0278d2d13d194b500f7b9adfdb023e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 20f0dea56739f151ced8b0b2993358c35813abdf
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 9 13:56:57 2020 +0100
[BUILDROOT] opos6ul{,nano,sp} / apf6: bump kernel to 4.19.94
commit 04e2324e8a54182af541bde1a830e195e06a159d
Author: Sébastien Szymanski <seb...@ar...>
Date: Thu Jan 9 13:45:52 2020 +0100
[LINUX] 4.19: opos6ul: fix system hang at boot
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf6_defconfig | 2 +-
buildroot/configs/opos6ul_defconfig | 2 +-
buildroot/configs/opos6ulnano_defconfig | 2 +-
buildroot/configs/opos6ulsp_defconfig | 2 +-
...6q-enable-OCOTP-clock-before-register-acc.patch | 70 ++++++++++++++++++++++
5 files changed, 74 insertions(+), 4 deletions(-)
create mode 100644 patches/linux/4.19/0810-cpufreq-imx6q-enable-OCOTP-clock-before-register-acc.patch
diff --git a/buildroot/configs/apf6_defconfig b/buildroot/configs/apf6_defconfig
index 8042cff7f..d4d11affb 100644
--- a/buildroot/configs/apf6_defconfig
+++ b/buildroot/configs/apf6_defconfig
@@ -25,7 +25,7 @@ BR2_TARGET_ARMADEUS_NR_SDRAM="2"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="512"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.93"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.94"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ul_defconfig b/buildroot/configs/opos6ul_defconfig
index ad7b7a76a..91165b933 100644
--- a/buildroot/configs/opos6ul_defconfig
+++ b/buildroot/configs/opos6ul_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.93"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.94"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulnano_defconfig b/buildroot/configs/opos6ulnano_defconfig
index 5ccbf758a..84d7c63ad 100644
--- a/buildroot/configs/opos6ulnano_defconfig
+++ b/buildroot/configs/opos6ulnano_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.93"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.94"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/buildroot/configs/opos6ulsp_defconfig b/buildroot/configs/opos6ulsp_defconfig
index 5e079c6f8..1255e4dea 100644
--- a/buildroot/configs/opos6ulsp_defconfig
+++ b/buildroot/configs/opos6ulsp_defconfig
@@ -22,7 +22,7 @@ BR2_CPU_NAME="imx6ul"
BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.93"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.19.94"
BR2_LINUX_KERNEL_PATCH="$(TOPDIR)/../patches/linux/4.19"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-4.19.config"
diff --git a/patches/linux/4.19/0810-cpufreq-imx6q-enable-OCOTP-clock-before-register-acc.patch b/patches/linux/4.19/0810-cpufreq-imx6q-enable-OCOTP-clock-before-register-acc.patch
new file mode 100644
index 000000000..0da290029
--- /dev/null
+++ b/patches/linux/4.19/0810-cpufreq-imx6q-enable-OCOTP-clock-before-register-acc.patch
@@ -0,0 +1,70 @@
+From 78ae96a7b496269789981238b6a4820c5adf4a1a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Thu, 9 Jan 2020 13:34:16 +0100
+Subject: [PATCH 1/1] cpufreq: imx6q: enable OCOTP clock before register access
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+OCTOP driver disable its clock when probed. This causes the system to
+hang in the cpufreq driver when accessing OCOTP register.
+Get the OCOTP clock from device tree and enable it before accesing OCOTP
+register.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ drivers/cpufreq/imx6q-cpufreq.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c
+index f4880a4f865b..fa103739aaaa 100644
+--- a/drivers/cpufreq/imx6q-cpufreq.c
++++ b/drivers/cpufreq/imx6q-cpufreq.c
+@@ -299,16 +299,23 @@ static void imx6ul_opp_check_speed_grading(struct device *dev)
+ {
+ struct device_node *np;
+ void __iomem *base;
++ struct clk *clk;
+ u32 val;
+
+ np = of_find_compatible_node(NULL, NULL, "fsl,imx6ul-ocotp");
+ if (!np)
+ return;
+
++ clk = of_clk_get(np, 0);
++ if (IS_ERR(clk)) {
++ dev_err(dev, "failed to get ocotp clock\n");
++ goto put_node;
++ }
++
+ base = of_iomap(np, 0);
+ if (!base) {
+ dev_err(dev, "failed to map ocotp\n");
+- goto put_node;
++ goto put_clk;
+ }
+
+ /*
+@@ -319,7 +326,9 @@ static void imx6ul_opp_check_speed_grading(struct device *dev)
+ * 2b'11: 900000000Hz on i.MX6ULL only;
+ * We need to set the max speed of ARM according to fuse map.
+ */
++ clk_prepare_enable(clk);
+ val = readl_relaxed(base + OCOTP_CFG3);
++ clk_disable_unprepare(clk);
+ val >>= OCOTP_CFG3_SPEED_SHIFT;
+ val &= 0x3;
+
+@@ -340,6 +349,8 @@ static void imx6ul_opp_check_speed_grading(struct device *dev)
+ }
+
+ iounmap(base);
++put_clk:
++ clk_put(clk);
+ put_node:
+ of_node_put(np);
+ }
+--
+2.21.0
+
hooks/post-receive
--
armadeus
|