diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-06-16 17:22:50 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-26 12:43:54 +0200 |
| commit | b92794f4d02ebace7726fa7a6951e18186b48066 (patch) | |
| tree | 4c43ca3ede453d883806151b11aba87cbc4d1b03 | |
| parent | 8569bc5e0d1bdc4b252bf3f4e7c893ea2e17c98f (diff) | |
| download | upstream-b92794f4d02ebace7726fa7a6951e18186b48066.tar.gz upstream-b92794f4d02ebace7726fa7a6951e18186b48066.tar.bz2 upstream-b92794f4d02ebace7726fa7a6951e18186b48066.zip | |
kernel: bump 5.10 to 5.10.46
Add the new symbol to the generic kconfig.
No deleted or manually refreshed patches.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
| -rw-r--r-- | include/kernel-version.mk | 4 | ||||
| -rw-r--r-- | target/linux/generic/config-5.10 | 1 | ||||
| -rw-r--r-- | target/linux/mediatek/patches-5.10/200-phy-phy-mtk-tphy-Add-hifsys-support.patch | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 1224eccd32..fdf18c4ce0 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL endif LINUX_VERSION-5.4 = .124 -LINUX_VERSION-5.10 = .44 +LINUX_VERSION-5.10 = .46 LINUX_KERNEL_HASH-5.4.124 = f7f29dda2b042d7b5986d18274413131cf70e17288c05e9a683df1f46c507d82 -LINUX_KERNEL_HASH-5.10.44 = 77beefa59c854ce1e8353db947a71a8a91f2a907aed45c1335ac1f209983c767 +LINUX_KERNEL_HASH-5.10.46 = 569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index c15829e49e..a2b5a28d8e 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -3560,6 +3560,7 @@ CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_NAND_PXA3xx is not set # CONFIG_MTD_NAND_RB4XX is not set +# CONFIG_MTD_NAND_RB91X is not set # CONFIG_MTD_NAND_RB750 is not set # CONFIG_MTD_NAND_RICOH is not set # CONFIG_MTD_NAND_S3C2410 is not set diff --git a/target/linux/mediatek/patches-5.10/200-phy-phy-mtk-tphy-Add-hifsys-support.patch b/target/linux/mediatek/patches-5.10/200-phy-phy-mtk-tphy-Add-hifsys-support.patch index bd24ddc0c0..95f4be177b 100644 --- a/target/linux/mediatek/patches-5.10/200-phy-phy-mtk-tphy-Add-hifsys-support.patch +++ b/target/linux/mediatek/patches-5.10/200-phy-phy-mtk-tphy-Add-hifsys-support.patch @@ -47,7 +47,7 @@ Subject: [PATCH] phy: phy-mtk-tphy: Add hifsys-support tmp = readl(u3_banks->phya + U3P_U3_PHYA_DA_REG0); tmp &= ~(P3A_RG_XTAL_EXT_PE1H | P3A_RG_XTAL_EXT_PE2H); tmp |= P3A_RG_XTAL_EXT_PE1H_VAL(0x2) | P3A_RG_XTAL_EXT_PE2H_VAL(0x2); -@@ -1134,6 +1144,16 @@ static int mtk_tphy_probe(struct platfor +@@ -1136,6 +1146,16 @@ static int mtk_tphy_probe(struct platfor &tphy->src_ref_clk); device_property_read_u32(dev, "mediatek,src-coef", &tphy->src_coef); |