Skip to content

Commit 9ad5103

Browse files
coolsnowwolfaiamadeus
authored andcommitted
kernel: bump all to latest HEAD
Fixes: #13395
1 parent e005f3b commit 9ad5103

9 files changed

Lines changed: 40 additions & 100 deletions

File tree

include/kernel-5.10

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.10 = .234
2-
LINUX_KERNEL_HASH-5.10.234 = 9597c4fee2f1ce452acfec516f4325ad342155872052fd5f0d9ce2ddcc26ebe5
1+
LINUX_VERSION-5.10 = .235
2+
LINUX_KERNEL_HASH-5.10.235 = 953be3931101a94a93a644c1283ca41a7e567447ca87d3069ed4dd712dc1f1cc

include/kernel-5.15

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.15 = .178
2-
LINUX_KERNEL_HASH-5.15.178 = efe9f7eb5ea4d26cec6290689343e1804eb3b4a88ff5a60497a696fc08157c42
1+
LINUX_VERSION-5.15 = .179
2+
LINUX_KERNEL_HASH-5.15.179 = 9319a47b1e9b5d344ff6015431856d0c9640e4faedc527c87f9129061a27136f

include/kernel-5.4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-5.4 = .290
2-
LINUX_KERNEL_HASH-5.4.290 = 6cc73cf2a7f50580f7d8c7e99d2f2e8ada8b7d2f4e76f5896f0daf691cc2a456
1+
LINUX_VERSION-5.4 = .291
2+
LINUX_KERNEL_HASH-5.4.291 = b3ad64a4476a7c5450b92eab9a888b84ecb64dc613fcb0128f653f58e958ef6e

include/kernel-6.1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.1 = .130
2-
LINUX_KERNEL_HASH-6.1.130 = 9416b2c2d448ec7f54bb0ce5713fb34c32dae4a4edf1abd8cf7a8995cbac66fd
1+
LINUX_VERSION-6.1 = .131
2+
LINUX_KERNEL_HASH-6.1.131 = 44caf510603b4cbbe78ef828620099d200536d666e909ddb73bb2938c7de5b16

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 = .18
2-
LINUX_KERNEL_HASH-6.12.18 = beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d
1+
LINUX_VERSION-6.12 = .19
2+
LINUX_KERNEL_HASH-6.12.19 = d73bf057bec04434b169d1b61641936f7d0c97ceb923a281f32e35dd4dcc6531

include/kernel-6.6

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
LINUX_VERSION-6.6 = .82
2-
LINUX_KERNEL_HASH-6.6.82 = f3c2389b8c23cabe747f104a3e434201ca6e7725bbbfb3a8c59a063ac4820e41
1+
LINUX_VERSION-6.6 = .83
2+
LINUX_KERNEL_HASH-6.6.83 = 894bbbe63b7484a0bc576a1e11a8dbc090fbd476d6424431bdc8435e03c2c208

target/linux/mediatek/patches-6.1/224-v6.3-clk-mediatek-clk-mtk-Add-dummy-clock-ops.patch

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

target/linux/rockchip/patches-6.1/220-phy-rockchip-naneng-combphy-fix-phy-reset.patch

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,3 @@
2626
rockchip,pipe-grf = <&pipegrf>;
2727
rockchip,pipe-phy-grf = <&pipe_phy_grf2>;
2828
#phy-cells = <1>;
29-
--- a/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
30-
+++ b/drivers/phy/rockchip/phy-rockchip-naneng-combphy.c
31-
@@ -299,7 +299,10 @@ static int rockchip_combphy_parse_dt(str
32-
33-
priv->ext_refclk = device_property_present(dev, "rockchip,ext-refclk");
34-
35-
- priv->phy_rst = devm_reset_control_get(dev, "phy");
36-
+ priv->phy_rst = devm_reset_control_get_exclusive(dev, "phy");
37-
+ /* fallback to old behaviour */
38-
+ if (PTR_ERR(priv->phy_rst) == -ENOENT)
39-
+ priv->phy_rst = devm_reset_control_array_get_exclusive(dev);
40-
if (IS_ERR(priv->phy_rst))
41-
return dev_err_probe(dev, PTR_ERR(priv->phy_rst), "failed to get phy reset\n");
42-
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
--- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi
2+
+++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi
3+
@@ -225,6 +225,7 @@
4+
assigned-clocks = <&pmucru CLK_PCIEPHY0_REF>;
5+
assigned-clock-rates = <100000000>;
6+
resets = <&cru SRST_PIPEPHY0>;
7+
+ reset-names = "phy";
8+
rockchip,pipe-grf = <&pipegrf>;
9+
rockchip,pipe-phy-grf = <&pipe_phy_grf0>;
10+
#phy-cells = <1>;
11+
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
12+
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
13+
@@ -1724,6 +1724,7 @@
14+
assigned-clocks = <&pmucru CLK_PCIEPHY1_REF>;
15+
assigned-clock-rates = <100000000>;
16+
resets = <&cru SRST_PIPEPHY1>;
17+
+ reset-names = "phy";
18+
rockchip,pipe-grf = <&pipegrf>;
19+
rockchip,pipe-phy-grf = <&pipe_phy_grf1>;
20+
#phy-cells = <1>;
21+
@@ -1740,6 +1741,7 @@
22+
assigned-clocks = <&pmucru CLK_PCIEPHY2_REF>;
23+
assigned-clock-rates = <100000000>;
24+
resets = <&cru SRST_PIPEPHY2>;
25+
+ reset-names = "phy";
26+
rockchip,pipe-grf = <&pipegrf>;
27+
rockchip,pipe-phy-grf = <&pipe_phy_grf2>;
28+
#phy-cells = <1>;

0 commit comments

Comments
 (0)