mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.10 to 5.10.100 (#8867)
* kernel: bump 5.10 to 5.10.99 Had to update generic defconfig (make kernel_menuconfig CONFIG_TARGET=generic) for this bump, but since that only modifies the target defined in .config, and since that target also needed to be updated for unrelated reasons, manually propagated the newly added symbol to the generic config. Removed upstreamed: pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.99&id=080f371d984e8039c66db87f3c54804b0d172329 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us> * kernel: bump 5.10 to 5.10.100 All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us> Co-authored-by: John Audia <graysky@archlinux.us>
This commit is contained in:
parent
aafe115cda
commit
447f665f63
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.10 = .98
|
LINUX_VERSION-5.10 = .100
|
||||||
LINUX_KERNEL_HASH-5.10.98 = 1b24c6c15f1011bcca54da7e58539c612c7c84f95b7902f62d34754aaf0f9443
|
LINUX_KERNEL_HASH-5.10.100 = d56965afc9b6a3d26d53db40ccd37fd9d15f2ca6bfd54ef6f0f8b6e92c170999
|
||||||
|
@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
|
|
||||||
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
||||||
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
||||||
@@ -1314,7 +1314,7 @@ static int bcm2835_pinctrl_probe(struct
|
@@ -1318,7 +1318,7 @@ static int bcm2835_pinctrl_probe(struct
|
||||||
girq->default_type = IRQ_TYPE_NONE;
|
girq->default_type = IRQ_TYPE_NONE;
|
||||||
girq->handler = handle_level_irq;
|
girq->handler = handle_level_irq;
|
||||||
|
|
||||||
@ -22,4 +22,4 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|||||||
+ err = devm_gpiochip_add_data(dev, &pc->gpio_chip, pc);
|
+ err = devm_gpiochip_add_data(dev, &pc->gpio_chip, pc);
|
||||||
if (err) {
|
if (err) {
|
||||||
dev_err(dev, "could not add GPIO chip\n");
|
dev_err(dev, "could not add GPIO chip\n");
|
||||||
pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range);
|
goto out_remove;
|
||||||
|
@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
|
|
||||||
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
||||||
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
||||||
@@ -1288,9 +1288,13 @@ static int bcm2835_pinctrl_probe(struct
|
@@ -1290,9 +1290,13 @@ static int bcm2835_pinctrl_probe(struct
|
||||||
char *name;
|
char *name;
|
||||||
|
|
||||||
girq->parents[i] = irq_of_parse_and_map(np, i);
|
girq->parents[i] = irq_of_parse_and_map(np, i);
|
||||||
|
@ -1956,6 +1956,7 @@ CONFIG_FORTIFY_SOURCE=y
|
|||||||
# CONFIG_FPGA is not set
|
# CONFIG_FPGA is not set
|
||||||
# CONFIG_FRAMEBUFFER_CONSOLE is not set
|
# CONFIG_FRAMEBUFFER_CONSOLE is not set
|
||||||
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
|
# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
|
||||||
|
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
|
||||||
# CONFIG_FRAME_POINTER is not set
|
# CONFIG_FRAME_POINTER is not set
|
||||||
CONFIG_FRAME_WARN=1024
|
CONFIG_FRAME_WARN=1024
|
||||||
# CONFIG_FREEZER is not set
|
# CONFIG_FREEZER is not set
|
||||||
|
@ -1,52 +0,0 @@
|
|||||||
From 8af60f5b0aa5b33525379d2859c8581b3472f9ea Mon Sep 17 00:00:00 2001
|
|
||||||
From: Daniel Golle <daniel@makrotopia.org>
|
|
||||||
Date: Fri, 28 Jan 2022 13:25:46 +0000
|
|
||||||
Subject: [PATCH] Revert "ASoC: mediatek: Check for error clk pointer"
|
|
||||||
|
|
||||||
This reverts commit 9de2b9286a6dd16966959b3cb34fc2ddfd39213e.
|
|
||||||
---
|
|
||||||
drivers/soc/mediatek/mtk-scpsys.c | 15 ++++-----------
|
|
||||||
1 file changed, 4 insertions(+), 11 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/soc/mediatek/mtk-scpsys.c
|
|
||||||
+++ b/drivers/soc/mediatek/mtk-scpsys.c
|
|
||||||
@@ -411,17 +411,12 @@ out:
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static int init_clks(struct platform_device *pdev, struct clk **clk)
|
|
||||||
+static void init_clks(struct platform_device *pdev, struct clk **clk)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
|
|
||||||
- for (i = CLK_NONE + 1; i < CLK_MAX; i++) {
|
|
||||||
+ for (i = CLK_NONE + 1; i < CLK_MAX; i++)
|
|
||||||
clk[i] = devm_clk_get(&pdev->dev, clk_names[i]);
|
|
||||||
- if (IS_ERR(clk[i]))
|
|
||||||
- return PTR_ERR(clk[i]);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct scp *init_scp(struct platform_device *pdev,
|
|
||||||
@@ -431,7 +426,7 @@ static struct scp *init_scp(struct platf
|
|
||||||
{
|
|
||||||
struct genpd_onecell_data *pd_data;
|
|
||||||
struct resource *res;
|
|
||||||
- int i, j, ret;
|
|
||||||
+ int i, j;
|
|
||||||
struct scp *scp;
|
|
||||||
struct clk *clk[CLK_MAX];
|
|
||||||
|
|
||||||
@@ -486,9 +481,7 @@ static struct scp *init_scp(struct platf
|
|
||||||
|
|
||||||
pd_data->num_domains = num;
|
|
||||||
|
|
||||||
- ret = init_clks(pdev, clk);
|
|
||||||
- if (ret)
|
|
||||||
- return ERR_PTR(ret);
|
|
||||||
+ init_clks(pdev, clk);
|
|
||||||
|
|
||||||
for (i = 0; i < num; i++) {
|
|
||||||
struct scp_domain *scpd = &scp->domains[i];
|
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
--- a/drivers/net/phy/Kconfig
|
||||||
+++ b/drivers/net/phy/Kconfig
|
+++ b/drivers/net/phy/Kconfig
|
||||||
@@ -335,6 +335,12 @@ config ROCKCHIP_PHY
|
@@ -340,6 +340,12 @@ config ROCKCHIP_PHY
|
||||||
help
|
help
|
||||||
Currently supports the integrated Ethernet PHY.
|
Currently supports the integrated Ethernet PHY.
|
||||||
|
|
||||||
@ -15,7 +15,7 @@
|
|||||||
help
|
help
|
||||||
--- a/drivers/net/phy/Makefile
|
--- a/drivers/net/phy/Makefile
|
||||||
+++ b/drivers/net/phy/Makefile
|
+++ b/drivers/net/phy/Makefile
|
||||||
@@ -88,6 +88,7 @@ obj-$(CONFIG_QSEMI_PHY) += qsemi.o
|
@@ -89,6 +89,7 @@ obj-$(CONFIG_QSEMI_PHY) += qsemi.o
|
||||||
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
obj-$(CONFIG_REALTEK_PHY) += realtek.o
|
||||||
obj-$(CONFIG_RENESAS_PHY) += uPD60620.o
|
obj-$(CONFIG_RENESAS_PHY) += uPD60620.o
|
||||||
obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o
|
obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o
|
||||||
|
@ -253,7 +253,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
|
|||||||
#interrupt-cells = <1>;
|
#interrupt-cells = <1>;
|
||||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||||
@@ -288,18 +288,16 @@
|
@@ -292,18 +292,16 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||||
@@ -304,7 +304,7 @@
|
@@ -308,7 +308,7 @@
|
||||||
/* Attention: GPIO 90 is used to switch between PCIe@1,0 and
|
/* Attention: GPIO 90 is used to switch between PCIe@1,0 and
|
||||||
* SATA functions. i.e. output-high: PCIe, output-low: SATA
|
* SATA functions. i.e. output-high: PCIe, output-low: SATA
|
||||||
*/
|
*/
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||||
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
|
||||||
@@ -628,5 +628,28 @@
|
@@ -632,5 +632,28 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
&wmac {
|
&wmac {
|
||||||
|
Loading…
Reference in New Issue
Block a user