Skip to content

Commit 5e179ba

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: Version update to R22.11.11 kernel: bump 5.10 to 5.10.152 (coolsnowwolf#10341) kernel: bump 5.4 to 5.4.221 (coolsnowwolf#10342) kernel: bump 5.15 to 5.15.76 rockchip: armv8: add CONFIG_ARM64_ERRATUM_1742098 mvebu: cortexa72: add CONFIG_ARM64_ERRATUM_1742098 kernel: add # CONFIG_ARM64_ERRATUM_2441007 symbol kernel: add # CONFIG_ARM64_ERRATUM_1742098 kernel: bump 5.15 to 5.15.75 kernel: bump 5.10 to 5.10.150
2 parents 4f505e1 + 2da3923 commit 5e179ba

File tree

139 files changed

+375
-518
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+375
-518
lines changed

‎include/kernel-5.10

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .149
2-
LINUX_KERNEL_HASH-5.10.149 = 0f6134c537563b9cd0533924e3ce06f577cf874e7a00cf3d8e8b31222ac065d3
1+
LINUX_VERSION-5.10 = .152
2+
LINUX_KERNEL_HASH-5.10.152 = fa0b5c83a4ebfda9f0a52cc693646eb6c24dbade6c37ee2d18b66ee2df15d8a6

‎include/kernel-5.15

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .74
2-
LINUX_KERNEL_HASH-5.15.74 = 2c1539a2f85b835c36c4a07c8270b52b0bec38fdda7339477d07f0c3af8c4265
1+
LINUX_VERSION-5.15 = .76
2+
LINUX_KERNEL_HASH-5.15.76 = 9007a020c419e3625b980e361be09f70ebd99e156ccb66129a981483d065d57f

‎include/kernel-5.4

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .219
2-
LINUX_KERNEL_HASH-5.4.219 = 5293ad927269dfb697bc80e9dd95c1d9fd2e4bad7d8422300e012fd31950a261
1+
LINUX_VERSION-5.4 = .221
2+
LINUX_KERNEL_HASH-5.4.221 = 27b37fc1fed7b4dcddf5a0a3730fabf25197c0ba13ace684481aa5444649df0a

‎package/lean/default-settings/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
88

99
PKG_NAME:=default-settings
1010
PKG_VERSION:=2
11-
PKG_RELEASE:=31
11+
PKG_RELEASE:=32
1212
PKG_LICENSE:=GPLv3
1313
PKG_LICENSE_FILES:=LICENSE
1414

‎package/lean/default-settings/files/zzz-default-settings

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ sed -i '/option disabled/d' /etc/config/wireless
4646
sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
4747

4848
sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
49-
echo "DISTRIB_REVISION='R22.10.20'" >> /etc/openwrt_release
49+
echo "DISTRIB_REVISION='R22.11.11'" >> /etc/openwrt_release
5050
sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
5151
echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release
5252

‎target/linux/apm821xx/patches-5.10/802-usb-xhci-force-msi-renesas-xhci.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ produce a noisy warning.
4343
hcd->msi_enabled = 1;
4444
--- a/drivers/usb/host/xhci.h
4545
+++ b/drivers/usb/host/xhci.h
46-
@@ -1895,6 +1895,7 @@ struct xhci_hcd {
46+
@@ -1896,6 +1896,7 @@ struct xhci_hcd {
4747
struct xhci_hub usb2_rhub;
4848
struct xhci_hub usb3_rhub;
4949
/* support xHCI 1.0 spec USB2 hardware LPM */

‎target/linux/apm821xx/patches-5.10/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
1818

1919
--- a/arch/powerpc/boot/Makefile
2020
+++ b/arch/powerpc/boot/Makefile
21-
@@ -250,7 +250,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
21+
@@ -251,7 +251,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
2222

2323
# args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd
2424
quiet_cmd_wrap = WRAP $@

‎target/linux/apm821xx/patches-5.4/900-powerpc-bootwrapper-force-gzip-as-mkimage-s-compress.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Signed-off-by: Christian Lamparter <[email protected]>
1818

1919
--- a/arch/powerpc/boot/Makefile
2020
+++ b/arch/powerpc/boot/Makefile
21-
@@ -254,7 +254,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
21+
@@ -255,7 +255,7 @@ compressor-$(CONFIG_KERNEL_LZO) := lzo
2222

2323
# args (to if_changed): 1 = (this rule), 2 = platform, 3 = dts 4=dtb 5=initrd
2424
quiet_cmd_wrap = WRAP $@

‎target/linux/ath79/patches-5.15/910-unaligned_access_hacks.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
#define UDP_CORK 1 /* Never send partially complete segments */
172172
--- a/net/netfilter/nf_conntrack_core.c
173173
+++ b/net/netfilter/nf_conntrack_core.c
174-
@@ -305,8 +305,8 @@ nf_ct_get_tuple(const struct sk_buff *sk
174+
@@ -308,8 +308,8 @@ nf_ct_get_tuple(const struct sk_buff *sk
175175

176176
switch (l3num) {
177177
case NFPROTO_IPV4:
@@ -693,7 +693,7 @@
693693
| TCPOLEN_TIMESTAMP))
694694
--- a/net/xfrm/xfrm_input.c
695695
+++ b/net/xfrm/xfrm_input.c
696-
@@ -165,8 +165,8 @@ int xfrm_parse_spi(struct sk_buff *skb,
696+
@@ -166,8 +166,8 @@ int xfrm_parse_spi(struct sk_buff *skb,
697697
if (!pskb_may_pull(skb, hlen))
698698
return -EINVAL;
699699

‎target/linux/bcm27xx/patches-5.15/950-0046-Register-the-clocks-early-during-the-boot-process-so.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Signed-off-by: Martin Sperl <[email protected]>
1313

1414
--- a/drivers/clk/bcm/clk-bcm2835.c
1515
+++ b/drivers/clk/bcm/clk-bcm2835.c
16-
@@ -2289,8 +2289,15 @@ static int bcm2835_clk_probe(struct plat
16+
@@ -2320,8 +2320,15 @@ static int bcm2835_clk_probe(struct plat
1717
if (ret)
1818
return ret;
1919

@@ -30,7 +30,7 @@ Signed-off-by: Martin Sperl <[email protected]>
3030
}
3131

3232
static const struct cprman_plat_data cprman_bcm2835_plat_data = {
33-
@@ -2316,7 +2323,11 @@ static struct platform_driver bcm2835_cl
33+
@@ -2347,7 +2354,11 @@ static struct platform_driver bcm2835_cl
3434
.probe = bcm2835_clk_probe,
3535
};
3636

‎target/linux/bcm27xx/patches-5.15/950-0048-clk-bcm2835-Mark-used-PLLs-and-dividers-CRITICAL.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <[email protected]>
1414

1515
--- a/drivers/clk/bcm/clk-bcm2835.c
1616
+++ b/drivers/clk/bcm/clk-bcm2835.c
17-
@@ -1378,6 +1378,11 @@ bcm2835_register_pll_divider(struct bcm2
17+
@@ -1408,6 +1408,11 @@ bcm2835_register_pll_divider(struct bcm2
1818
divider->div.hw.init = &init;
1919
divider->div.table = NULL;
2020

‎target/linux/bcm27xx/patches-5.15/950-0049-clk-bcm2835-Add-claim-clocks-property.patch

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <[email protected]>
1717

1818
--- a/drivers/clk/bcm/clk-bcm2835.c
1919
+++ b/drivers/clk/bcm/clk-bcm2835.c
20-
@@ -1306,6 +1306,8 @@ static const struct clk_ops bcm2835_vpu_
20+
@@ -1336,6 +1336,8 @@ static const struct clk_ops bcm2835_vpu_
2121
.debug_init = bcm2835_clock_debug_init,
2222
};
2323

@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <[email protected]>
2626
static struct clk_hw *bcm2835_register_pll(struct bcm2835_cprman *cprman,
2727
const void *data)
2828
{
29-
@@ -1323,6 +1325,9 @@ static struct clk_hw *bcm2835_register_p
29+
@@ -1353,6 +1355,9 @@ static struct clk_hw *bcm2835_register_p
3030
init.ops = &bcm2835_pll_clk_ops;
3131
init.flags = pll_data->flags | CLK_IGNORE_UNUSED;
3232

@@ -36,7 +36,7 @@ Signed-off-by: Phil Elwell <[email protected]>
3636
pll = kzalloc(sizeof(*pll), GFP_KERNEL);
3737
if (!pll)
3838
return NULL;
39-
@@ -1378,9 +1383,11 @@ bcm2835_register_pll_divider(struct bcm2
39+
@@ -1408,9 +1413,11 @@ bcm2835_register_pll_divider(struct bcm2
4040
divider->div.hw.init = &init;
4141
divider->div.table = NULL;
4242

@@ -51,7 +51,7 @@ Signed-off-by: Phil Elwell <[email protected]>
5151
}
5252

5353
divider->cprman = cprman;
54-
@@ -1437,6 +1444,15 @@ static struct clk_hw *bcm2835_register_c
54+
@@ -1467,6 +1474,15 @@ static struct clk_hw *bcm2835_register_c
5555
init.flags = clock_data->flags | CLK_IGNORE_UNUSED;
5656

5757
/*
@@ -67,7 +67,7 @@ Signed-off-by: Phil Elwell <[email protected]>
6767
* Pass the CLK_SET_RATE_PARENT flag if we are allowed to propagate
6868
* rate changes on at least of the parents.
6969
*/
70-
@@ -2215,6 +2231,8 @@ static const struct bcm2835_clk_desc clk
70+
@@ -2246,6 +2262,8 @@ static const struct bcm2835_clk_desc clk
7171
.ctl_reg = CM_PERIICTL),
7272
};
7373

@@ -76,7 +76,7 @@ Signed-off-by: Phil Elwell <[email protected]>
7676
/*
7777
* Permanently take a reference on the parent of the SDRAM clock.
7878
*
79-
@@ -2234,6 +2252,19 @@ static int bcm2835_mark_sdc_parent_criti
79+
@@ -2265,6 +2283,19 @@ static int bcm2835_mark_sdc_parent_criti
8080
return clk_prepare_enable(parent);
8181
}
8282

@@ -96,15 +96,15 @@ Signed-off-by: Phil Elwell <[email protected]>
9696
static int bcm2835_clk_probe(struct platform_device *pdev)
9797
{
9898
struct device *dev = &pdev->dev;
99-
@@ -2243,6 +2274,7 @@ static int bcm2835_clk_probe(struct plat
99+
@@ -2274,6 +2305,7 @@ static int bcm2835_clk_probe(struct plat
100100
const size_t asize = ARRAY_SIZE(clk_desc_array);
101101
const struct cprman_plat_data *pdata;
102102
size_t i;
103103
+ u32 clk_id;
104104
int ret;
105105

106106
pdata = of_device_get_match_data(&pdev->dev);
107-
@@ -2261,6 +2293,13 @@ static int bcm2835_clk_probe(struct plat
107+
@@ -2292,6 +2324,13 @@ static int bcm2835_clk_probe(struct plat
108108
if (IS_ERR(cprman->regs))
109109
return PTR_ERR(cprman->regs);
110110

‎target/linux/bcm27xx/patches-5.15/950-0050-clk-bcm2835-Read-max-core-clock-from-firmware.patch

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ Signed-off-by: Phil Elwell <[email protected]>
2525

2626
--- a/drivers/clk/bcm/clk-bcm2835.c
2727
+++ b/drivers/clk/bcm/clk-bcm2835.c
28-
@@ -35,6 +35,7 @@
28+
@@ -36,6 +36,7 @@
2929
#include <linux/platform_device.h>
3030
#include <linux/slab.h>
3131
#include <dt-bindings/clock/bcm2835.h>
3232
+#include <soc/bcm2835/raspberrypi-firmware.h>
3333

3434
#define CM_PASSWORD 0x5a000000
3535

36-
@@ -295,6 +296,8 @@
36+
@@ -296,6 +297,8 @@
3737
#define SOC_BCM2711 BIT(1)
3838
#define SOC_ALL (SOC_BCM2835 | SOC_BCM2711)
3939

@@ -42,16 +42,16 @@ Signed-off-by: Phil Elwell <[email protected]>
4242
/*
4343
* Names of clocks used within the driver that need to be replaced
4444
* with an external parent's name. This array is in the order that
45-
@@ -313,6 +316,7 @@ static const char *const cprman_parent_n
45+
@@ -314,6 +317,7 @@ static const char *const cprman_parent_n
4646
struct bcm2835_cprman {
4747
struct device *dev;
4848
void __iomem *regs;
4949
+ struct rpi_firmware *fw;
5050
spinlock_t regs_lock; /* spinlock for all clocks */
5151
unsigned int soc;
5252

53-
@@ -1010,6 +1014,30 @@ static unsigned long bcm2835_clock_get_r
54-
return bcm2835_clock_rate_from_divisor(clock, parent_rate, div);
53+
@@ -1040,6 +1044,30 @@ static unsigned long bcm2835_clock_get_r
54+
return rate;
5555
}
5656

5757
+static unsigned long bcm2835_clock_get_rate_vpu(struct clk_hw *hw,
@@ -81,7 +81,7 @@ Signed-off-by: Phil Elwell <[email protected]>
8181
static void bcm2835_clock_wait_busy(struct bcm2835_clock *clock)
8282
{
8383
struct bcm2835_cprman *cprman = clock->cprman;
84-
@@ -1298,7 +1326,7 @@ static int bcm2835_vpu_clock_is_on(struc
84+
@@ -1328,7 +1356,7 @@ static int bcm2835_vpu_clock_is_on(struc
8585
*/
8686
static const struct clk_ops bcm2835_vpu_clock_clk_ops = {
8787
.is_prepared = bcm2835_vpu_clock_is_on,
@@ -90,15 +90,15 @@ Signed-off-by: Phil Elwell <[email protected]>
9090
.set_rate = bcm2835_clock_set_rate,
9191
.determine_rate = bcm2835_clock_determine_rate,
9292
.set_parent = bcm2835_clock_set_parent,
93-
@@ -2273,6 +2301,7 @@ static int bcm2835_clk_probe(struct plat
93+
@@ -2304,6 +2332,7 @@ static int bcm2835_clk_probe(struct plat
9494
const struct bcm2835_clk_desc *desc;
9595
const size_t asize = ARRAY_SIZE(clk_desc_array);
9696
const struct cprman_plat_data *pdata;
9797
+ struct device_node *fw_node;
9898
size_t i;
9999
u32 clk_id;
100100
int ret;
101-
@@ -2293,6 +2322,14 @@ static int bcm2835_clk_probe(struct plat
101+
@@ -2324,6 +2353,14 @@ static int bcm2835_clk_probe(struct plat
102102
if (IS_ERR(cprman->regs))
103103
return PTR_ERR(cprman->regs);
104104

‎target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch

+8-8
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ bcm2835-mmc: uninitialized_var is no more
244244
static inline int mmc_blk_part_switch(struct mmc_card *card,
245245
unsigned int part_type);
246246
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
247-
@@ -2923,6 +2930,8 @@ static int mmc_blk_probe(struct mmc_card
247+
@@ -2928,6 +2935,8 @@ static int mmc_blk_probe(struct mmc_card
248248
{
249249
struct mmc_blk_data *md;
250250
int ret = 0;
@@ -253,7 +253,7 @@ bcm2835-mmc: uninitialized_var is no more
253253

254254
/*
255255
* Check that the card supports the command class(es) we need.
256-
@@ -2930,7 +2939,16 @@ static int mmc_blk_probe(struct mmc_card
256+
@@ -2935,7 +2944,16 @@ static int mmc_blk_probe(struct mmc_card
257257
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
258258
return -ENODEV;
259259

@@ -271,7 +271,7 @@ bcm2835-mmc: uninitialized_var is no more
271271

272272
card->complete_wq = alloc_workqueue("mmc_complete",
273273
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
274-
@@ -2945,6 +2963,17 @@ static int mmc_blk_probe(struct mmc_card
274+
@@ -2950,6 +2968,17 @@ static int mmc_blk_probe(struct mmc_card
275275
goto out_free;
276276
}
277277

@@ -303,9 +303,9 @@ bcm2835-mmc: uninitialized_var is no more
303303
}
304304
--- a/drivers/mmc/core/quirks.h
305305
+++ b/drivers/mmc/core/quirks.h
306-
@@ -99,6 +99,14 @@ static const struct mmc_fixup __maybe_un
307-
MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc,
308-
MMC_QUIRK_TRIM_BROKEN),
306+
@@ -105,6 +105,14 @@ static const struct mmc_fixup __maybe_un
307+
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,
308+
MMC_QUIRK_BROKEN_SD_DISCARD),
309309

310310
+ /*
311311
+ * On some Kingston SD cards, multiple erases of less than 64
@@ -2004,9 +2004,9 @@ bcm2835-mmc: uninitialized_var is no more
20042004

20052005
--- a/include/linux/mmc/card.h
20062006
+++ b/include/linux/mmc/card.h
2007-
@@ -293,6 +293,8 @@ struct mmc_card {
2008-
#define MMC_QUIRK_TRIM_BROKEN (1<<12) /* Skip trim */
2007+
@@ -294,6 +294,8 @@ struct mmc_card {
20092008
#define MMC_QUIRK_BROKEN_HPI (1<<13) /* Disable broken HPI support */
2009+
#define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14) /* Disable broken SD discard support */
20102010

20112011
+#define MMC_QUIRK_ERASE_BROKEN (1<<31) /* Skip erase */
20122012
+

‎target/linux/bcm27xx/patches-5.15/950-0134-clk-clk-bcm2835-Use-zd-when-printing-size_t.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <[email protected]>
1313

1414
--- a/drivers/clk/bcm/clk-bcm2835.c
1515
+++ b/drivers/clk/bcm/clk-bcm2835.c
16-
@@ -2376,7 +2376,7 @@ static int bcm2835_clk_probe(struct plat
16+
@@ -2407,7 +2407,7 @@ static int bcm2835_clk_probe(struct plat
1717
return ret;
1818

1919
/* note that we have registered all the clocks */

‎target/linux/bcm27xx/patches-5.15/950-0147-clk-bcm2835-Don-t-wait-for-pllh-lock.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <[email protected]>
1010

1111
--- a/drivers/clk/bcm/clk-bcm2835.c
1212
+++ b/drivers/clk/bcm/clk-bcm2835.c
13-
@@ -644,15 +644,17 @@ static int bcm2835_pll_on(struct clk_hw
13+
@@ -647,15 +647,17 @@ static int bcm2835_pll_on(struct clk_hw
1414
spin_unlock(&cprman->regs_lock);
1515

1616
/* Wait for the PLL to lock. */

‎target/linux/bcm27xx/patches-5.15/950-0149-clk-bcm2835-Add-support-for-setting-leaf-clock-rates.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt <[email protected]>
1414

1515
--- a/drivers/clk/bcm/clk-bcm2835.c
1616
+++ b/drivers/clk/bcm/clk-bcm2835.c
17-
@@ -1109,15 +1109,19 @@ static int bcm2835_clock_set_rate(struct
17+
@@ -1139,15 +1139,19 @@ static int bcm2835_clock_set_rate(struct
1818

1919
spin_lock(&cprman->regs_lock);
2020

@@ -42,7 +42,7 @@ Signed-off-by: Eric Anholt <[email protected]>
4242
ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
4343
cprman_write(cprman, data->ctl_reg, ctl);
4444

45-
@@ -1493,7 +1497,7 @@ static struct clk_hw *bcm2835_register_c
45+
@@ -1523,7 +1527,7 @@ static struct clk_hw *bcm2835_register_c
4646
init.ops = &bcm2835_vpu_clock_clk_ops;
4747
} else {
4848
init.ops = &bcm2835_clock_clk_ops;

‎target/linux/bcm27xx/patches-5.15/950-0150-clk-bcm2835-Allow-reparenting-leaf-clocks-while-they.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Signed-off-by: Eric Anholt <[email protected]>
1515

1616
--- a/drivers/clk/bcm/clk-bcm2835.c
1717
+++ b/drivers/clk/bcm/clk-bcm2835.c
18-
@@ -1098,8 +1098,10 @@ static int bcm2835_clock_on(struct clk_h
18+
@@ -1128,8 +1128,10 @@ static int bcm2835_clock_on(struct clk_h
1919
return 0;
2020
}
2121

@@ -28,7 +28,7 @@ Signed-off-by: Eric Anholt <[email protected]>
2828
{
2929
struct bcm2835_clock *clock = bcm2835_clock_from_hw(hw);
3030
struct bcm2835_cprman *cprman = clock->cprman;
31-
@@ -1121,6 +1123,11 @@ static int bcm2835_clock_set_rate(struct
31+
@@ -1151,6 +1153,11 @@ static int bcm2835_clock_set_rate(struct
3232
bcm2835_clock_wait_busy(clock);
3333
}
3434

@@ -40,7 +40,7 @@ Signed-off-by: Eric Anholt <[email protected]>
4040
ctl &= ~CM_FRAC;
4141
ctl |= (div & CM_DIV_FRAC_MASK) ? CM_FRAC : 0;
4242
cprman_write(cprman, data->ctl_reg, ctl);
43-
@@ -1132,6 +1139,12 @@ static int bcm2835_clock_set_rate(struct
43+
@@ -1162,6 +1169,12 @@ static int bcm2835_clock_set_rate(struct
4444
return 0;
4545
}
4646

@@ -53,15 +53,15 @@ Signed-off-by: Eric Anholt <[email protected]>
5353
static bool
5454
bcm2835_clk_is_pllc(struct clk_hw *hw)
5555
{
56-
@@ -1315,6 +1328,7 @@ static const struct clk_ops bcm2835_cloc
56+
@@ -1345,6 +1358,7 @@ static const struct clk_ops bcm2835_cloc
5757
.unprepare = bcm2835_clock_off,
5858
.recalc_rate = bcm2835_clock_get_rate,
5959
.set_rate = bcm2835_clock_set_rate,
6060
+ .set_rate_and_parent = bcm2835_clock_set_rate_and_parent,
6161
.determine_rate = bcm2835_clock_determine_rate,
6262
.set_parent = bcm2835_clock_set_parent,
6363
.get_parent = bcm2835_clock_get_parent,
64-
@@ -1497,7 +1511,6 @@ static struct clk_hw *bcm2835_register_c
64+
@@ -1527,7 +1541,6 @@ static struct clk_hw *bcm2835_register_c
6565
init.ops = &bcm2835_vpu_clock_clk_ops;
6666
} else {
6767
init.ops = &bcm2835_clock_clk_ops;

‎target/linux/bcm27xx/patches-5.15/950-0152-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
1515

1616
--- a/drivers/usb/host/xhci.c
1717
+++ b/drivers/usb/host/xhci.c
18-
@@ -1611,6 +1611,109 @@ command_cleanup:
18+
@@ -1612,6 +1612,109 @@ command_cleanup:
1919
}
2020

2121
/*
@@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
125125
* non-error returns are a promise to giveback() the urb later
126126
* we drop ownership so next owner (or urb unlink) can get it
127127
*/
128-
@@ -5436,6 +5539,7 @@ static const struct hc_driver xhci_hc_dr
128+
@@ -5437,6 +5540,7 @@ static const struct hc_driver xhci_hc_dr
129129
.endpoint_reset = xhci_endpoint_reset,
130130
.check_bandwidth = xhci_check_bandwidth,
131131
.reset_bandwidth = xhci_reset_bandwidth,

0 commit comments

Comments
 (0)