Skip to content

Commit 88b1060

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: toolchain/gcc: GCC12 sync upstream (coolsnowwolf#10080) ath11k-firmware: WCN6855: fix firmware link (coolsnowwolf#10078) kernel: fixes build error and refresh 5.15 patches (coolsnowwolf#10074)
2 parents 8412ae0 + 985cc94 commit 88b1060

File tree

53 files changed

+242
-246
lines changed

Some content is hidden

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

53 files changed

+242
-246
lines changed

‎package/firmware/ath11k-firmware/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ define Package/ath11k-firmware-wcn6855/install
103103
$(INSTALL_DATA) \
104104
$(PKG_BUILD_DIR)/WCN6855/hw2.0/regdb.bin \
105105
$(1)/lib/firmware/ath11k/WCN6855/hw2.0/regdb.bin
106-
$(LN) $(1)/lib/firmware/ath11k/WCN6855/hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
106+
$(LN) ./hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
107107
endef
108108

109109
$(eval $(call BuildPackage,ath11k-firmware-ipq6018))

‎target/linux/ath79/patches-5.15/408-mtd-redboot_partition_scan.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/mtd/parsers/redboot.c
22
+++ b/drivers/mtd/parsers/redboot.c
3-
@@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru
3+
@@ -91,12 +91,18 @@ static int parse_redboot_partitions(stru
44

55
parse_redboot_of(master);
66

@@ -19,7 +19,7 @@
1919
return -EIO;
2020
}
2121
offset -= master->erasesize;
22-
@@ -108,10 +114,6 @@ nogood:
22+
@@ -109,10 +115,6 @@ nogood:
2323
goto nogood;
2424
}
2525
}
@@ -30,7 +30,7 @@
3030

