mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 6.1 to 6.1.78 (#11894)
This commit is contained in:
Beginner
GitHub
parent
735ea0d11e
commit
6255b11d57
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-6.1 = .77
|
||||
LINUX_KERNEL_HASH-6.1.77 = 3b54ec567716cdfb3618caf38c58a8aab1372cc41c16430633febe9ccdb3f91d
|
||||
LINUX_VERSION-6.1 = .78
|
||||
LINUX_KERNEL_HASH-6.1.78 = 65206b969831236849c9906eba267e715734a93808e9909fd9b4f12eea10d689
|
||||
|
||||
@ -16,7 +16,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
@@ -4331,6 +4331,7 @@ static const struct mtk_soc_data mt7986_
|
||||
@@ -4334,6 +4334,7 @@ static const struct mtk_soc_data mt7986_
|
||||
.hw_features = MTK_HW_FEATURES,
|
||||
.required_clks = MT7986_CLKS_BITMAP,
|
||||
.required_pctl = false,
|
||||
|
||||
@ -78,7 +78,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
static const struct mtk_soc_data mt7986_data = {
|
||||
.reg_map = &mt7986_reg_map,
|
||||
.ana_rgc3 = 0x128,
|
||||
@@ -4843,6 +4863,7 @@ const struct of_device_id of_mtk_match[]
|
||||
@@ -4846,6 +4866,7 @@ const struct of_device_id of_mtk_match[]
|
||||
{ .compatible = "mediatek,mt7622-eth", .data = &mt7622_data},
|
||||
{ .compatible = "mediatek,mt7623-eth", .data = &mt7623_data},
|
||||
{ .compatible = "mediatek,mt7629-eth", .data = &mt7629_data},
|
||||
|
||||
@ -88,7 +88,7 @@ v2: fix wrong variable name in return value check spotted by Denis Kirjanov
|
||||
.txrx = {
|
||||
.txd_size = sizeof(struct mtk_tx_dma_v2),
|
||||
.rxd_size = sizeof(struct mtk_rx_dma_v2),
|
||||
@@ -4893,6 +4896,7 @@ static const struct mtk_soc_data mt7986_
|
||||
@@ -4896,6 +4899,7 @@ static const struct mtk_soc_data mt7986_
|
||||
.offload_version = 2,
|
||||
.hash_offset = 4,
|
||||
.foe_entry_size = sizeof(struct mtk_foe_entry),
|
||||
|
||||
@ -117,7 +117,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
.txrx = {
|
||||
.txd_size = sizeof(struct mtk_tx_dma_v2),
|
||||
.rxd_size = sizeof(struct mtk_rx_dma_v2),
|
||||
@@ -4902,6 +4928,7 @@ static const struct mtk_soc_data mt7986_
|
||||
@@ -4905,6 +4931,7 @@ static const struct mtk_soc_data mt7986_
|
||||
.required_pctl = false,
|
||||
.offload_version = 2,
|
||||
.hash_offset = 4,
|
||||
@ -125,7 +125,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
.foe_entry_size = sizeof(struct mtk_foe_entry),
|
||||
.has_accounting = true,
|
||||
.txrx = {
|
||||
@@ -4920,6 +4947,7 @@ static const struct mtk_soc_data rt5350_
|
||||
@@ -4923,6 +4950,7 @@ static const struct mtk_soc_data rt5350_
|
||||
.hw_features = MTK_HW_FEATURES_MT7628,
|
||||
.required_clks = MT7628_CLKS_BITMAP,
|
||||
.required_pctl = false,
|
||||
|
||||
@ -150,7 +150,7 @@ mtk_eth_soc driver.
|
||||
data |= TX_DMA_SWC_V2 | QID_BITS_V2(info->qid);
|
||||
WRITE_ONCE(desc->txd4, data);
|
||||
|
||||
@@ -5010,6 +5111,25 @@ static const struct mtk_soc_data mt7986_
|
||||
@@ -5013,6 +5114,25 @@ static const struct mtk_soc_data mt7986_
|
||||
},
|
||||
};
|
||||
|
||||
@ -176,7 +176,7 @@ mtk_eth_soc driver.
|
||||
static const struct mtk_soc_data rt5350_data = {
|
||||
.reg_map = &mt7628_reg_map,
|
||||
.caps = MT7628_CAPS,
|
||||
@@ -5028,14 +5148,15 @@ static const struct mtk_soc_data rt5350_
|
||||
@@ -5031,14 +5151,15 @@ static const struct mtk_soc_data rt5350_
|
||||
};
|
||||
|
||||
const struct of_device_id of_mtk_match[] = {
|
||||
|
||||
@ -12,8 +12,8 @@
|
||||
{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
|
||||
--- a/drivers/usb/serial/option.c
|
||||
+++ b/drivers/usb/serial/option.c
|
||||
@@ -2271,6 +2271,12 @@ static const struct usb_device_id option
|
||||
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */
|
||||
@@ -2272,6 +2272,12 @@ static const struct usb_device_id option
|
||||
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a3, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */
|
||||
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */
|
||||
.driver_info = RSVD(4) },
|
||||
+ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0a04, 0xff), /* Fibocom FM650 ECM */
|
||||
|
||||
@ -209,7 +209,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
if (r)
|
||||
--- a/drivers/clk/mediatek/clk-mt2701.c
|
||||
+++ b/drivers/clk/mediatek/clk-mt2701.c
|
||||
@@ -683,8 +683,8 @@ static int mtk_topckgen_init(struct plat
|
||||
@@ -685,8 +685,8 @@ static int mtk_topckgen_init(struct plat
|
||||
mtk_clk_register_dividers(top_adj_divs, ARRAY_SIZE(top_adj_divs),
|
||||
base, &mt2701_clk_lock, clk_data);
|
||||
|
||||
@ -220,7 +220,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
return of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
|
||||
}
|
||||
@@ -783,8 +783,8 @@ static int mtk_infrasys_init(struct plat
|
||||
@@ -789,8 +789,8 @@ static int mtk_infrasys_init(struct plat
|
||||
}
|
||||
}
|
||||
|
||||
@ -231,9 +231,9 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
mtk_clk_register_factors(infra_fixed_divs, ARRAY_SIZE(infra_fixed_divs),
|
||||
infra_clk_data);
|
||||
|
||||
@@ -894,8 +894,8 @@ static int mtk_pericfg_init(struct platf
|
||||
|
||||
clk_data = mtk_alloc_clk_data(CLK_PERI_NR);
|
||||
@@ -902,8 +902,8 @@ static int mtk_pericfg_init(struct platf
|
||||
if (!clk_data)
|
||||
return -ENOMEM;
|
||||
|
||||
- mtk_clk_register_gates(node, peri_clks, ARRAY_SIZE(peri_clks),
|
||||
- clk_data);
|
||||
@ -397,9 +397,9 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
&mt7622_clk_lock, clk_data);
|
||||
--- a/drivers/clk/mediatek/clk-mt7629-eth.c
|
||||
+++ b/drivers/clk/mediatek/clk-mt7629-eth.c
|
||||
@@ -80,7 +80,8 @@ static int clk_mt7629_ethsys_init(struct
|
||||
|
||||
clk_data = mtk_alloc_clk_data(CLK_ETH_NR_CLK);
|
||||
@@ -82,7 +82,8 @@ static int clk_mt7629_ethsys_init(struct
|
||||
if (!clk_data)
|
||||
return -ENOMEM;
|
||||
|
||||
- mtk_clk_register_gates(node, eth_clks, CLK_ETH_NR_CLK, clk_data);
|
||||
+ mtk_clk_register_gates(&pdev->dev, node, eth_clks,
|
||||
@ -407,9 +407,9 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
|
||||
if (r)
|
||||
@@ -102,8 +103,8 @@ static int clk_mt7629_sgmiisys_init(stru
|
||||
|
||||
clk_data = mtk_alloc_clk_data(CLK_SGMII_NR_CLK);
|
||||
@@ -106,8 +107,8 @@ static int clk_mt7629_sgmiisys_init(stru
|
||||
if (!clk_data)
|
||||
return -ENOMEM;
|
||||
|
||||
- mtk_clk_register_gates(node, sgmii_clks[id++], CLK_SGMII_NR_CLK,
|
||||
- clk_data);
|
||||
@ -444,9 +444,9 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
if (r)
|
||||
--- a/drivers/clk/mediatek/clk-mt7629.c
|
||||
+++ b/drivers/clk/mediatek/clk-mt7629.c
|
||||
@@ -581,8 +581,8 @@ static int mtk_infrasys_init(struct plat
|
||||
|
||||
clk_data = mtk_alloc_clk_data(CLK_INFRA_NR_CLK);
|
||||
@@ -585,8 +585,8 @@ static int mtk_infrasys_init(struct plat
|
||||
if (!clk_data)
|
||||
return -ENOMEM;
|
||||
|
||||
- mtk_clk_register_gates(node, infra_clks, ARRAY_SIZE(infra_clks),
|
||||
- clk_data);
|
||||
@ -455,9 +455,9 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
mtk_clk_register_cpumuxes(node, infra_muxes, ARRAY_SIZE(infra_muxes),
|
||||
clk_data);
|
||||
@@ -604,8 +604,8 @@ static int mtk_pericfg_init(struct platf
|
||||
|
||||
clk_data = mtk_alloc_clk_data(CLK_PERI_NR_CLK);
|
||||
@@ -610,8 +610,8 @@ static int mtk_pericfg_init(struct platf
|
||||
if (!clk_data)
|
||||
return -ENOMEM;
|
||||
|
||||
- mtk_clk_register_gates(node, peri_clks, ARRAY_SIZE(peri_clks),
|
||||
- clk_data);
|
||||
@ -466,7 +466,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
mtk_clk_register_composites(peri_muxes, ARRAY_SIZE(peri_muxes), base,
|
||||
&mt7629_clk_lock, clk_data);
|
||||
@@ -631,7 +631,7 @@ static int mtk_apmixedsys_init(struct pl
|
||||
@@ -637,7 +637,7 @@ static int mtk_apmixedsys_init(struct pl
|
||||
mtk_clk_register_plls(node, plls, ARRAY_SIZE(plls),
|
||||
clk_data);
|
||||
|
||||
|
||||
@ -78,7 +78,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
--- a/drivers/clk/mediatek/clk-mt2701.c
|
||||
+++ b/drivers/clk/mediatek/clk-mt2701.c
|
||||
@@ -757,7 +757,7 @@ static void __init mtk_infrasys_init_ear
|
||||
@@ -761,7 +761,7 @@ static void __init mtk_infrasys_init_ear
|
||||
mtk_clk_register_factors(infra_fixed_divs, ARRAY_SIZE(infra_fixed_divs),
|
||||
infra_clk_data);
|
||||
|
||||
@ -114,7 +114,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
clk_data);
|
||||
--- a/drivers/clk/mediatek/clk-mt7629.c
|
||||
+++ b/drivers/clk/mediatek/clk-mt7629.c
|
||||
@@ -584,8 +584,8 @@ static int mtk_infrasys_init(struct plat
|
||||
@@ -588,8 +588,8 @@ static int mtk_infrasys_init(struct plat
|
||||
mtk_clk_register_gates(&pdev->dev, node, infra_clks,
|
||||
ARRAY_SIZE(infra_clks), clk_data);
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
--- a/drivers/clk/mediatek/clk-mt2701.c
|
||||
+++ b/drivers/clk/mediatek/clk-mt2701.c
|
||||
@@ -677,8 +677,9 @@ static int mtk_topckgen_init(struct plat
|
||||
@@ -679,8 +679,9 @@ static int mtk_topckgen_init(struct plat
|
||||
mtk_clk_register_factors(top_fixed_divs, ARRAY_SIZE(top_fixed_divs),
|
||||
clk_data);
|
||||
|
||||
@ -38,7 +38,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
mtk_clk_register_dividers(top_adj_divs, ARRAY_SIZE(top_adj_divs),
|
||||
base, &mt2701_clk_lock, clk_data);
|
||||
@@ -897,8 +898,9 @@ static int mtk_pericfg_init(struct platf
|
||||
@@ -905,8 +906,9 @@ static int mtk_pericfg_init(struct platf
|
||||
mtk_clk_register_gates(&pdev->dev, node, peri_clks,
|
||||
ARRAY_SIZE(peri_clks), clk_data);
|
||||
|
||||
@ -104,7 +104,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
|
||||
--- a/drivers/clk/mediatek/clk-mt7629.c
|
||||
+++ b/drivers/clk/mediatek/clk-mt7629.c
|
||||
@@ -564,8 +564,9 @@ static int mtk_topckgen_init(struct plat
|
||||
@@ -566,8 +566,9 @@ static int mtk_topckgen_init(struct plat
|
||||
mtk_clk_register_factors(top_divs, ARRAY_SIZE(top_divs),
|
||||
clk_data);
|
||||
|
||||
@ -116,7 +116,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
clk_prepare_enable(clk_data->hws[CLK_TOP_AXI_SEL]->clk);
|
||||
clk_prepare_enable(clk_data->hws[CLK_TOP_MEM_SEL]->clk);
|
||||
@@ -607,7 +608,8 @@ static int mtk_pericfg_init(struct platf
|
||||
@@ -613,7 +614,8 @@ static int mtk_pericfg_init(struct platf
|
||||
mtk_clk_register_gates(&pdev->dev, node, peri_clks,
|
||||
ARRAY_SIZE(peri_clks), clk_data);
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
|
||||
--- a/drivers/cpufreq/mediatek-cpufreq.c
|
||||
+++ b/drivers/cpufreq/mediatek-cpufreq.c
|
||||
@@ -702,6 +702,15 @@ static const struct mtk_cpufreq_platform
|
||||
@@ -709,6 +709,15 @@ static const struct mtk_cpufreq_platform
|
||||
.ccifreq_supported = false,
|
||||
};
|
||||
|
||||
@ -31,10 +31,10 @@ Signed-off-by: Sam Shih <sam.shih@mediatek.com>
|
||||
static const struct mtk_cpufreq_platform_data mt8183_platform_data = {
|
||||
.min_volt_shift = 100000,
|
||||
.max_volt_shift = 200000,
|
||||
@@ -735,6 +744,7 @@ static const struct of_device_id mtk_cpu
|
||||
@@ -742,6 +751,7 @@ static const struct of_device_id mtk_cpu
|
||||
{ .compatible = "mediatek,mt2712", .data = &mt2701_platform_data },
|
||||
{ .compatible = "mediatek,mt7622", .data = &mt7622_platform_data },
|
||||
{ .compatible = "mediatek,mt7623", .data = &mt7622_platform_data },
|
||||
{ .compatible = "mediatek,mt7623", .data = &mt7623_platform_data },
|
||||
+ { .compatible = "mediatek,mt7988", .data = &mt7988_platform_data },
|
||||
{ .compatible = "mediatek,mt8167", .data = &mt8516_platform_data },
|
||||
{ .compatible = "mediatek,mt817x", .data = &mt2701_platform_data },
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From e7697814c142c99f470c3458d49e41b25a575f23 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Golle <daniel@makrotopia.org>
|
||||
Date: Fri, 26 May 2023 10:31:40 +0100
|
||||
Subject: [PATCH] cpufreq: mediatek: correct voltages for MT7622 and MT7623
|
||||
|
||||
The MT6380 regulator typically used together with MT7622 does not
|
||||
support the current maximum processor and SRAM voltage in the cpufreq
|
||||
driver (1360000uV).
|
||||
For MT7622 limit processor and SRAM supply voltages to 1350000uV to
|
||||
avoid having the tracking algorithm request unsupported voltages from
|
||||
the regulator.
|
||||
|
||||
On MT7623 there is no separate SRAM supply and the maximum voltage used
|
||||
is 1300000uV. Create dedicated platform data for MT7623 to cover that
|
||||
case as well.
|
||||
|
||||
Fixes: 0883426fd07e3 ("cpufreq: mediatek: Raise proc and sram max voltage for MT7622/7623")
|
||||
Suggested-by: Jia-wei Chang <Jia-wei.Chang@mediatek.com>
|
||||
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
---
|
||||
drivers/cpufreq/mediatek-cpufreq.c | 13 ++++++++++---
|
||||
1 file changed, 10 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/drivers/cpufreq/mediatek-cpufreq.c
|
||||
+++ b/drivers/cpufreq/mediatek-cpufreq.c
|
||||
@@ -696,9 +696,16 @@ static const struct mtk_cpufreq_platform
|
||||
static const struct mtk_cpufreq_platform_data mt7622_platform_data = {
|
||||
.min_volt_shift = 100000,
|
||||
.max_volt_shift = 200000,
|
||||
- .proc_max_volt = 1360000,
|
||||
+ .proc_max_volt = 1350000,
|
||||
.sram_min_volt = 0,
|
||||
- .sram_max_volt = 1360000,
|
||||
+ .sram_max_volt = 1350000,
|
||||
+ .ccifreq_supported = false,
|
||||
+};
|
||||
+
|
||||
+static const struct mtk_cpufreq_platform_data mt7623_platform_data = {
|
||||
+ .min_volt_shift = 100000,
|
||||
+ .max_volt_shift = 200000,
|
||||
+ .proc_max_volt = 1300000,
|
||||
.ccifreq_supported = false,
|
||||
};
|
||||
|
||||
@@ -743,7 +750,7 @@ static const struct of_device_id mtk_cpu
|
||||
{ .compatible = "mediatek,mt2701", .data = &mt2701_platform_data },
|
||||
{ .compatible = "mediatek,mt2712", .data = &mt2701_platform_data },
|
||||
{ .compatible = "mediatek,mt7622", .data = &mt7622_platform_data },
|
||||
- { .compatible = "mediatek,mt7623", .data = &mt7622_platform_data },
|
||||
+ { .compatible = "mediatek,mt7623", .data = &mt7623_platform_data },
|
||||
{ .compatible = "mediatek,mt7988", .data = &mt7988_platform_data },
|
||||
{ .compatible = "mediatek,mt8167", .data = &mt8516_platform_data },
|
||||
{ .compatible = "mediatek,mt817x", .data = &mt2701_platform_data },
|
||||
@ -11,7 +11,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
|
||||
--- a/drivers/spi/spi.c
|
||||
+++ b/drivers/spi/spi.c
|
||||
@@ -1374,6 +1374,70 @@ static int spi_transfer_wait(struct spi_
|
||||
@@ -1385,6 +1385,70 @@ static int spi_transfer_wait(struct spi_
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -82,7 +82,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
static void _spi_transfer_delay_ns(u32 ns)
|
||||
{
|
||||
if (!ns)
|
||||
@@ -2208,6 +2272,75 @@ void spi_flush_queue(struct spi_controll
|
||||
@@ -2223,6 +2287,75 @@ void spi_flush_queue(struct spi_controll
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
#if defined(CONFIG_OF)
|
||||
@ -158,7 +158,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
|
||||
struct device_node *nc)
|
||||
{
|
||||
@@ -2326,6 +2459,10 @@ of_register_spi_device(struct spi_contro
|
||||
@@ -2341,6 +2474,10 @@ of_register_spi_device(struct spi_contro
|
||||
if (rc)
|
||||
goto err_out;
|
||||
|
||||
@ -171,7 +171,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
spi->dev.of_node = nc;
|
||||
--- a/include/linux/spi/spi.h
|
||||
+++ b/include/linux/spi/spi.h
|
||||
@@ -298,6 +298,40 @@ struct spi_driver {
|
||||
@@ -318,6 +318,40 @@ struct spi_driver {
|
||||
struct device_driver driver;
|
||||
};
|
||||
|
||||
@ -212,7 +212,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
static inline struct spi_driver *to_spi_driver(struct device_driver *drv)
|
||||
{
|
||||
return drv ? container_of(drv, struct spi_driver, driver) : NULL;
|
||||
@@ -682,6 +716,11 @@ struct spi_controller {
|
||||
@@ -703,6 +737,11 @@ struct spi_controller {
|
||||
void *dummy_rx;
|
||||
void *dummy_tx;
|
||||
|
||||
@ -224,7 +224,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
int (*fw_translate_cs)(struct spi_controller *ctlr, unsigned cs);
|
||||
|
||||
/*
|
||||
@@ -1489,6 +1528,9 @@ spi_register_board_info(struct spi_board
|
||||
@@ -1510,6 +1549,9 @@ spi_register_board_info(struct spi_board
|
||||
{ return 0; }
|
||||
#endif
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
|
||||
--- a/drivers/mtd/spi-nor/core.c
|
||||
+++ b/drivers/mtd/spi-nor/core.c
|
||||
@@ -2899,6 +2899,18 @@ static const struct flash_info *spi_nor_
|
||||
@@ -2900,6 +2900,18 @@ static const struct flash_info *spi_nor_
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -45,7 +45,7 @@ Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
|
||||
static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
|
||||
const char *name)
|
||||
{
|
||||
@@ -3002,6 +3014,9 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
@@ -3003,6 +3015,9 @@ int spi_nor_scan(struct spi_nor *nor, co
|
||||
if (!nor->bouncebuf)
|
||||
return -ENOMEM;
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/drivers/net/phy/Kconfig
|
||||
+++ b/drivers/net/phy/Kconfig
|
||||
@@ -382,6 +382,12 @@ config ROCKCHIP_PHY
|
||||
@@ -381,6 +381,12 @@ config ROCKCHIP_PHY
|
||||
help
|
||||
Currently supports the integrated Ethernet PHY.
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ Acked-by: Pali Rohár <pali@kernel.org>
|
||||
|
||||
--- a/drivers/pci/controller/pcie-mediatek.c
|
||||
+++ b/drivers/pci/controller/pcie-mediatek.c
|
||||
@@ -702,6 +702,13 @@ static int mtk_pcie_startup_port_v2(stru
|
||||
@@ -708,6 +708,13 @@ static int mtk_pcie_startup_port_v2(stru
|
||||
*/
|
||||
msleep(100);
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
struct mtk_pcie_port;
|
||||
|
||||
/**
|
||||
@@ -1054,6 +1060,27 @@ static int mtk_pcie_setup(struct mtk_pci
|
||||
@@ -1060,6 +1066,27 @@ static int mtk_pcie_setup(struct mtk_pci
|
||||
struct mtk_pcie_port *port, *tmp;
|
||||
int err, slot;
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/MAINTAINERS
|
||||
+++ b/MAINTAINERS
|
||||
@@ -12934,6 +12934,15 @@ S: Maintained
|
||||
@@ -12936,6 +12936,15 @@ S: Maintained
|
||||
F: drivers/net/pcs/pcs-mtk-lynxi.c
|
||||
F: include/linux/pcs/pcs-mtk-lynxi.h
|
||||
|
||||
@ -42,7 +42,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
L: linux-i2c@vger.kernel.org
|
||||
--- a/drivers/net/phy/Kconfig
|
||||
+++ b/drivers/net/phy/Kconfig
|
||||
@@ -307,6 +307,18 @@ config MEDIATEK_GE_PHY
|
||||
@@ -306,6 +306,18 @@ config MEDIATEK_GE_PHY
|
||||
help
|
||||
Supports the MediaTek Gigabit Ethernet PHYs.
|
||||
|
||||
|
||||
@ -13,7 +13,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
--- a/drivers/net/phy/Kconfig
|
||||
+++ b/drivers/net/phy/Kconfig
|
||||
@@ -319,6 +319,13 @@ config MEDIATEK_GE_SOC_PHY
|
||||
@@ -318,6 +318,13 @@ config MEDIATEK_GE_SOC_PHY
|
||||
present in the SoCs efuse and will dynamically calibrate VCM
|
||||
(common-mode voltage) during startup.
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/arch/arm/Kconfig
|
||||
+++ b/arch/arm/Kconfig
|
||||
@@ -1588,6 +1588,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
||||
@@ -1589,6 +1589,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEN
|
||||
|
||||
endchoice
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
* CONFIG_CMDLINE is meant to be a default in case nothing else
|
||||
--- a/arch/arm64/Kconfig
|
||||
+++ b/arch/arm64/Kconfig
|
||||
@@ -2202,6 +2202,14 @@ config CMDLINE_FORCE
|
||||
@@ -2240,6 +2240,14 @@ config CMDLINE_FORCE
|
||||
|
||||
endchoice
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user