Skip to content

Commit

Permalink
kernel: bump 6.6 to 6.6.49
Browse files Browse the repository at this point in the history 
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.49

All patches automatically rebased.

Build system: x86/64
Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3

Signed-off-by: John Audia <[email protected]>
Link: openwrt/openwrt#16328
Signed-off-by: Hauke Mehrtens <[email protected]>
  • Loading branch information
@graysky2 @hauke
graysky2 authored and hauke committed Sep 6, 2024
1 parent 4b7e704 commit 7788624
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.6
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .48
LINUX_KERNEL_HASH-6.6.48 = 6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029
LINUX_VERSION-6.6 = .49
LINUX_KERNEL_HASH-6.6.49 = 2c56dac2b70859c16b4ef651befb0d28c227498bd3eee08e8a45a357f22dd3b7
16 changes: 8 additions & 8 deletions target/linux/bcm27xx/patches-6.6/950-0519-usb-dwc3-Set-DMA-and-coherent-masks-early.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
},
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1194,6 +1194,24 @@ static void dwc3_config_threshold(struct
@@ -1202,6 +1202,24 @@ static void dwc3_config_threshold(struct
}
}

Expand All @@ -237,7 +237,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
/**
* dwc3_core_init - Low-level initialization of DWC3 Core
* @dwc: Pointer to our controller context structure
@@ -1259,6 +1277,8 @@ static int dwc3_core_init(struct dwc3 *d
@@ -1267,6 +1285,8 @@ static int dwc3_core_init(struct dwc3 *d

dwc3_set_incr_burst_type(dwc);

Expand All @@ -246,7 +246,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
ret = dwc3_phy_power_on(dwc);
if (ret)
goto err_exit_phy;
@@ -1333,6 +1353,24 @@ static int dwc3_core_init(struct dwc3 *d
@@ -1341,6 +1361,24 @@ static int dwc3_core_init(struct dwc3 *d

dwc3_config_threshold(dwc);

Expand All @@ -271,15 +271,15 @@ Signed-off-by: Jonathan Bell <[email protected]>
return 0;

err_power_off_phy:
@@ -1476,6 +1514,7 @@ static void dwc3_get_properties(struct d
@@ -1484,6 +1522,7 @@ static void dwc3_get_properties(struct d
u8 tx_thr_num_pkt_prd = 0;
u8 tx_max_burst_prd = 0;
u8 tx_fifo_resize_max_num;
+ u8 axi_pipe_limit;
const char *usb_psy_name;
int ret;

@@ -1498,6 +1537,9 @@ static void dwc3_get_properties(struct d
@@ -1506,6 +1545,9 @@ static void dwc3_get_properties(struct d
*/
tx_fifo_resize_max_num = 6;