3131
pr_notice("Searching for RedBoot partition table in %s at offset 0x%lx\n",
3232
master->name, offset);
33-
@@ -183,6 +185,12 @@ nogood:
33+
@@ -184,6 +186,12 @@ nogood:
3434
}
3535
if (i == numslots) {
3636
/* Didn't find it */

‎target/linux/generic/backport-5.15/850-v5.17-0007-PCI-aardvark-Mask-all-interrupts-when-unbinding-driv.patch

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

1919
--- a/drivers/pci/controller/pci-aardvark.c
2020
+++ b/drivers/pci/controller/pci-aardvark.c
21-
@@ -1874,6 +1874,27 @@ static int advk_pcie_remove(struct platf
21+
@@ -1889,6 +1889,27 @@ static int advk_pcie_remove(struct platf
2222
advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
2323
advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
2424

‎target/linux/generic/backport-5.15/850-v5.17-0008-PCI-aardvark-Fix-memory-leak-in-driver-unbind.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
2121

2222
--- a/drivers/pci/controller/pci-aardvark.c
2323
+++ b/drivers/pci/controller/pci-aardvark.c
24-
@@ -1912,6 +1912,9 @@ static int advk_pcie_remove(struct platf
24+
@@ -1927,6 +1927,9 @@ static int advk_pcie_remove(struct platf
2525
val &= ~LINK_TRAINING_EN;
2626
advk_writel(pcie, val, PCIE_CORE_CTRL0_REG);
2727

‎target/linux/generic/backport-5.15/850-v5.17-0009-PCI-aardvark-Assert-PERST-when-unbinding-driver.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
2020

2121
--- a/drivers/pci/controller/pci-aardvark.c
2222
+++ b/drivers/pci/controller/pci-aardvark.c
23-
@@ -1915,6 +1915,10 @@ static int advk_pcie_remove(struct platf
23+
@@ -1930,6 +1930,10 @@ static int advk_pcie_remove(struct platf
2424
/* Free config space for emulated root bridge */
2525
pci_bridge_emul_cleanup(&pcie->bridge);
2626

‎target/linux/generic/backport-5.15/850-v5.17-0010-PCI-aardvark-Disable-link-training-when-unbinding-dr.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Lorenzo Pieralisi <[email protected]>
2020

2121
--- a/drivers/pci/controller/pci-aardvark.c
2222
+++ b/drivers/pci/controller/pci-aardvark.c
23-
@@ -1919,6 +1919,11 @@ static int advk_pcie_remove(struct platf
23+
@@ -1934,6 +1934,11 @@ static int advk_pcie_remove(struct platf
2424
if (pcie->reset_gpio)
2525
gpiod_set_value_cansleep(pcie->reset_gpio, 1);
2626

‎target/linux/generic/backport-5.15/850-v5.17-0011-PCI-aardvark-Disable-common-PHY-when-unbinding-drive.patch

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

1919
--- a/drivers/pci/controller/pci-aardvark.c
2020
+++ b/drivers/pci/controller/pci-aardvark.c
21-
@@ -1634,6 +1634,9 @@ static int advk_pcie_enable_phy(struct a
21+
@@ -1649,6 +1649,9 @@ static int advk_pcie_enable_phy(struct a
2222
return ret;
2323
}
2424

‎target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
--- a/drivers/net/dsa/mv88e6xxx/chip.c
22
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
3-
@@ -2321,6 +2321,7 @@ static int mv88e6xxx_port_fdb_add(struct
3+
@@ -2320,6 +2320,7 @@ static int mv88e6xxx_port_fdb_add(struct
44
struct mv88e6xxx_chip *chip = ds->priv;
55
int err;
66

77
+ vid = vid ? : 1;
88
mv88e6xxx_reg_lock(chip);
99
err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid,
1010
MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC);
11-
@@ -2335,6 +2336,7 @@ static int mv88e6xxx_port_fdb_del(struct
11+
@@ -2334,6 +2335,7 @@ static int mv88e6xxx_port_fdb_del(struct
1212
struct mv88e6xxx_chip *chip = ds->priv;
1313
int err;
1414

‎target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/net/dsa/mv88e6xxx/chip.c
22
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
3-
@@ -2980,6 +2980,9 @@ static int mv88e6xxx_setup_port(struct m
3+
@@ -2982,6 +2982,9 @@ static int mv88e6xxx_setup_port(struct m
44
else
55
reg = 1 << port;
66

‎target/linux/generic/hack-5.15/953-net-patch-linux-kernel-to-support-shortcut-fe.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
+ int (*fast_recv)(struct sk_buff *skb);
132132
+#endif
133133
+
134-
net_timestamp_check(!netdev_tstamp_prequeue, skb);
134+
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);
135135

136136
trace_netif_receive_skb(skb);
137137
@@ -5299,6 +5316,15 @@ another_round:

‎target/linux/generic/pending-5.15/419-mtd-redboot-add-of_match_table-with-DT-binding.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
1212

1313
--- a/drivers/mtd/parsers/redboot.c
1414
+++ b/drivers/mtd/parsers/redboot.c
15-
@@ -304,6 +304,7 @@ nogood:
15+
@@ -305,6 +305,7 @@ nogood:
1616

1717
static const struct of_device_id mtd_parser_redboot_of_match_table[] = {
1818
{ .compatible = "redboot-fis" },

‎target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <[email protected]>
1717

1818
--- a/drivers/net/dsa/mv88e6xxx/chip.c
1919
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
20-
@@ -3193,6 +3193,7 @@ static int mv88e6xxx_setup(struct dsa_sw
20+
@@ -3192,6 +3192,7 @@ static int mv88e6xxx_setup(struct dsa_sw
2121

2222
chip->ds = ds;
2323
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);

‎target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <[email protected]>
1717

1818
--- a/drivers/net/dsa/mv88e6xxx/chip.c
1919
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
20-
@@ -6319,6 +6319,7 @@ static int mv88e6xxx_register_switch(str
20+
@@ -6320,6 +6320,7 @@ static int mv88e6xxx_register_switch(str
2121
ds->ops = &mv88e6xxx_switch_ops;
2222
ds->ageing_time_min = chip->info->age_time_coeff;
2323
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;

‎target/linux/generic/pending-5.15/773-net-sfp-add-support-for-HALNy-GPON-SFP.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Signed-off-by: Russell King (Oracle) <[email protected]>
2424
+ if (bus->sfp_quirk && bus->sfp_quirk->modes)
2525
bus->sfp_quirk->modes(id, modes);
2626

27-
bitmap_or(support, support, modes, __ETHTOOL_LINK_MODE_MASK_NBITS);
27+
linkmode_or(support, support, modes);
2828
--- a/drivers/net/phy/sfp.c
2929
+++ b/drivers/net/phy/sfp.c
3030
@@ -320,6 +320,23 @@ static void sfp_fixup_ignore_tx_fault(st

‎target/linux/generic/pending-5.15/850-0016-PCI-aardvark-Add-support-for-PME-interrupts.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Signed-off-by: Marek Behún <[email protected]>
2525

2626
--- a/drivers/pci/controller/pci-aardvark.c
2727
+++ b/drivers/pci/controller/pci-aardvark.c
28-
@@ -1553,6 +1553,22 @@ static void advk_pcie_handle_int(struct
28+
@@ -1568,6 +1568,22 @@ static void advk_pcie_handle_int(struct
2929
dev_err_ratelimited(&pcie->pdev->dev, "unhandled ERR IRQ\n");
3030
}
3131

‎target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Acked-by: Miquel Raynal <[email protected]>
2323

2424
--- a/drivers/pci/controller/pci-aardvark.c
2525
+++ b/drivers/pci/controller/pci-aardvark.c
26-
@@ -1631,9 +1631,7 @@ static int advk_pcie_enable_phy(struct a
26+
@@ -1647,9 +1647,7 @@ static int advk_pcie_enable_phy(struct a
2727
}
2828

2929
ret = phy_power_on(pcie->phy);

‎target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch

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

1414
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
1515
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
16-
@@ -75,6 +75,19 @@ &emmc_phy {
16+
@@ -68,6 +68,19 @@
1717
status = "disabled";
1818
};
1919

‎target/linux/rockchip/patches-5.15/009-v5.16-drivers-rockchip-thermal-Allow-more-resets-for-tsadc.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Daniel Lezcano <[email protected]>
1717

1818
--- a/drivers/thermal/rockchip_thermal.c
1919
+++ b/drivers/thermal/rockchip_thermal.c
20-
@@ -1383,7 +1383,7 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
20+
@@ -1383,7 +1383,7 @@ static int rockchip_thermal_probe(struct
2121
if (IS_ERR(thermal->regs))
2222
return PTR_ERR(thermal->regs);
2323

‎target/linux/rockchip/patches-5.15/010-v5.16-net-stmmac-Add-GFP_DMA32-for-rx-buffers-if-no-64.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <[email protected]>
1515

1616
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
1717
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
18-
@@ -1463,16 +1463,20 @@ static int stmmac_init_rx_buffers(struct stmmac_priv *priv, struct dma_desc *p,
18+
@@ -1455,16 +1455,20 @@ static int stmmac_init_rx_buffers(struct
1919
{
2020
struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
2121
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[i];
@@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <[email protected]>
3838
if (!buf->sec_page)
3939
return -ENOMEM;
4040

41-
@@ -4496,6 +4500,10 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
41+
@@ -4496,6 +4500,10 @@ static inline void stmmac_rx_refill(stru
4242
struct stmmac_rx_queue *rx_q = &priv->rx_queue[queue];
4343
int dirty = stmmac_rx_dirty(priv, queue);
4444
unsigned int entry = rx_q->dirty_rx;
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <[email protected]>
4949

5050
while (dirty-- > 0) {
5151
struct stmmac_rx_buffer *buf = &rx_q->buf_pool[entry];
52-
@@ -4508,13 +4516,13 @@ static inline void stmmac_rx_refill(struct stmmac_priv *priv, u32 queue)
52+
@@ -4508,13 +4516,13 @@ static inline void stmmac_rx_refill(stru
5353
p = rx_q->dma_rx + entry;
5454

5555
if (!buf->page) {

‎target/linux/rockchip/patches-5.15/032-v5.17-phy-rockchip-inno-usb2-support-address-cells.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Vinod Koul <[email protected]>
2020

2121
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
2222
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
23-
@@ -1090,12 +1090,21 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
23+
@@ -1098,12 +1098,21 @@ static int rockchip_usb2phy_probe(struct
2424
rphy->usbgrf = NULL;
2525
}
2626

‎target/linux/rockchip/patches-5.15/033-v5.17-phy-rockchip-inno-usb2-support-standalone-phy-nodes.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Signed-off-by: Vinod Koul <[email protected]>
1717

1818
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
1919
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
20-
@@ -1073,12 +1073,19 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
20+
@@ -1081,12 +1081,19 @@ static int rockchip_usb2phy_probe(struct
2121
return -EINVAL;
2222
}
2323

‎target/linux/rockchip/patches-5.15/034-v5.17-phy-rockchip-inno-usb2-support-muxed-interrupts.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Signed-off-by: Vinod Koul <[email protected]>
3333
const struct rockchip_usb2phy_cfg *phy_cfg;
3434
struct rockchip_usb2phy_port ports[USB2PHY_NUM_PORTS];
3535
};
36-
@@ -926,6 +928,102 @@ static irqreturn_t rockchip_usb2phy_otg_mux_irq(int irq, void *data)
36+
@@ -934,6 +936,102 @@ static irqreturn_t rockchip_usb2phy_otg_
3737
return IRQ_NONE;
3838
}
3939

@@ -136,7 +136,7 @@ Signed-off-by: Vinod Koul <[email protected]>
136136
static int rockchip_usb2phy_host_port_init(struct rockchip_usb2phy *rphy,
137137
struct rockchip_usb2phy_port *rport,
138138
struct device_node *child_np)
139-
@@ -939,18 +1037,9 @@ static int rockchip_usb2phy_host_port_init(struct rockchip_usb2phy *rphy,
139+
@@ -947,18 +1045,9 @@ static int rockchip_usb2phy_host_port_in
140140
mutex_init(&rport->mutex);
141141
INIT_DELAYED_WORK(&rport->sm_work, rockchip_usb2phy_sm_work);
142142

@@ -157,7 +157,7 @@ Signed-off-by: Vinod Koul <[email protected]>
157157
return ret;
158158
}
159159

160-
@@ -999,44 +1088,10 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
160+
@@ -1007,44 +1096,10 @@ static int rockchip_usb2phy_otg_port_ini
161161
INIT_DELAYED_WORK(&rport->chg_work, rockchip_chg_detect_work);
162162
INIT_DELAYED_WORK(&rport->otg_sm_work, rockchip_usb2phy_otg_sm_work);
163163

@@ -206,15 +206,15 @@ Signed-off-by: Vinod Koul <[email protected]>
206206

207207
if (!IS_ERR(rphy->edev)) {
208208
rport->event_nb.notifier_call = rockchip_otg_event;
209-
@@ -1116,6 +1171,7 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
209+
@@ -1124,6 +1179,7 @@ static int rockchip_usb2phy_probe(struct
210210
phy_cfgs = match->data;
211211
rphy->chg_state = USB_CHG_STATE_UNDEFINED;
212212
rphy->chg_type = POWER_SUPPLY_TYPE_UNKNOWN;
213213
+ rphy->irq = platform_get_irq_optional(pdev, 0);
214214
platform_set_drvdata(pdev, rphy);
215215

216216
ret = rockchip_usb2phy_extcon_register(rphy);
217-
@@ -1195,6 +1251,20 @@ static int rockchip_usb2phy_probe(struct platform_device *pdev)
217+
@@ -1203,6 +1259,20 @@ next_child:
218218
}
219219

220220
provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);

‎target/linux/rockchip/patches-5.15/035-v5.17-phy-rockchip-inno-usb2-add-rk3568-support.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ Signed-off-by: Vinod Koul <[email protected]>
1616

1717
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
1818
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
19-
@@ -1092,6 +1092,7 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
19+
@@ -1100,6 +1100,7 @@ static int rockchip_usb2phy_otg_port_ini
2020
if (ret) {
2121
dev_err(rphy->dev, "failed to init irq for host port\n");
2222
goto out;
2323
+ }
2424

2525
if (!IS_ERR(rphy->edev)) {
2626
rport->event_nb.notifier_call = rockchip_otg_event;
27-
@@ -1503,6 +1504,69 @@ static const struct rockchip_usb2phy_cfg rk3399_phy_cfgs[] = {
27+
@@ -1511,6 +1512,69 @@ static const struct rockchip_usb2phy_cfg
2828
{ /* sentinel */ }
2929
};
3030

@@ -94,7 +94,7 @@ Signed-off-by: Vinod Koul <[email protected]>
9494
static const struct rockchip_usb2phy_cfg rv1108_phy_cfgs[] = {
9595
{
9696
.reg = 0x100,
97-
@@ -1552,6 +1616,7 @@ static const struct of_device_id rockchip_usb2phy_dt_match[] = {
97+
@@ -1560,6 +1624,7 @@ static const struct of_device_id rockchi
9898
{ .compatible = "rockchip,rk3328-usb2phy", .data = &rk3328_phy_cfgs },
9999
{ .compatible = "rockchip,rk3366-usb2phy", .data = &rk3366_phy_cfgs },
100100
{ .compatible = "rockchip,rk3399-usb2phy", .data = &rk3399_phy_cfgs },

‎target/linux/rockchip/patches-5.15/036-v5.18-arm64-dts-rockchip-rename-and-sort-the-rk356x-usb2-phy.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
5757
phy-names = "usb";
5858
status = "disabled";
5959
};
60-
@@ -1211,7 +1211,7 @@
60+
@@ -1195,7 +1195,7 @@
6161
status = "disabled";
6262
};
6363

@@ -66,7 +66,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
6666
compatible = "rockchip,rk3568-usb2phy";
6767
reg = <0x0 0xfe8a0000 0x0 0x10000>;
6868
clocks = <&pmucru CLK_USBPHY0_REF>;
69-
@@ -1222,18 +1222,18 @@
69+
@@ -1206,18 +1206,18 @@
7070
#clock-cells = <0>;
7171
status = "disabled";
7272

@@ -88,7 +88,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
8888
compatible = "rockchip,rk3568-usb2phy";
8989
reg = <0x0 0xfe8b0000 0x0 0x10000>;
9090
clocks = <&pmucru CLK_USBPHY1_REF>;
91-
@@ -1244,12 +1244,12 @@
91+
@@ -1228,12 +1228,12 @@
9292
#clock-cells = <0>;
9393
status = "disabled";
9494

‎target/linux/rockchip/patches-5.15/037-v5.18-phy-rockchip-add-naneng-combo-phy-for-RK3568.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Signed-off-by: Vinod Koul <[email protected]>
3939
depends on (ARCH_ROCKCHIP && OF) || COMPILE_TEST
4040
--- a/drivers/phy/rockchip/Makefile
4141
+++ b/drivers/phy/rockchip/Makefile
42-
@@ -6,6 +6,7 @@ obj-$(CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY) += phy-rockchip-inno-csidphy.o
42+
@@ -6,6 +6,7 @@ obj-$(CONFIG_PHY_ROCKCHIP_INNO_CSIDPHY)
4343
obj-$(CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY) += phy-rockchip-inno-dsidphy.o
4444
obj-$(CONFIG_PHY_ROCKCHIP_INNO_HDMI) += phy-rockchip-inno-hdmi.o
4545
obj-$(CONFIG_PHY_ROCKCHIP_INNO_USB2) += phy-rockchip-inno-usb2.o

‎target/linux/rockchip/patches-5.15/038-v5.18-arm64-dts-rockchip-add-naneng-combo-phy-nodes-for.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
2929
qos_pcie3x1: qos@fe190080 {
3030
compatible = "rockchip,rk3568-qos", "syscon";
3131
reg = <0x0 0xfe190080 0x0 0x20>;
32-
@@ -71,6 +76,22 @@
32+
@@ -69,6 +74,22 @@
3333
queue0 {};
3434
};
3535
};
@@ -54,7 +54,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
5454
&cpu0_opp_table {
5555
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
5656
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
57-
@@ -296,11 +296,26 @@
57+
@@ -262,11 +262,26 @@
5858
};
5959
};
6060

@@ -81,7 +81,7 @@ Signed-off-by: Heiko Stuebner <[email protected]>
8181
usb2phy0_grf: syscon@fdca0000 {
8282
compatible = "rockchip,rk3568-usb2phy-grf", "syscon";
8383
reg = <0x0 0xfdca0000 0x0 0x8000>;
84-
@@ -1307,6 +1322,38 @@
84+
@@ -1195,6 +1210,38 @@
8585
status = "disabled";
8686
};
8787

‎target/linux/rockchip/patches-5.15/040-v5.18-usb-dwc3-core-do-not-use-3.0-clock-when-operating-in-2.0.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <[email protected]>
2222

2323
--- a/drivers/usb/dwc3/core.c
2424
+++ b/drivers/usb/dwc3/core.c
25-
@@ -1061,6 +1061,11 @@ static int dwc3_core_init(struct dwc3 *dwc)
25+
@@ -1067,6 +1067,11 @@ static int dwc3_core_init(struct dwc3 *d
2626
if (dwc->parkmode_disable_ss_quirk)
2727
reg |= DWC3_GUCTL1_PARKMODE_DISABLE_SS;
2828

‎target/linux/rockchip/patches-5.15/050-v5.18-mmc-dw_mmc-Support-setting-f_min-from-host-drivers.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Signed-off-by: Ulf Hansson <[email protected]>
2020

2121
--- a/drivers/mmc/host/dw_mmc.c
2222
+++ b/drivers/mmc/host/dw_mmc.c
23-
@@ -2853,7 +2853,12 @@ static int dw_mci_init_slot_caps(struct dw_mci_slot *slot)
23+
@@ -2853,7 +2853,12 @@ static int dw_mci_init_slot_caps(struct
2424
if (host->pdata->caps2)
2525
mmc->caps2 = host->pdata->caps2;
2626

0 commit comments

Comments
 (0)