aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-08-29 11:30:27 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-08-31 23:25:39 +0200
commite0753c5d5cef5b03c60601364188afb262ccd02e (patch)
tree4a21b14e7292b64ec861d3cf44d52514db2b6fb9 /target/linux
parent11a6021866a4e5c688dde0d1ea5841f10fc739be (diff)
downloadupstream-e0753c5d5cef5b03c60601364188afb262ccd02e.tar.gz
upstream-e0753c5d5cef5b03c60601364188afb262ccd02e.tar.bz2
upstream-e0753c5d5cef5b03c60601364188afb262ccd02e.zip
kernel: bump 5.10 to 5.10.139
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch2
-rw-r--r--target/linux/realtek/patches-5.10/318-add-rtl83xx-clk-support.patch46
2 files changed, 21 insertions, 27 deletions
diff --git a/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch b/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch
index 476afba6a8..87ab1a7543 100644
--- a/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch
+++ b/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch
@@ -73,7 +73,7 @@
source "arch/mips/alchemy/Kconfig"
source "arch/mips/ath25/Kconfig"
source "arch/mips/ath79/Kconfig"
-@@ -1097,6 +1147,9 @@ config CEVT_GT641XX
+@@ -1097,6 +1151,9 @@ config CEVT_GT641XX
config CEVT_R4K
bool
diff --git a/target/linux/realtek/patches-5.10/318-add-rtl83xx-clk-support.patch b/target/linux/realtek/patches-5.10/318-add-rtl83xx-clk-support.patch
index 5215a75087..285b7489f2 100644
--- a/target/linux/realtek/patches-5.10/318-add-rtl83xx-clk-support.patch
+++ b/target/linux/realtek/patches-5.10/318-add-rtl83xx-clk-support.patch
@@ -1,26 +1,20 @@
-diff -rpN x/drivers/clk/Kconfig y/drivers/clk/Kconfig
-*** x/drivers/clk/Kconfig 2022-07-29 14:28:59.704481188 +0200
---- y/drivers/clk/Kconfig 2022-07-29 14:29:56.886053322 +0200
-*************** source "drivers/clk/mediatek/Kconfig"
-*** 372,377 ****
---- 372,378 ----
- source "drivers/clk/meson/Kconfig"
- source "drivers/clk/mvebu/Kconfig"
- source "drivers/clk/qcom/Kconfig"
-+ source "drivers/clk/realtek/Kconfig"
- source "drivers/clk/renesas/Kconfig"
- source "drivers/clk/rockchip/Kconfig"
- source "drivers/clk/samsung/Kconfig"
-diff -rpN x/drivers/clk/Makefile y/drivers/clk/Makefile
-*** x/drivers/clk/Makefile 2022-07-29 13:34:36.638231518 +0200
---- y/drivers/clk/Makefile 2022-07-29 13:34:19.105060958 +0200
-*************** obj-$(CONFIG_COMMON_CLK_NXP) += nxp/
-*** 100,105 ****
---- 100,106 ----
- obj-$(CONFIG_MACH_PISTACHIO) += pistachio/
- obj-$(CONFIG_COMMON_CLK_PXA) += pxa/
- obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/
-+ obj-$(CONFIG_COMMON_CLK_REALTEK) += realtek/
- obj-y += renesas/
- obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
- obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/
+--- a/drivers/clk/Kconfig
++++ b/drivers/clk/Kconfig
+@@ -372,6 +372,7 @@ source "drivers/clk/mediatek/Kconfig"
+ source "drivers/clk/meson/Kconfig"
+ source "drivers/clk/mvebu/Kconfig"
+ source "drivers/clk/qcom/Kconfig"
++source "drivers/clk/realtek/Kconfig"
+ source "drivers/clk/renesas/Kconfig"
+ source "drivers/clk/rockchip/Kconfig"
+ source "drivers/clk/samsung/Kconfig"
+--- a/drivers/clk/Makefile
++++ b/drivers/clk/Makefile
+@@ -100,6 +100,7 @@ obj-$(CONFIG_COMMON_CLK_NXP) += nxp/
+ obj-$(CONFIG_MACH_PISTACHIO) += pistachio/
+ obj-$(CONFIG_COMMON_CLK_PXA) += pxa/
+ obj-$(CONFIG_COMMON_CLK_QCOM) += qcom/
++obj-$(CONFIG_COMMON_CLK_REALTEK) += realtek/
+ obj-y += renesas/
+ obj-$(CONFIG_ARCH_ROCKCHIP) += rockchip/
+ obj-$(CONFIG_COMMON_CLK_SAMSUNG) += samsung/