kernel: bump 5.10 to 5.10.82
Removed upstreamed: bcm53xx/patches-5.10/033-v5.16-0014-ARM-dts-NSP-Fix-mpcore-mmc-node-names.patch Manually rebased: ipq806x/patches-5.10/086-ipq8064-fix-duplicate-node.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, ipq806x/R7800 Run-tested: bcm2711/RPi4B, ipq806x/R7800 Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
parent
be077f4812
commit
894f483d20
|
@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LINUX_VERSION-5.4 = .159
|
LINUX_VERSION-5.4 = .159
|
||||||
LINUX_VERSION-5.10 = .81
|
LINUX_VERSION-5.10 = .82
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-5.4.159 = d718325f4eab325dce4f82b88418f68ba130864118229539541331e0a4478643
|
LINUX_KERNEL_HASH-5.4.159 = d718325f4eab325dce4f82b88418f68ba130864118229539541331e0a4478643
|
||||||
LINUX_KERNEL_HASH-5.10.81 = a2e1686132c4598c0adfdf52acbf1ab4bb327b2398badef346a0eff849da5adb
|
LINUX_KERNEL_HASH-5.10.82 = d66f7c7eed02f84ae550b3c91a26c70eea13682a6d672432f07bce66ff8ce350
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||||
|
|
|
@ -1,40 +0,0 @@
|
||||||
From 15a563d008ef9d04df525f0c476cd7d7127bb883 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Matthew Hagan <mnhagan88@gmail.com>
|
|
||||||
Date: Sun, 29 Aug 2021 22:37:48 +0000
|
|
||||||
Subject: [PATCH] ARM: dts: NSP: Fix mpcore, mmc node names
|
|
||||||
|
|
||||||
Running dtbs_check yielded the issues with bcm-nsp.dtsi.
|
|
||||||
|
|
||||||
Firstly this patch fixes the following message by appending "-bus" to
|
|
||||||
the mpcore node name:
|
|
||||||
mpcore@19000000: $nodename:0: 'mpcore@19000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'
|
|
||||||
|
|
||||||
Secondly mmc node name. The label name can remain as is.
|
|
||||||
sdhci@21000: $nodename:0: 'sdhci@21000' does not match '^mmc(@.*)?$'
|
|
||||||
|
|
||||||
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
|
|
||||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
|
||||||
---
|
|
||||||
arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++--
|
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
|
|
||||||
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
|
|
||||||
@@ -77,7 +77,7 @@
|
|
||||||
interrupt-affinity = <&cpu0>, <&cpu1>;
|
|
||||||
};
|
|
||||||
|
|
||||||
- mpcore@19000000 {
|
|
||||||
+ mpcore-bus@19000000 {
|
|
||||||
compatible = "simple-bus";
|
|
||||||
ranges = <0x00000000 0x19000000 0x00023000>;
|
|
||||||
#address-cells = <1>;
|
|
||||||
@@ -219,7 +219,7 @@
|
|
||||||
status = "disabled";
|
|
||||||
};
|
|
||||||
|
|
||||||
- sdio: sdhci@21000 {
|
|
||||||
+ sdio: mmc@21000 {
|
|
||||||
compatible = "brcm,sdhci-iproc-cygnus";
|
|
||||||
reg = <0x21000 0x100>;
|
|
||||||
interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
|
|
|
@ -29,7 +29,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||||
|
|
||||||
--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
|
--- a/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
|
||||||
+++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
|
+++ b/arch/arm/boot/dts/bcm53016-meraki-mr32.dts
|
||||||
@@ -195,3 +195,25 @@
|
@@ -217,3 +217,25 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -70,7 +70,7 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||||
};
|
};
|
||||||
|
|
||||||
&uart0 {
|
&uart0 {
|
||||||
@@ -228,3 +194,31 @@
|
@@ -250,3 +216,31 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct clk clk_pcie = {
|
static struct clk clk_pcie = {
|
||||||
@@ -536,6 +550,21 @@ static struct clk_lookup bcm6368_clks[]
|
@@ -542,6 +556,21 @@ static struct clk_lookup bcm6368_clks[]
|
||||||
CLKDEV_INIT(NULL, "ipsec", &clk_ipsec),
|
CLKDEV_INIT(NULL, "ipsec", &clk_ipsec),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -129,7 +129,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||||
#define HSSPI_PLL_HZ_6328 133333333
|
#define HSSPI_PLL_HZ_6328 133333333
|
||||||
#define HSSPI_PLL_HZ_6362 400000000
|
#define HSSPI_PLL_HZ_6362 400000000
|
||||||
|
|
||||||
@@ -568,6 +597,10 @@ static int __init bcm63xx_clk_init(void)
|
@@ -574,6 +603,10 @@ static int __init bcm63xx_clk_init(void)
|
||||||
case BCM6368_CPU_ID:
|
case BCM6368_CPU_ID:
|
||||||
clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks));
|
clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks));
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -57,7 +57,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
|
||||||
mask = CKCTL_6328_HSSPI_EN;
|
mask = CKCTL_6328_HSSPI_EN;
|
||||||
else if (BCMCPU_IS_6362())
|
else if (BCMCPU_IS_6362())
|
||||||
mask = CKCTL_6362_HSSPI_EN;
|
mask = CKCTL_6362_HSSPI_EN;
|
||||||
@@ -444,6 +446,19 @@ static struct clk_lookup bcm3368_clks[]
|
@@ -450,6 +452,19 @@ static struct clk_lookup bcm3368_clks[]
|
||||||
CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1),
|
CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
|
||||||
static struct clk_lookup bcm6328_clks[] = {
|
static struct clk_lookup bcm6328_clks[] = {
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
@@ -565,6 +580,7 @@ static struct clk_lookup bcm63268_clks[]
|
@@ -571,6 +586,7 @@ static struct clk_lookup bcm63268_clks[]
|
||||||
CLKDEV_INIT(NULL, "pcie", &clk_pcie),
|
CLKDEV_INIT(NULL, "pcie", &clk_pcie),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
|
||||||
#define HSSPI_PLL_HZ_6328 133333333
|
#define HSSPI_PLL_HZ_6328 133333333
|
||||||
#define HSSPI_PLL_HZ_6362 400000000
|
#define HSSPI_PLL_HZ_6362 400000000
|
||||||
|
|
||||||
@@ -574,6 +590,10 @@ static int __init bcm63xx_clk_init(void)
|
@@ -580,6 +596,10 @@ static int __init bcm63xx_clk_init(void)
|
||||||
case BCM3368_CPU_ID:
|
case BCM3368_CPU_ID:
|
||||||
clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks));
|
clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks));
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
|
|
||||||
--- a/arch/mips/bcm63xx/clk.c
|
--- a/arch/mips/bcm63xx/clk.c
|
||||||
+++ b/arch/mips/bcm63xx/clk.c
|
+++ b/arch/mips/bcm63xx/clk.c
|
||||||
@@ -489,6 +489,8 @@ static struct clk_lookup bcm3368_clks[]
|
@@ -495,6 +495,8 @@ static struct clk_lookup bcm3368_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
|
@ -18,7 +18,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -505,7 +507,9 @@ static struct clk_lookup bcm6318_clks[]
|
@@ -511,7 +513,9 @@ static struct clk_lookup bcm6318_clks[]
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
|
@ -28,7 +28,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
@@ -519,7 +523,10 @@ static struct clk_lookup bcm6328_clks[]
|
@@ -525,7 +529,10 @@ static struct clk_lookup bcm6328_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
|
@ -39,7 +39,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
@@ -532,6 +539,7 @@ static struct clk_lookup bcm6338_clks[]
|
@@ -538,6 +545,7 @@ static struct clk_lookup bcm6338_clks[]
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
|
@ -47,7 +47,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -546,6 +554,7 @@ static struct clk_lookup bcm6345_clks[]
|
@@ -552,6 +560,7 @@ static struct clk_lookup bcm6345_clks[]
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
|
@ -55,7 +55,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -560,6 +569,7 @@ static struct clk_lookup bcm6348_clks[]
|
@@ -566,6 +575,7 @@ static struct clk_lookup bcm6348_clks[]
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
|
@ -63,7 +63,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -576,6 +586,8 @@ static struct clk_lookup bcm6358_clks[]
|
@@ -582,6 +592,8 @@ static struct clk_lookup bcm6358_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
|
@ -72,7 +72,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -595,7 +607,10 @@ static struct clk_lookup bcm6362_clks[]
|
@@ -601,7 +613,10 @@ static struct clk_lookup bcm6362_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
|
@ -83,7 +83,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
@@ -611,6 +626,8 @@ static struct clk_lookup bcm6368_clks[]
|
@@ -617,6 +632,8 @@ static struct clk_lookup bcm6368_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
|
@ -92,7 +92,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
@@ -625,7 +642,10 @@ static struct clk_lookup bcm63268_clks[]
|
@@ -631,7 +648,10 @@ static struct clk_lookup bcm63268_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
* Internal peripheral clock
|
* Internal peripheral clock
|
||||||
*/
|
*/
|
||||||
static struct clk clk_periph = {
|
static struct clk clk_periph = {
|
||||||
@@ -612,6 +629,7 @@ static struct clk_lookup bcm6362_clks[]
|
@@ -618,6 +635,7 @@ static struct clk_lookup bcm6362_clks[]
|
||||||
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
|
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
|
||||||
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
|
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
||||||
@@ -629,6 +647,7 @@ static struct clk_lookup bcm6368_clks[]
|
@@ -635,6 +653,7 @@ static struct clk_lookup bcm6368_clks[]
|
||||||
CLKDEV_INIT("10000100.serial", "refclk", &clk_periph),
|
CLKDEV_INIT("10000100.serial", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("10000120.serial", "refclk", &clk_periph),
|
CLKDEV_INIT("10000120.serial", "refclk", &clk_periph),
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
||||||
@@ -647,6 +666,7 @@ static struct clk_lookup bcm63268_clks[]
|
@@ -653,6 +672,7 @@ static struct clk_lookup bcm63268_clks[]
|
||||||
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
|
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
|
||||||
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
|
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
|
|
|
@ -25,7 +25,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -2081,7 +2081,7 @@ config CPU_MIPS32
|
@@ -2084,7 +2084,7 @@ config CPU_MIPS32
|
||||||
config CPU_MIPS64
|
config CPU_MIPS64
|
||||||
bool
|
bool
|
||||||
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
|
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
|
||||||
|
|
|
@ -1283,7 +1283,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||||
return PTR_ERR(plat_dat);
|
return PTR_ERR(plat_dat);
|
||||||
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
|
||||||
@@ -1387,7 +1387,7 @@ static int rk_gmac_probe(struct platform
|
@@ -1392,7 +1392,7 @@ static int rk_gmac_probe(struct platform
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -1167,6 +1167,10 @@ config MIPS_MSC
|
@@ -1170,6 +1170,10 @@ config MIPS_MSC
|
||||||
config SYNC_R4K
|
config SYNC_R4K
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
|
|
||||||
--- a/net/core/sock.c
|
--- a/net/core/sock.c
|
||||||
+++ b/net/core/sock.c
|
+++ b/net/core/sock.c
|
||||||
@@ -3702,6 +3702,8 @@ static __net_initdata struct pernet_oper
|
@@ -3699,6 +3699,8 @@ static __net_initdata struct pernet_oper
|
||||||
|
|
||||||
static int __init proto_init(void)
|
static int __init proto_init(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--- a/kernel/sched/core.c
|
--- a/kernel/sched/core.c
|
||||||
+++ b/kernel/sched/core.c
|
+++ b/kernel/sched/core.c
|
||||||
@@ -3062,6 +3062,7 @@ int wake_up_state(struct task_struct *p,
|
@@ -3065,6 +3065,7 @@ int wake_up_state(struct task_struct *p,
|
||||||
{
|
{
|
||||||
return try_to_wake_up(p, state, 0);
|
return try_to_wake_up(p, state, 0);
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
|
||||||
---
|
---
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -1082,9 +1082,6 @@ config FW_ARC
|
@@ -1085,9 +1085,6 @@ config FW_ARC
|
||||||
config ARCH_MAY_HAVE_PC_FDC
|
config ARCH_MAY_HAVE_PC_FDC
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
|
||||||
config CEVT_BCM1480
|
config CEVT_BCM1480
|
||||||
bool
|
bool
|
||||||
|
|
||||||
@@ -3175,6 +3172,18 @@ choice
|
@@ -3178,6 +3175,18 @@ choice
|
||||||
bool "Extend builtin kernel arguments with bootloader arguments"
|
bool "Extend builtin kernel arguments with bootloader arguments"
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
device_type = "memory";
|
device_type = "memory";
|
||||||
};
|
};
|
||||||
|
|
||||||
- mdio0: mdio@0 {
|
- mdio0: mdio-0 {
|
||||||
- status = "okay";
|
- status = "okay";
|
||||||
- compatible = "virtual,mdio-gpio";
|
- compatible = "virtual,mdio-gpio";
|
||||||
- gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
|
- gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
- };
|
- };
|
||||||
- };
|
- };
|
||||||
-
|
-
|
||||||
mdio1: mdio@1 {
|
mdio1: mdio-1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
compatible = "virtual,mdio-gpio";
|
compatible = "virtual,mdio-gpio";
|
||||||
@@ -216,6 +149,68 @@
|
@@ -216,6 +149,68 @@
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -2431,6 +2431,12 @@ config MIPS_VPE_LOADER
|
@@ -2434,6 +2434,12 @@ config MIPS_VPE_LOADER
|
||||||
Includes a loader for loading an elf relocatable object
|
Includes a loader for loading an elf relocatable object
|
||||||
onto another VPE and running it.
|
onto another VPE and running it.
|
||||||
|
|
||||||
|
|
|
@ -30,11 +30,9 @@ Signed-off-by: Sander Vanheule <sander@svanheule.net>
|
||||||
4 files changed, 382 insertions(+)
|
4 files changed, 382 insertions(+)
|
||||||
create mode 100644 drivers/watchdog/realtek_otto_wdt.c
|
create mode 100644 drivers/watchdog/realtek_otto_wdt.c
|
||||||
|
|
||||||
diff --git a/MAINTAINERS b/MAINTAINERS
|
|
||||||
index 2c9070aeba2a..54c8f788d3e5 100644
|
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/MAINTAINERS
|
+++ b/MAINTAINERS
|
||||||
@@ -15991,6 +15991,13 @@ S: Maintained
|
@@ -14815,6 +14815,13 @@ S: Maintained
|
||||||
F: include/sound/rt*.h
|
F: include/sound/rt*.h
|
||||||
F: sound/soc/codecs/rt*
|
F: sound/soc/codecs/rt*
|
||||||
|
|
||||||
|
@ -48,11 +46,9 @@ index 2c9070aeba2a..54c8f788d3e5 100644
|
||||||
REALTEK RTL83xx SMI DSA ROUTER CHIPS
|
REALTEK RTL83xx SMI DSA ROUTER CHIPS
|
||||||
M: Linus Walleij <linus.walleij@linaro.org>
|
M: Linus Walleij <linus.walleij@linaro.org>
|
||||||
S: Maintained
|
S: Maintained
|
||||||
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
|
|
||||||
index bf59faeb3de1..d308e13a9aa1 100644
|
|
||||||
--- a/drivers/watchdog/Kconfig
|
--- a/drivers/watchdog/Kconfig
|
||||||
+++ b/drivers/watchdog/Kconfig
|
+++ b/drivers/watchdog/Kconfig
|
||||||
@@ -954,6 +954,19 @@ config RTD119X_WATCHDOG
|
@@ -995,6 +995,19 @@ config RTD119X_WATCHDOG
|
||||||
Say Y here to include support for the watchdog timer in
|
Say Y here to include support for the watchdog timer in
|
||||||
Realtek RTD1295 SoCs.
|
Realtek RTD1295 SoCs.
|
||||||
|
|
||||||
|
@ -72,11 +68,9 @@ index bf59faeb3de1..d308e13a9aa1 100644
|
||||||
config SPRD_WATCHDOG
|
config SPRD_WATCHDOG
|
||||||
tristate "Spreadtrum watchdog support"
|
tristate "Spreadtrum watchdog support"
|
||||||
depends on ARCH_SPRD || COMPILE_TEST
|
depends on ARCH_SPRD || COMPILE_TEST
|
||||||
diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile
|
|
||||||
index 1bd2d6f37c53..a8dccf819163 100644
|
|
||||||
--- a/drivers/watchdog/Makefile
|
--- a/drivers/watchdog/Makefile
|
||||||
+++ b/drivers/watchdog/Makefile
|
+++ b/drivers/watchdog/Makefile
|
||||||
@@ -171,6 +171,7 @@ obj-$(CONFIG_IMGPDC_WDT) += imgpdc_wdt.o
|
@@ -174,6 +174,7 @@ obj-$(CONFIG_IMGPDC_WDT) += imgpdc_wdt.o
|
||||||
obj-$(CONFIG_MT7621_WDT) += mt7621_wdt.o
|
obj-$(CONFIG_MT7621_WDT) += mt7621_wdt.o
|
||||||
obj-$(CONFIG_PIC32_WDT) += pic32-wdt.o
|
obj-$(CONFIG_PIC32_WDT) += pic32-wdt.o
|
||||||
obj-$(CONFIG_PIC32_DMT) += pic32-dmt.o
|
obj-$(CONFIG_PIC32_DMT) += pic32-dmt.o
|
||||||
|
@ -84,9 +78,6 @@ index 1bd2d6f37c53..a8dccf819163 100644
|
||||||
|
|
||||||
# PARISC Architecture
|
# PARISC Architecture
|
||||||
|
|
||||||
diff --git a/drivers/watchdog/realtek_otto_wdt.c b/drivers/watchdog/realtek_otto_wdt.c
|
|
||||||
new file mode 100644
|
|
||||||
index 000000000000..48bc8dfefc25
|
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/drivers/watchdog/realtek_otto_wdt.c
|
+++ b/drivers/watchdog/realtek_otto_wdt.c
|
||||||
@@ -0,0 +1,361 @@
|
@@ -0,0 +1,361 @@
|
||||||
|
@ -451,6 +442,3 @@ index 000000000000..48bc8dfefc25
|
||||||
+MODULE_LICENSE("GPL v2");
|
+MODULE_LICENSE("GPL v2");
|
||||||
+MODULE_AUTHOR("Sander Vanheule <sander@svanheule.net>");
|
+MODULE_AUTHOR("Sander Vanheule <sander@svanheule.net>");
|
||||||
+MODULE_DESCRIPTION("Realtek Otto watchdog timer driver");
|
+MODULE_DESCRIPTION("Realtek Otto watchdog timer driver");
|
||||||
--
|
|
||||||
2.31.1
|
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
platform-$(CONFIG_SGI_IP28) += sgi-ip22/
|
platform-$(CONFIG_SGI_IP28) += sgi-ip22/
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -629,6 +629,26 @@ config RALINK
|
@@ -632,6 +632,26 @@ config RALINK
|
||||||
select ARCH_HAS_RESET_CONTROLLER
|
select ARCH_HAS_RESET_CONTROLLER
|
||||||
select RESET_CONTROLLER
|
select RESET_CONTROLLER
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: linux-5.10.76/drivers/watchdog/Kconfig
|
--- a/drivers/watchdog/Kconfig
|
||||||
===================================================================
|
+++ b/drivers/watchdog/Kconfig
|
||||||
--- linux-5.10.76.orig/drivers/watchdog/Kconfig
|
|
||||||
+++ linux-5.10.76/drivers/watchdog/Kconfig
|
|
||||||
@@ -997,10 +997,10 @@ config RTD119X_WATCHDOG
|
@@ -997,10 +997,10 @@ config RTD119X_WATCHDOG
|
||||||
|
|
||||||
config REALTEK_OTTO_WDT
|
config REALTEK_OTTO_WDT
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
Index: linux-5.10.72/drivers/watchdog/realtek_otto_wdt.c
|
--- a/drivers/watchdog/realtek_otto_wdt.c
|
||||||
===================================================================
|
+++ b/drivers/watchdog/realtek_otto_wdt.c
|
||||||
--- linux-5.10.72.orig/drivers/watchdog/realtek_otto_wdt.c
|
|
||||||
+++ linux-5.10.72/drivers/watchdog/realtek_otto_wdt.c
|
|
||||||
@@ -21,7 +21,7 @@
|
@@ -21,7 +21,7 @@
|
||||||
#include <linux/delay.h>
|
#include <linux/delay.h>
|
||||||
#include <linux/interrupt.h>
|
#include <linux/interrupt.h>
|
||||||
|
|
Loading…
Reference in New Issue