Skip to content

Commit 58d1180

Browse files
authored
kernel: bump 6.12 to 6.12.85
1 parent 05513ed commit 58d1180

203 files changed

Lines changed: 543 additions & 749 deletions

File tree

Some content is hidden

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

include/kernel-6.12

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.12 = .80
2-
LINUX_KERNEL_HASH-6.12.80 = c92591d896e79ecddbc3319136f0c2f855e832b397de7593f013ad7590a43e53
1+
LINUX_VERSION-6.12 = .85
2+
LINUX_KERNEL_HASH-6.12.85 = e35ac999f40a6874493d8d60f33f1150d7a89ae5841c428da82257fbcd070aed

target/linux/bcm27xx/patches-6.12/950-0005-Revert-net-bcmgenet-Request-APD-DLL-disable-and-IDDQ.patch

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

1616
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
1717
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
18-
@@ -304,9 +304,7 @@ int bcmgenet_mii_probe(struct net_device
18+
@@ -301,9 +301,7 @@ int bcmgenet_mii_probe(struct net_device
1919
struct device_node *dn = kdev->of_node;
2020
phy_interface_t phy_iface = priv->phy_interface;
2121
struct phy_device *phydev;

target/linux/bcm27xx/patches-6.12/950-0016-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
8888
commit->event = kzalloc(sizeof(*commit->event),
8989
--- a/drivers/gpu/drm/i915/display/intel_display.c
9090
+++ b/drivers/gpu/drm/i915/display/intel_display.c
91-
@@ -7645,6 +7645,19 @@ int intel_atomic_commit(struct drm_devic
91+
@@ -7651,6 +7651,19 @@ int intel_atomic_commit(struct drm_devic
9292
state->base.legacy_cursor_update = false;
9393
}
9494

target/linux/bcm27xx/patches-6.12/950-0054-Add-dwc_otg-driver.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1259,7 +1259,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
12591259
USB_PORT_FEAT_C_OVER_CURRENT);
12601260
--- a/drivers/usb/core/message.c
12611261
+++ b/drivers/usb/core/message.c
1262-
@@ -2180,6 +2180,85 @@ free_interfaces:
1262+
@@ -2238,6 +2238,85 @@ free_interfaces:
12631263
if (cp->string == NULL &&
12641264
!(dev->quirks & USB_QUIRK_CONFIG_INTF_STRINGS))
12651265
cp->string = usb_cache_string(dev, cp->desc.iConfiguration);

target/linux/bcm27xx/patches-6.12/950-0073-ASoC-Add-support-for-all-the-downstream-rpi-sound-ca.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18589,7 +18589,7 @@ Signed-off-by: j-schambacher <joerg@hifiberry.com>
1858918589
u32 xfer_resolution;
1859018590
--- a/sound/soc/soc-core.c
1859118591
+++ b/sound/soc/soc-core.c
18592-
@@ -1437,7 +1437,15 @@ int snd_soc_runtime_set_dai_fmt(struct s
18592+
@@ -1436,7 +1436,15 @@ int snd_soc_runtime_set_dai_fmt(struct s
1859318593
return 0;
1859418594

1859518595
for_each_rtd_codec_dais(rtd, i, codec_dai) {
@@ -18626,7 +18626,7 @@ Signed-off-by: j-schambacher <joerg@hifiberry.com>
1862618626
* For devices with more than one control interface, we assume the
1862718627
--- a/sound/usb/quirks.c
1862818628
+++ b/sound/usb/quirks.c
18629-
@@ -2395,6 +2395,8 @@ static const struct usb_audio_quirk_flag
18629+
@@ -2399,6 +2399,8 @@ static const struct usb_audio_quirk_flag
1863018630
QUIRK_FLAG_ALIGN_TRANSFER),
1863118631
DEVICE_FLG(0x534d, 0x2109, /* MacroSilicon MS2109 */
1863218632
QUIRK_FLAG_ALIGN_TRANSFER),

target/linux/bcm27xx/patches-6.12/950-0094-net-lan78xx-Disable-TCP-Segmentation-Offload-TSO.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
3737
static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
3838
{
3939
u32 *buf;
40-
@@ -3462,8 +3471,14 @@ static int lan78xx_bind(struct lan78xx_n
40+
@@ -3466,8 +3475,14 @@ static int lan78xx_bind(struct lan78xx_n
4141
if (DEFAULT_RX_CSUM_ENABLE)
4242
dev->net->features |= NETIF_F_RXCSUM;
4343

target/linux/bcm27xx/patches-6.12/950-0096-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ See: https://github.com/raspberrypi/linux/issues/2447
2828
static int lan78xx_read_reg(struct lan78xx_net *dev, u32 index, u32 *data)
2929
{
3030
u32 *buf;
31-
@@ -4446,7 +4451,13 @@ static int lan78xx_probe(struct usb_inte
31+
@@ -4452,7 +4457,13 @@ static int lan78xx_probe(struct usb_inte
3232
if (ret < 0)
3333
goto out4;
3434

target/linux/bcm27xx/patches-6.12/950-0099-lan78xx-Enable-LEDs-and-auto-negotiation.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
1414

1515
--- a/drivers/net/usb/lan78xx.c
1616
+++ b/drivers/net/usb/lan78xx.c
17-
@@ -2913,6 +2913,11 @@ static int lan78xx_reset(struct lan78xx_
17+
@@ -2917,6 +2917,11 @@ static int lan78xx_reset(struct lan78xx_
1818
int ret;
1919
u32 buf;
2020
u8 sig;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2626

2727
ret = lan78xx_read_reg(dev, HW_CFG, &buf);
2828
if (ret < 0)
29-
@@ -2981,6 +2986,10 @@ static int lan78xx_reset(struct lan78xx_
29+
@@ -2985,6 +2990,10 @@ static int lan78xx_reset(struct lan78xx_
3030
buf |= HW_CFG_CLK125_EN_;
3131
buf |= HW_CFG_REFCLK25_EN_;
3232

@@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
3737
ret = lan78xx_write_reg(dev, HW_CFG, buf);
3838
if (ret < 0)
3939
return ret;
40-
@@ -3083,6 +3092,9 @@ static int lan78xx_reset(struct lan78xx_
40+
@@ -3087,6 +3096,9 @@ static int lan78xx_reset(struct lan78xx_
4141
buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
4242
}
4343
}

target/linux/bcm27xx/patches-6.12/950-0122-bcmgenet-Better-coalescing-parameter-defaults.patch

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

1919
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
2020
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
21-
@@ -2664,7 +2664,7 @@ static void bcmgenet_init_tx_ring(struct
21+
@@ -2657,7 +2657,7 @@ static void bcmgenet_init_tx_ring(struct
2222

2323
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX);
2424
bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX);
@@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
2727
/* Disable rate control for now */
2828
bcmgenet_tdma_ring_writel(priv, index, flow_period_val,
2929
TDMA_FLOW_PERIOD);
30-
@@ -4139,9 +4139,12 @@ static int bcmgenet_probe(struct platfor
30+
@@ -4132,9 +4132,12 @@ static int bcmgenet_probe(struct platfor
3131
netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1);
3232

3333
/* Set default coalescing parameters */

target/linux/bcm27xx/patches-6.12/950-0123-net-genet-enable-link-energy-detect-powerdown-for-ex.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
2020

2121
--- a/drivers/net/ethernet/broadcom/genet/bcmmii.c
2222
+++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c
23-
@@ -310,6 +310,8 @@ int bcmgenet_mii_probe(struct net_device
23+
@@ -307,6 +307,8 @@ int bcmgenet_mii_probe(struct net_device
2424
/* Communicate the integrated PHY revision */
2525
if (priv->internal_phy)
2626
phy_flags = priv->gphy_rev;

0 commit comments

Comments
 (0)