Expand All @@ -289,7 +289,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
dwc->maximum_speed = usb_get_maximum_speed(dev);
dwc->max_ssp_rate = usb_get_maximum_ssp_rate(dev);
dwc->dr_mode = usb_get_dr_mode(dev);
@@ -1619,6 +1661,9 @@ static void dwc3_get_properties(struct d
@@ -1627,6 +1669,9 @@ static void dwc3_get_properties(struct d
dwc->dis_split_quirk = device_property_read_bool(dev,
"snps,dis-split-quirk");

Expand All @@ -299,7 +299,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
dwc->lpm_nyet_threshold = lpm_nyet_threshold;
dwc->tx_de_emphasis = tx_de_emphasis;

@@ -1636,6 +1681,8 @@ static void dwc3_get_properties(struct d
@@ -1644,6 +1689,8 @@ static void dwc3_get_properties(struct d
dwc->tx_thr_num_pkt_prd = tx_thr_num_pkt_prd;
dwc->tx_max_burst_prd = tx_max_burst_prd;

Expand All @@ -308,7 +308,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
dwc->imod_interval = 0;

dwc->tx_fifo_resize_max_num = tx_fifo_resize_max_num;
@@ -1911,6 +1958,12 @@ static int dwc3_probe(struct platform_de
@@ -1919,6 +1966,12 @@ static int dwc3_probe(struct platform_de

dwc3_get_properties(dwc);

Expand Down
4 changes: 2 additions & 2 deletions ...x/bcm27xx/patches-6.6/950-0853-drivers-usb-dwc3-add-FS-LS-bus-instance-parkmode-dis.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Jonathan Bell <[email protected]>

--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -1343,6 +1343,9 @@ static int dwc3_core_init(struct dwc3 *d
@@ -1351,6 +1351,9 @@ static int dwc3_core_init(struct dwc3 *d
if (dwc->parkmode_disable_hs_quirk)
reg |= DWC3_GUCTL1_PARKMODE_DISABLE_HS;

Expand All @@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell <[email protected]>
if (DWC3_VER_IS_WITHIN(DWC3, 290A, ANY) &&
(dwc->maximum_speed == USB_SPEED_HIGH ||
dwc->maximum_speed == USB_SPEED_FULL))
@@ -1641,6 +1644,8 @@ static void dwc3_get_properties(struct d
@@ -1649,6 +1652,8 @@ static void dwc3_get_properties(struct d
"snps,parkmode-disable-ss-quirk");
dwc->parkmode_disable_hs_quirk = device_property_read_bool(dev,
"snps,parkmode-disable-hs-quirk");
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/backport-6.6/894-v6.8-net-ethtool-implement-ethtool_puts.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Signed-off-by: Justin Stitt <[email protected]>
#endif /* _LINUX_ETHTOOL_H */
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -1991,6 +1991,13 @@ __printf(2, 3) void ethtool_sprintf(u8 *
@@ -1994,6 +1994,13 @@ __printf(2, 3) void ethtool_sprintf(u8 *
}
EXPORT_SYMBOL(ethtool_sprintf);

Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support

#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
@@ -1156,6 +1161,11 @@ static const struct usb_device_id option
@@ -1158,6 +1163,11 @@ static const struct usb_device_id option
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
Expand All @@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
/* Quectel products using Qualcomm vendor ID */
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
@@ -1197,6 +1207,11 @@ static const struct usb_device_id option
@@ -1199,6 +1209,11 @@ static const struct usb_device_id option
.driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },
Expand Down
16 changes: 8 additions & 8 deletions target/linux/mediatek/patches-6.6/351-pinctrl-add-mt7988-pd-pulltype-support.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
static int mtk_pinconf_bias_set_pullsel_pullen(struct mtk_pinctrl *hw,
const struct mtk_pin_desc *desc,
u32 pullup, u32 arg)
@@ -755,6 +779,12 @@ int mtk_pinconf_bias_set_combo(struct mt
return err;
@@ -758,6 +782,12 @@ int mtk_pinconf_bias_set_combo(struct mt
return 0;
}

+ if (try_all_type & MTK_PULL_PD_TYPE) {
Expand All @@ -44,7 +44,7 @@
if (try_all_type & MTK_PULL_PU_PD_TYPE) {
err = mtk_pinconf_bias_set_pu_pd(hw, desc, pullup, arg);
if (!err)
@@ -875,6 +905,29 @@ out:
@@ -878,6 +908,29 @@ out:
return err;
}

Expand Down Expand Up @@ -74,19 +74,19 @@
static int mtk_pinconf_bias_get_pullsel_pullen(struct mtk_pinctrl *hw,
const struct mtk_pin_desc *desc,
u32 *pullup, u32 *enable)
@@ -943,6 +996,12 @@ int mtk_pinconf_bias_get_combo(struct mt
if (!err)
return err;
@@ -947,6 +1000,12 @@ int mtk_pinconf_bias_get_combo(struct mt
return 0;
}
+
+ if (try_all_type & MTK_PULL_PD_TYPE) {
+ err = mtk_pinconf_bias_get_pd(hw, desc, pullup, enable);
+ if (!err)
+ return err;
+ }
+
if (try_all_type & MTK_PULL_PU_PD_TYPE) {
err = mtk_pinconf_bias_get_pu_pd(hw, desc, pullup, enable);
if (!err)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h
@@ -24,6 +24,7 @@
Expand Down
6 changes: 3 additions & 3 deletions target/linux/rockchip/patches-6.6/034-v6.7-usb-dwc3-add-optional-PHY-interface-clocks.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>

--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -831,8 +831,20 @@ static int dwc3_clk_enable(struct dwc3 *
@@ -839,8 +839,20 @@ static int dwc3_clk_enable(struct dwc3 *
if (ret)
goto disable_ref_clk;

Expand All @@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
disable_ref_clk:
clk_disable_unprepare(dwc->ref_clk);
disable_bus_clk:
@@ -842,6 +854,8 @@ disable_bus_clk:
@@ -850,6 +862,8 @@ disable_bus_clk:

static void dwc3_clk_disable(struct dwc3 *dwc)
{
Expand All @@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
clk_disable_unprepare(dwc->susp_clk);
clk_disable_unprepare(dwc->ref_clk);
clk_disable_unprepare(dwc->bus_clk);
@@ -1855,6 +1869,20 @@ static int dwc3_get_clocks(struct dwc3 *
@@ -1863,6 +1877,20 @@ static int dwc3_get_clocks(struct dwc3 *
}
}

Expand Down

0 comments on commit 7788624

Please sign in to comment.