Skip to content

Commit 3e1d391

Browse files
graysky2DragonBluep
authored andcommitted
kernel: bump 6.12 to 6.12.77
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.77 Removed upstream: generic/backport-6.12/204-v6.13-resource-Add-resource-set-range-and-size-helpers.patch[1] microchipsw/patches-6.12/0098-v7.0-net-sparx5-lan969x-fix-DWRR-cost-max-to-match-hardwa.patch Manually rebased: bcm27xx/patches-6.12/950-0955-hwmon-aht10-Fix-AHT20-initialization.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.77&id=889b5cb678c1ae5a4e1ff3b2c46f06ef4292aa86 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.77&id=6c28aa8dfdf24f554d4c5d4ff7d723a95360d94a Build system: x86/64 Build-tested: flogic/glinet_gl-mt6000 Run-tested: flogic/glinet_gl-mt6000 Co-authored-by: Shiji Yang <yangshiji66@outlook.com> Signed-off-by: John Audia <therealgraysky@proton.me> Link: openwrt#22276 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent efdb993 commit 3e1d391

22 files changed

Lines changed: 65 additions & 201 deletions

target/linux/bcm27xx/patches-6.12/950-0069-Improve-__copy_to_user-and-__copy_from_user-performa.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
8686

8787
--- a/arch/arm/include/asm/string.h
8888
+++ b/arch/arm/include/asm/string.h
89-
@@ -68,4 +68,9 @@ static inline void *memset64(uint64_t *p
89+
@@ -72,4 +72,9 @@ static inline void *memset64(uint64_t *p
9090

9191
#endif
9292

target/linux/bcm27xx/patches-6.12/950-0132-hid-usb-Add-device-quirks-for-Freeway-Airmouse-T3-an.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
3232
#define USB_VENDOR_ID_BELKIN 0x050d
3333
#define USB_DEVICE_ID_FLIP_KVM 0x3201
3434

35-
@@ -1479,6 +1482,9 @@
35+
@@ -1480,6 +1483,9 @@
3636
#define USB_VENDOR_ID_XIAOMI 0x2717
3737
#define USB_DEVICE_ID_MI_SILENT_MOUSE 0x5014
3838

target/linux/bcm27xx/patches-6.12/950-0309-hwmon-aht10-Add-DT-compatible-string.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1010

1111
--- a/drivers/hwmon/aht10.c
1212
+++ b/drivers/hwmon/aht10.c
13-
@@ -57,6 +57,12 @@ static const struct i2c_device_id aht10_
13+
@@ -62,6 +62,12 @@ static const struct i2c_device_id aht10_
1414
};
1515
MODULE_DEVICE_TABLE(i2c, aht10_id);
1616

@@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
2323
/**
2424
* struct aht10_data - All the data required to operate an AHT10/AHT20 chip
2525
* @client: the i2c client associated with the AHT10/AHT20
26-
@@ -380,6 +386,7 @@ static int aht10_probe(struct i2c_client
26+
@@ -395,6 +401,7 @@ static int aht10_probe(struct i2c_client
2727
static struct i2c_driver aht10_driver = {
2828
.driver = {
2929
.name = "aht10",

target/linux/bcm27xx/patches-6.12/950-0407-media-i2c-Add-ROHM-BU64754-Camera-Autofocus-Actuator.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
3737
+
3838
config VIDEO_DW9714
3939
tristate "DW9714 lens voice coil support"
40-
depends on I2C && VIDEO_DEV
40+
depends on GPIOLIB && I2C && VIDEO_DEV
4141
--- a/drivers/media/i2c/Makefile
4242
+++ b/drivers/media/i2c/Makefile
4343
@@ -26,6 +26,7 @@ obj-$(CONFIG_VIDEO_ARDUCAM_PIVARIETY) +=

target/linux/bcm27xx/patches-6.12/950-0724-Revert-PCI-Warn-if-no-host-bridge-NUMA-node-info.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
1212

1313
--- a/drivers/pci/probe.c
1414
+++ b/drivers/pci/probe.c
15-
@@ -996,9 +996,6 @@ static int pci_register_host_bridge(stru
15+
@@ -994,9 +994,6 @@ static int pci_register_host_bridge(stru
1616
else
1717
pr_info("PCI host bridge to bus %s\n", name);
1818

target/linux/bcm27xx/patches-6.12/950-0955-hwmon-aht10-Fix-AHT20-initialization.patch

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,11 @@ Signed-off-by: Josh Martinez <8892161+joshermar@users.noreply.github.com>
1717

1818
--- a/drivers/hwmon/aht10.c
1919
+++ b/drivers/hwmon/aht10.c
20-
@@ -37,6 +37,8 @@
21-
#define AHT10_CMD_MEAS 0b10101100
22-
#define AHT10_CMD_RST 0b10111010
23-
24-
+#define AHT20_CMD_INIT 0b10111110
25-
+
26-
/*
27-
* Flags in the answer byte/command
28-
*/
29-
@@ -59,6 +61,7 @@ MODULE_DEVICE_TABLE(i2c, aht10_id);
20+
@@ -64,6 +64,7 @@ MODULE_DEVICE_TABLE(i2c, aht10_id);
3021

3122
static const struct of_device_id aht10_of_id[] = {
3223
{ .compatible = "aosong,aht10", },
3324
+ { .compatible = "aosong,aht20", },
3425
{ }
3526
};
3627
MODULE_DEVICE_TABLE(of, aht10_of_id);
37-
@@ -107,8 +110,13 @@ struct aht10_data {
38-
*/
39-
static int aht10_init(struct aht10_data *data)
40-
{
41-
- const u8 cmd_init[] = {AHT10_CMD_INIT, AHT10_CAL_ENABLED | AHT10_MODE_CYC,
42-
- 0x00};
43-
+ u8 cmd_init[] = {AHT10_CMD_INIT, AHT10_CAL_ENABLED | AHT10_MODE_CYC, 0x00};
44-
+
45-
+ if (data->crc8) { /* AHT20 */
46-
+ cmd_init[0] = AHT20_CMD_INIT;
47-
+ cmd_init[1] = AHT10_CAL_ENABLED;
48-
+ }
49-
+
50-
int res;
51-
u8 status;
52-
struct i2c_client *client = data->client;

target/linux/econet/patches-6.12/913-pcie-fix-bogus-prefetch-window.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Suggested-by: Bjorn Helgaas <helgaas@kernel.org>
1616
Signed-off-by: Ahmed Naseef <naseefkm@gmail.com>
1717
--- a/drivers/pci/probe.c
1818
+++ b/drivers/pci/probe.c
19-
@@ -351,6 +351,9 @@ static void pci_read_bridge_io(struct pc
19+
@@ -349,6 +349,9 @@ static void pci_read_bridge_io(struct pc
2020
unsigned long io_mask, io_granularity, base, limit;
2121
struct pci_bus_region region;
2222

@@ -26,7 +26,7 @@ Signed-off-by: Ahmed Naseef <naseefkm@gmail.com>
2626
io_mask = PCI_IO_RANGE_MASK;
2727
io_granularity = 0x1000;
2828
if (dev->io_window_1k) {
29-
@@ -412,6 +415,9 @@ static void pci_read_bridge_mmio_pref(st
29+
@@ -410,6 +413,9 @@ static void pci_read_bridge_mmio_pref(st
3030
pci_bus_addr_t base, limit;
3131
struct pci_bus_region region;
3232

target/linux/generic/backport-6.12/204-v6.13-resource-Add-resource-set-range-and-size-helpers.patch

Lines changed: 0 additions & 73 deletions
This file was deleted.

target/linux/generic/backport-6.12/721-01-v6.15-net-ethernet-mediatek-add-EEE-support.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Signed-off-by: Qingfang Deng <dqfext@gmail.com>
3939
mcr |= MAC_MCR_TX_EN | MAC_MCR_RX_EN | MAC_MCR_FORCE_LINK;
4040
mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
4141
}
42-
@@ -4514,6 +4524,61 @@ static int mtk_set_pauseparam(struct net
42+
@@ -4523,6 +4533,61 @@ static int mtk_set_pauseparam(struct net
4343
return phylink_ethtool_set_pauseparam(mac->phylink, pause);
4444
}
4545

@@ -101,7 +101,7 @@ Signed-off-by: Qingfang Deng <dqfext@gmail.com>
101101
static u16 mtk_select_queue(struct net_device *dev, struct sk_buff *skb,
102102
struct net_device *sb_dev)
103103
{
104-
@@ -4546,6 +4611,8 @@ static const struct ethtool_ops mtk_etht
104+
@@ -4555,6 +4620,8 @@ static const struct ethtool_ops mtk_etht
105105
.set_pauseparam = mtk_set_pauseparam,
106106
.get_rxnfc = mtk_get_rxnfc,
107107
.set_rxnfc = mtk_set_rxnfc,
@@ -110,7 +110,7 @@ Signed-off-by: Qingfang Deng <dqfext@gmail.com>
110110
};
111111

112112
static const struct net_device_ops mtk_netdev_ops = {
113-
@@ -4606,6 +4673,8 @@ static int mtk_add_mac(struct mtk_eth *e
113+
@@ -4615,6 +4682,8 @@ static int mtk_add_mac(struct mtk_eth *e
114114
}
115115
mac = netdev_priv(eth->netdev[id]);
116116
eth->mac[id] = mac;

target/linux/generic/hack-6.12/730-net-ethernet-mtk_eth_soc-add-hw-dump-for-forced-rese.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
3737
.glo_cfg = 0x4604,
3838
.rst_idx = 0x4608,
3939
.delay_irq = 0x460c,
40-
@@ -4060,6 +4063,56 @@ static void mtk_set_mcr_max_rx(struct mt
40+
@@ -4069,6 +4072,56 @@ static void mtk_set_mcr_max_rx(struct mt
4141
mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id));
4242
}
4343

@@ -94,7 +94,7 @@ Signed-off-by: Bo-Cun Chen <bc-bocun.chen@mediatek.com>
9494
static void mtk_hw_reset(struct mtk_eth *eth)
9595
{
9696
u32 val;
97-
@@ -4539,6 +4592,8 @@ static void mtk_pending_work(struct work
97+
@@ -4548,6 +4601,8 @@ static void mtk_pending_work(struct work
9898
rtnl_lock();
9999
set_bit(MTK_RESETTING, &eth->state);
100100

0 commit comments

Comments
 (0)