domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel: bump 6.1 to 6.1.96

Browse Source 
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.96

Manually rebased:
generic/hack-6.1/765-mxl-gpy-control-LED-reg-from-DT.patch
reference:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/net/phy/mxl-gpy.c?h=v6.1.96&id=5bd1b7ab6ae5799c136e4319d8644c5ff9c71757

generic: Fix spelling in dmesg output during boot when using the fitblk driver.

generic/pending-6.1/510-block-add-uImage.FIT-subimage-block-driver.patch

All other patches automatically rebased.

Build system: Kirkwood bcm53xx

Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com>
This commit is contained in:
Zxl hhyccc
2024-06-27 23:13:11 +08:00
committed by Hauke Mehrtens
parent 18f04617f4
commit 93cb81cf2b
10 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/starfive/patches-6.1/0112-dmaengine-dw-axi-dmac-Add-support-for-StarFive-JH711.patch
View File

@@ -51,7 +51,7 @@ Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
cfg_hi = config->tt_fc << CH_CFG_H_TT_FC_POS |
config->hs_sel_src << CH_CFG_H_HS_SEL_SRC_POS |
config->hs_sel_dst << CH_CFG_H_HS_SEL_DST_POS |
@@ -1367,11 +1374,12 @@ static int parse_device_properties(struc
@@ -1365,11 +1372,12 @@ static int parse_device_properties(struc
static int dw_probe(struct platform_device *pdev)
{
@@ -65,7 +65,7 @@ Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
u32 i;
int ret;
@@ -1400,12 +1408,25 @@ static int dw_probe(struct platform_devi
@@ -1398,12 +1406,25 @@ static int dw_probe(struct platform_devi
if (IS_ERR(chip->regs))
return PTR_ERR(chip->regs);
@@ -92,7 +92,7 @@ Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com>
chip->core_clk = devm_clk_get(chip->dev, "core-clk");
if (IS_ERR(chip->core_clk))
return PTR_ERR(chip->core_clk);
@@ -1556,8 +1577,15 @@ static const struct dev_pm_ops dw_axi_dm
@@ -1554,8 +1575,15 @@ static const struct dev_pm_ops dw_axi_dm
};
static const struct of_device_id dw_dma_of_id_table[] = {

2
target/linux/starfive/patches-6.1/0113-dmaengine-dw-axi-dmac-Increase-polling-time-to-DMA-t.patch
View File

@@ -18,7 +18,7 @@ Signed-off-by: Walker Chen <walker.chen@starfivetech.com>
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -1147,7 +1147,7 @@ static int dma_chan_terminate_all(struct
@@ -1145,7 +1145,7 @@ static int dma_chan_terminate_all(struct
axi_chan_disable(chan);
ret = readl_poll_timeout_atomic(chan->chip->regs + DMAC_CHEN, val,

4
target/linux/starfive/patches-6.1/1007-dmaengine-dw-axi-dmac-Handle-xfer-start-while-non-id.patch
View File

@@ -13,7 +13,7 @@ Signed-off-by: Curry Zhang <curry.zhang@starfivetech.com>
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -382,11 +382,13 @@ static void axi_chan_block_xfer_start(st
@@ -383,11 +383,13 @@ static void axi_chan_block_xfer_start(st
u32 irq_mask;
u8 lms = 0; /* Select AXI0 master for LLI fetching */
@@ -28,7 +28,7 @@ Signed-off-by: Curry Zhang <curry.zhang@starfivetech.com>
}
axi_dma_enable(chan->chip);
@@ -1028,6 +1030,14 @@ static noinline void axi_chan_handle_err
@@ -1029,6 +1031,14 @@ static noinline void axi_chan_handle_err
axi_chan_name(chan));
goto out;
}

8
target/linux/starfive/patches-6.1/1008-dmaengine-dw-axi-dmac-Add-StarFive-JH7100-support.patch
View File

@@ -12,7 +12,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -677,8 +677,13 @@ static int dw_axi_dma_set_hw_desc(struct
@@ -678,8 +678,13 @@ static int dw_axi_dma_set_hw_desc(struct
hw_desc->lli->block_ts_lo = cpu_to_le32(block_ts - 1);
@@ -26,7 +26,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
hw_desc->lli->ctl_lo = cpu_to_le32(ctllo);
set_desc_src_master(hw_desc);
@@ -1508,7 +1513,11 @@ static int dw_probe(struct platform_devi
@@ -1506,7 +1511,11 @@ static int dw_probe(struct platform_devi
* Therefore, set constraint to 1024 * 4.
*/
dw->dma.dev->dma_parms = &dw->dma_parms;
@@ -38,7 +38,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
platform_set_drvdata(pdev, chip);
pm_runtime_enable(chip->dev);
@@ -1593,6 +1602,9 @@ static const struct of_device_id dw_dma_
@@ -1591,6 +1600,9 @@ static const struct of_device_id dw_dma_
.compatible = "intel,kmb-axi-dma",
.data = (void *)AXI_DMA_FLAG_HAS_APB_REGS,
}, {
@@ -50,7 +50,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
},
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac.h
@@ -283,7 +283,11 @@ enum {
@@ -284,7 +284,11 @@ enum {
#define CH_CTL_L_SRC_MAST BIT(0)
/* CH_CFG_H */