diff options
| author | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2020-12-14 11:34:58 +0100 |
|---|---|---|
| committer | Sebastian Andrzej Siewior <bigeasy@linutronix.de> | 2020-12-14 11:34:58 +0100 |
| commit | 08716a13c9aa88a6d1a83f15edfc4ff5e0fd2ef0 (patch) | |
| tree | 46ffb9bcb24460f0f25b21409e54d9a9ea6ccc5b /patches | |
| parent | 9d616240f932f086d7d8ded4aeeb7ea2ea5dab09 (diff) | |
| download | linux-rt-08716a13c9aa88a6d1a83f15edfc4ff5e0fd2ef0.tar.gz | |
[ANNOUNCE] v5.10-rt17v5.10-rt17-patches
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/clk-imx-scu-fix-MXC_CLK_SCU-module-build-break.patch | 33 | ||||
| -rw-r--r-- | patches/localversion.patch | 2 | ||||
| -rw-r--r-- | patches/series | 3 |
3 files changed, 1 insertions, 37 deletions
diff --git a/patches/clk-imx-scu-fix-MXC_CLK_SCU-module-build-break.patch b/patches/clk-imx-scu-fix-MXC_CLK_SCU-module-build-break.patch deleted file mode 100644 index 1598b3627332..000000000000 --- a/patches/clk-imx-scu-fix-MXC_CLK_SCU-module-build-break.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Dong Aisheng <aisheng.dong@nxp.com> -Date: Wed, 25 Nov 2020 18:50:37 +0800 -Subject: [PATCH] clk: imx: scu: fix MXC_CLK_SCU module build break - -This issue can be reproduced by CONFIG_IMX_MBOX=m and CONFIG_MXC_CLK_SCU=m. -It's caused by current Makefile can't support build clk-scu.o and -clk-imx8qxp.o separately. -"obj-$(CONFIG_MXC_CLK_SCU) += clk-imx-scu.o clk-imx-lpcg-scu.o -clk-imx-scu-$(CONFIG_CLK_IMX8QXP) += clk-scu.o clk-imx8qxp.o" -Only enable MXC_CLK_SCU while CLK_IMX8QXP not is meaningless and buggy. - -This patch makes MXC_CLK_SCU to be invisible to users and can only be -selected by CLK_IMX8QXP option to ensure they're built together. - -Fixes: e0d0d4d86c766 ("clk: imx8qxp: Support building i.MX8QXP clock driver as module") -Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> -Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ---- - drivers/clk/imx/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/clk/imx/Kconfig -+++ b/drivers/clk/imx/Kconfig -@@ -5,7 +5,7 @@ config MXC_CLK - depends on ARCH_MXC || COMPILE_TEST - - config MXC_CLK_SCU -- tristate "IMX SCU clock" -+ tristate - depends on ARCH_MXC || COMPILE_TEST - depends on IMX_SCU && HAVE_ARM_SMCCC - diff --git a/patches/localversion.patch b/patches/localversion.patch index 0cccc7790a5d..3dc62b40b5be 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt16 ++-rt17 diff --git a/patches/series b/patches/series index c2f7ba82da3d..068f1f304871 100644 --- a/patches/series +++ b/patches/series @@ -81,9 +81,6 @@ mm-highmem-Take-kmap_high_get-properly-into-account.patch # highmem-Don-t-disable-preemption-on-RT-in-kmap_atomi.patch -# 20201125105037.22079-1-aisheng.dong@nxp.com -clk-imx-scu-fix-MXC_CLK_SCU-module-build-break.patch - # 87lfea7gw8.fsf@nanos.tec.linutronix.de timers-Move-clearing-of-base-timer_running-under-bas.patch |