diff --git a/target/linux/starfive/patches-6.18/0001-riscv-dts-starfive-Add-full-support-except-VIN-and-V.patch b/target/linux/starfive/patches-6.18/0001-riscv-dts-starfive-Add-full-support-except-VIN-and-V.patch index 78b6a10ea7..255f563f5c 100644 --- a/target/linux/starfive/patches-6.18/0001-riscv-dts-starfive-Add-full-support-except-VIN-and-V.patch +++ b/target/linux/starfive/patches-6.18/0001-riscv-dts-starfive-Add-full-support-except-VIN-and-V.patch @@ -15,7 +15,7 @@ Signed-off-by: Hal Feng --- a/arch/riscv/boot/dts/starfive/jh7110-common.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi -@@ -18,6 +18,8 @@ +@@ -20,6 +20,8 @@ i2c6 = &i2c6; mmc0 = &mmc0; mmc1 = &mmc1; @@ -26,8 +26,8 @@ Signed-off-by: Hal Feng --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi -@@ -29,6 +29,24 @@ - }; +@@ -37,6 +37,24 @@ + status = "okay"; }; +&i2srx { @@ -51,8 +51,8 @@ Signed-off-by: Hal Feng &mmc0 { non-removable; }; -@@ -40,3 +58,85 @@ - &pcie1 { +@@ -65,3 +83,85 @@ + dr_mode = "peripheral"; status = "okay"; }; + @@ -139,7 +139,7 @@ Signed-off-by: Hal Feng +}; --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi -@@ -259,6 +259,7 @@ +@@ -264,6 +264,7 @@ clock-output-names = "dvp_clk"; #clock-cells = <0>; }; @@ -147,7 +147,7 @@ Signed-off-by: Hal Feng gmac0_rgmii_rxin: gmac0-rgmii-rxin-clock { compatible = "fixed-clock"; clock-output-names = "gmac0_rgmii_rxin"; -@@ -919,6 +920,26 @@ +@@ -932,6 +933,26 @@ #gpio-cells = <2>; }; diff --git a/target/linux/starfive/patches-6.18/0002-clocksource-Add-JH7110-timer-driver.patch b/target/linux/starfive/patches-6.18/0002-clocksource-Add-JH7110-timer-driver.patch index 1b96bd306f..22f26f652e 100644 --- a/target/linux/starfive/patches-6.18/0002-clocksource-Add-JH7110-timer-driver.patch +++ b/target/linux/starfive/patches-6.18/0002-clocksource-Add-JH7110-timer-driver.patch @@ -15,7 +15,7 @@ Signed-off-by: Xingyu Wu --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig -@@ -653,6 +653,17 @@ config RISCV_TIMER +@@ -664,6 +664,17 @@ config RISCV_TIMER is accessed via both the SBI and the rdcycle instruction. This is required for all RISC-V systems. @@ -35,7 +35,7 @@ Signed-off-by: Xingyu Wu depends on GENERIC_SCHED_CLOCK && RISCV --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile -@@ -81,6 +81,7 @@ obj-$(CONFIG_INGENIC_TIMER) += ingenic- +@@ -83,6 +83,7 @@ obj-$(CONFIG_INGENIC_TIMER) += ingenic- obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o obj-$(CONFIG_X86_NUMACHIP) += numachip.o obj-$(CONFIG_RISCV_TIMER) += timer-riscv.o diff --git a/target/linux/starfive/patches-6.18/0003-pwm-opencores-Add-PWM-driver-support.patch b/target/linux/starfive/patches-6.18/0003-pwm-opencores-Add-PWM-driver-support.patch index 0cb700409e..879005fc45 100644 --- a/target/linux/starfive/patches-6.18/0003-pwm-opencores-Add-PWM-driver-support.patch +++ b/target/linux/starfive/patches-6.18/0003-pwm-opencores-Add-PWM-driver-support.patch @@ -18,7 +18,7 @@ Signed-off-by: William Qiu --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig -@@ -471,6 +471,18 @@ config PWM_NTXEC +@@ -524,6 +524,18 @@ config PWM_NTXEC controller found in certain e-book readers designed by the original design manufacturer Netronix. @@ -39,7 +39,7 @@ Signed-off-by: William Qiu depends on OF --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile -@@ -42,6 +42,7 @@ obj-$(CONFIG_PWM_MICROCHIP_CORE) += pwm- +@@ -46,6 +46,7 @@ obj-$(CONFIG_PWM_MICROCHIP_CORE) += pwm- obj-$(CONFIG_PWM_MTK_DISP) += pwm-mtk-disp.o obj-$(CONFIG_PWM_MXS) += pwm-mxs.o obj-$(CONFIG_PWM_NTXEC) += pwm-ntxec.o diff --git a/target/linux/starfive/patches-6.18/0008-driver-rtc-Add-StarFive-JH7110-rtc-driver.patch b/target/linux/starfive/patches-6.18/0008-driver-rtc-Add-StarFive-JH7110-rtc-driver.patch index c4d4449cad..abc5d22929 100644 --- a/target/linux/starfive/patches-6.18/0008-driver-rtc-Add-StarFive-JH7110-rtc-driver.patch +++ b/target/linux/starfive/patches-6.18/0008-driver-rtc-Add-StarFive-JH7110-rtc-driver.patch @@ -16,7 +16,7 @@ Signed-off-by: Hal Feng --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig -@@ -1372,6 +1372,14 @@ config RTC_DRV_NTXEC +@@ -1399,6 +1399,14 @@ config RTC_DRV_NTXEC embedded controller found in certain e-book readers designed by the original design manufacturer Netronix. @@ -33,8 +33,8 @@ Signed-off-by: Hal Feng config RTC_DRV_ASM9260 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile -@@ -169,6 +169,7 @@ obj-$(CONFIG_RTC_DRV_SH) += rtc-sh.o - obj-$(CONFIG_RTC_DRV_SNVS) += rtc-snvs.o +@@ -175,6 +175,7 @@ obj-$(CONFIG_RTC_DRV_SNVS) += rtc-snvs.o + obj-$(CONFIG_RTC_DRV_SPACEMIT_P1) += rtc-spacemit-p1.o obj-$(CONFIG_RTC_DRV_SPEAR) += rtc-spear.o obj-$(CONFIG_RTC_DRV_STARFIRE) += rtc-starfire.o +obj-$(CONFIG_RTC_DRV_STARFIVE) += rtc-starfive.o diff --git a/target/linux/starfive/patches-6.18/0010-uart-8250-add-reset-operation-in-runtime-PM.patch b/target/linux/starfive/patches-6.18/0010-uart-8250-add-reset-operation-in-runtime-PM.patch index 452dfade6d..26b3bfbfa1 100644 --- a/target/linux/starfive/patches-6.18/0010-uart-8250-add-reset-operation-in-runtime-PM.patch +++ b/target/linux/starfive/patches-6.18/0010-uart-8250-add-reset-operation-in-runtime-PM.patch @@ -12,7 +12,7 @@ Signed-off-by: William Qiu --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c -@@ -712,6 +712,8 @@ static int dw8250_runtime_suspend(struct +@@ -903,6 +903,8 @@ static int dw8250_runtime_suspend(struct { struct dw8250_data *data = dev_get_drvdata(dev); @@ -21,7 +21,7 @@ Signed-off-by: William Qiu clk_disable_unprepare(data->clk); clk_disable_unprepare(data->pclk); -@@ -734,6 +736,8 @@ static int dw8250_runtime_resume(struct +@@ -925,6 +927,8 @@ static int dw8250_runtime_resume(struct return ret; } diff --git a/target/linux/starfive/patches-6.18/0011-CAN-starfive-Add-CAN-engine-support.patch b/target/linux/starfive/patches-6.18/0011-CAN-starfive-Add-CAN-engine-support.patch index a581e47dd7..049fd78171 100644 --- a/target/linux/starfive/patches-6.18/0011-CAN-starfive-Add-CAN-engine-support.patch +++ b/target/linux/starfive/patches-6.18/0011-CAN-starfive-Add-CAN-engine-support.patch @@ -16,7 +16,7 @@ Signed-off-by: Hal Feng --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig -@@ -216,6 +216,11 @@ config CAN_XILINXCAN +@@ -217,6 +217,11 @@ config CAN_XILINXCAN Xilinx CAN driver. This driver supports both soft AXI CAN IP and Zynq CANPS IP. diff --git a/target/linux/starfive/patches-6.18/0018-driver-e24-add-e24-driver.patch b/target/linux/starfive/patches-6.18/0018-driver-e24-add-e24-driver.patch index ca61b4652f..9e853b2bde 100644 --- a/target/linux/starfive/patches-6.18/0018-driver-e24-add-e24-driver.patch +++ b/target/linux/starfive/patches-6.18/0018-driver-e24-add-e24-driver.patch @@ -29,17 +29,17 @@ Signed-off-by: shanlong.li --- a/drivers/Kconfig +++ b/drivers/Kconfig -@@ -245,4 +245,5 @@ source "drivers/cdx/Kconfig" +@@ -251,4 +251,5 @@ source "drivers/hte/Kconfig" - source "drivers/dpll/Kconfig" + source "drivers/cdx/Kconfig" +source "drivers/e24/Kconfig" endmenu --- a/drivers/Makefile +++ b/drivers/Makefile -@@ -195,3 +195,4 @@ obj-$(CONFIG_CDX_BUS) += cdx/ - obj-$(CONFIG_DPLL) += dpll/ +@@ -197,3 +197,4 @@ obj-$(CONFIG_DPLL) += dpll/ + obj-$(CONFIG_DIBS) += dibs/ obj-$(CONFIG_S390) += s390/ +obj-$(CONFIG_E24) += e24/ --- /dev/null diff --git a/target/linux/starfive/patches-6.18/0020-spi-pl022-starfive-Add-platform-bus-register-to-adap.patch b/target/linux/starfive/patches-6.18/0020-spi-pl022-starfive-Add-platform-bus-register-to-adap.patch index 6c0f51eaa9..4e8d2f81fa 100644 --- a/target/linux/starfive/patches-6.18/0020-spi-pl022-starfive-Add-platform-bus-register-to-adap.patch +++ b/target/linux/starfive/patches-6.18/0020-spi-pl022-starfive-Add-platform-bus-register-to-adap.patch @@ -14,15 +14,15 @@ Signed-off-by: Hal Feng --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c -@@ -34,6 +34,7 @@ - #include +@@ -35,6 +35,7 @@ #include + #include #include +#include /* * This macro is used to define some register default values. -@@ -1841,7 +1842,10 @@ pl022_platform_data_dt_get(struct device +@@ -1838,7 +1839,10 @@ pl022_platform_data_dt_get(struct device return NULL; } @@ -34,7 +34,7 @@ Signed-off-by: Hal Feng if (!pd) return NULL; -@@ -1861,6 +1865,14 @@ static int pl022_probe(struct amba_devic +@@ -1858,6 +1862,14 @@ static int pl022_probe(struct amba_devic struct spi_controller *host; struct pl022 *pl022 = NULL; /*Data for this driver */ int status = 0; @@ -49,7 +49,7 @@ Signed-off-by: Hal Feng dev_info(&adev->dev, "ARM PL022 driver, device ID: 0x%08x\n", adev->periphid); -@@ -1916,7 +1928,11 @@ static int pl022_probe(struct amba_devic +@@ -1913,7 +1925,11 @@ static int pl022_probe(struct amba_devic goto err_no_ioregion; pl022->phybase = adev->res.start; @@ -62,7 +62,7 @@ Signed-off-by: Hal Feng resource_size(&adev->res)); if (pl022->virtbase == NULL) { status = -ENOMEM; -@@ -1925,14 +1941,28 @@ static int pl022_probe(struct amba_devic +@@ -1922,14 +1938,28 @@ static int pl022_probe(struct amba_devic dev_info(&adev->dev, "mapped registers from %pa to %p\n", &adev->res.start, pl022->virtbase); @@ -93,7 +93,7 @@ Signed-off-by: Hal Feng if (IS_ERR(pl022->rst)) { status = PTR_ERR(pl022->rst); dev_err(&adev->dev, "could not retrieve SSP/SPI bus reset\n"); -@@ -1950,7 +1980,11 @@ static int pl022_probe(struct amba_devic +@@ -1947,7 +1977,11 @@ static int pl022_probe(struct amba_devic SSP_CR1(pl022->virtbase)); load_ssp_default_config(pl022); @@ -106,7 +106,7 @@ Signed-off-by: Hal Feng 0, "pl022", pl022); if (status < 0) { dev_err(&adev->dev, "probe - cannot get IRQ (%d)\n", status); -@@ -1975,7 +2009,10 @@ static int pl022_probe(struct amba_devic +@@ -1972,7 +2006,10 @@ static int pl022_probe(struct amba_devic /* Register with the SPI framework */ amba_set_drvdata(adev, pl022); @@ -118,7 +118,7 @@ Signed-off-by: Hal Feng if (status != 0) { dev_err_probe(&adev->dev, status, "problem registering spi host\n"); -@@ -2000,13 +2037,24 @@ static int pl022_probe(struct amba_devic +@@ -1997,13 +2034,24 @@ static int pl022_probe(struct amba_devic if (platform_info->enable_dma) pl022_dma_remove(pl022); err_no_irq: @@ -143,7 +143,7 @@ Signed-off-by: Hal Feng return status; } -@@ -2205,6 +2253,89 @@ static void __exit pl022_exit(void) +@@ -2202,6 +2250,89 @@ static void __exit pl022_exit(void) } module_exit(pl022_exit); diff --git a/target/linux/starfive/patches-6.18/0021-spi-pl022-starfive-Avoid-power-device-error-when-CON.patch b/target/linux/starfive/patches-6.18/0021-spi-pl022-starfive-Avoid-power-device-error-when-CON.patch index a2ec87131c..256cc27678 100644 --- a/target/linux/starfive/patches-6.18/0021-spi-pl022-starfive-Avoid-power-device-error-when-CON.patch +++ b/target/linux/starfive/patches-6.18/0021-spi-pl022-starfive-Avoid-power-device-error-when-CON.patch @@ -17,8 +17,8 @@ Signed-off-by: Hal Feng --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c -@@ -35,6 +35,8 @@ - #include +@@ -36,6 +36,8 @@ + #include #include #include +#include @@ -26,7 +26,7 @@ Signed-off-by: Hal Feng /* * This macro is used to define some register default values. -@@ -2019,7 +2021,8 @@ static int pl022_probe(struct amba_devic +@@ -2016,7 +2018,8 @@ static int pl022_probe(struct amba_devic goto err_spi_register; } dev_dbg(dev, "probe succeeded\n"); @@ -36,7 +36,7 @@ Signed-off-by: Hal Feng /* let runtime pm put suspend */ if (platform_info->autosuspend_delay > 0) { dev_info(&adev->dev, -@@ -2029,7 +2032,10 @@ static int pl022_probe(struct amba_devic +@@ -2026,7 +2029,10 @@ static int pl022_probe(struct amba_devic platform_info->autosuspend_delay); pm_runtime_use_autosuspend(dev); } @@ -48,7 +48,7 @@ Signed-off-by: Hal Feng return 0; -@@ -2283,8 +2289,33 @@ static int starfive_of_pl022_probe(struc +@@ -2280,8 +2286,33 @@ static int starfive_of_pl022_probe(struc ret = -EINVAL; } @@ -82,7 +82,7 @@ Signed-off-by: Hal Feng return ret; } -@@ -2314,6 +2345,7 @@ static void starfive_of_pl022_remove(str +@@ -2311,6 +2342,7 @@ static void starfive_of_pl022_remove(str size = resource_size(pdev->resource); release_mem_region(pdev->resource->start, size); diff --git a/target/linux/starfive/patches-6.18/0022-spi-pl022-starfive-fix-the-problem-of-spi-overlay-re.patch b/target/linux/starfive/patches-6.18/0022-spi-pl022-starfive-fix-the-problem-of-spi-overlay-re.patch index 15b84adeef..9fb5e91fb1 100644 --- a/target/linux/starfive/patches-6.18/0022-spi-pl022-starfive-fix-the-problem-of-spi-overlay-re.patch +++ b/target/linux/starfive/patches-6.18/0022-spi-pl022-starfive-fix-the-problem-of-spi-overlay-re.patch @@ -14,7 +14,7 @@ Signed-off-by: Hal Feng --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c -@@ -1859,6 +1859,163 @@ pl022_platform_data_dt_get(struct device +@@ -1856,6 +1856,163 @@ pl022_platform_data_dt_get(struct device return pd; } @@ -178,7 +178,7 @@ Signed-off-by: Hal Feng static int pl022_probe(struct amba_device *adev, const struct amba_id *id) { struct device *dev = &adev->dev; -@@ -1867,14 +2024,6 @@ static int pl022_probe(struct amba_devic +@@ -1864,14 +2021,6 @@ static int pl022_probe(struct amba_devic struct spi_controller *host; struct pl022 *pl022 = NULL; /*Data for this driver */ int status = 0; @@ -193,7 +193,7 @@ Signed-off-by: Hal Feng dev_info(&adev->dev, "ARM PL022 driver, device ID: 0x%08x\n", adev->periphid); -@@ -1930,11 +2079,7 @@ static int pl022_probe(struct amba_devic +@@ -1927,11 +2076,7 @@ static int pl022_probe(struct amba_devic goto err_no_ioregion; pl022->phybase = adev->res.start; @@ -206,7 +206,7 @@ Signed-off-by: Hal Feng resource_size(&adev->res)); if (pl022->virtbase == NULL) { status = -ENOMEM; -@@ -1943,28 +2088,14 @@ static int pl022_probe(struct amba_devic +@@ -1940,28 +2085,14 @@ static int pl022_probe(struct amba_devic dev_info(&adev->dev, "mapped registers from %pa to %p\n", &adev->res.start, pl022->virtbase); @@ -237,7 +237,7 @@ Signed-off-by: Hal Feng if (IS_ERR(pl022->rst)) { status = PTR_ERR(pl022->rst); dev_err(&adev->dev, "could not retrieve SSP/SPI bus reset\n"); -@@ -1982,11 +2113,7 @@ static int pl022_probe(struct amba_devic +@@ -1979,11 +2110,7 @@ static int pl022_probe(struct amba_devic SSP_CR1(pl022->virtbase)); load_ssp_default_config(pl022); @@ -250,7 +250,7 @@ Signed-off-by: Hal Feng 0, "pl022", pl022); if (status < 0) { dev_err(&adev->dev, "probe - cannot get IRQ (%d)\n", status); -@@ -2011,18 +2138,16 @@ static int pl022_probe(struct amba_devic +@@ -2008,18 +2135,16 @@ static int pl022_probe(struct amba_devic /* Register with the SPI framework */ amba_set_drvdata(adev, pl022); @@ -273,7 +273,7 @@ Signed-off-by: Hal Feng /* let runtime pm put suspend */ if (platform_info->autosuspend_delay > 0) { dev_info(&adev->dev, -@@ -2032,10 +2157,8 @@ static int pl022_probe(struct amba_devic +@@ -2029,10 +2154,8 @@ static int pl022_probe(struct amba_devic platform_info->autosuspend_delay); pm_runtime_use_autosuspend(dev); } @@ -286,7 +286,7 @@ Signed-off-by: Hal Feng return 0; -@@ -2043,24 +2166,15 @@ static int pl022_probe(struct amba_devic +@@ -2040,24 +2163,15 @@ static int pl022_probe(struct amba_devic if (platform_info->enable_dma) pl022_dma_remove(pl022); err_no_irq: @@ -312,7 +312,7 @@ Signed-off-by: Hal Feng return status; } -@@ -2272,23 +2386,8 @@ static int starfive_of_pl022_probe(struc +@@ -2269,23 +2383,8 @@ static int starfive_of_pl022_probe(struc .mask = 0x000fffff, .data = &vendor_arm }; @@ -336,7 +336,7 @@ Signed-off-by: Hal Feng ret = of_clk_set_defaults(dev->of_node, false); if (ret < 0) goto err_probe; -@@ -2297,16 +2396,11 @@ static int starfive_of_pl022_probe(struc +@@ -2294,16 +2393,11 @@ static int starfive_of_pl022_probe(struc if (ret) goto err_probe; @@ -357,7 +357,7 @@ Signed-off-by: Hal Feng if (ret) { pm_runtime_disable(dev); -@@ -2321,31 +2415,25 @@ err_probe: +@@ -2318,31 +2412,25 @@ err_probe: static void starfive_of_pl022_remove(struct platform_device *pdev) { diff --git a/target/linux/starfive/patches-6.18/0023-spi-pl022-starfive-Enable-spi-to-be-compiled-into-mo.patch b/target/linux/starfive/patches-6.18/0023-spi-pl022-starfive-Enable-spi-to-be-compiled-into-mo.patch index 661a2ea9aa..00f8ae879b 100644 --- a/target/linux/starfive/patches-6.18/0023-spi-pl022-starfive-Enable-spi-to-be-compiled-into-mo.patch +++ b/target/linux/starfive/patches-6.18/0023-spi-pl022-starfive-Enable-spi-to-be-compiled-into-mo.patch @@ -14,7 +14,7 @@ Signed-off-by: Hal Feng --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c -@@ -2365,7 +2365,11 @@ static int __init pl022_init(void) +@@ -2362,7 +2362,11 @@ static int __init pl022_init(void) { return amba_driver_register(&pl022_driver); } @@ -26,7 +26,7 @@ Signed-off-by: Hal Feng static void __exit pl022_exit(void) { -@@ -2452,7 +2456,9 @@ static struct platform_driver starfive_o +@@ -2449,7 +2453,9 @@ static struct platform_driver starfive_o .remove = starfive_of_pl022_remove, }; diff --git a/target/linux/starfive/patches-6.18/0024-spi-pl022-Prompt-warning-when-frequency-does-not-sup.patch b/target/linux/starfive/patches-6.18/0024-spi-pl022-Prompt-warning-when-frequency-does-not-sup.patch index b455e920e9..ca8bc3a262 100644 --- a/target/linux/starfive/patches-6.18/0024-spi-pl022-Prompt-warning-when-frequency-does-not-sup.patch +++ b/target/linux/starfive/patches-6.18/0024-spi-pl022-Prompt-warning-when-frequency-does-not-sup.patch @@ -13,7 +13,7 @@ Signed-off-by: Hal Feng --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c -@@ -1556,6 +1556,10 @@ static int calculate_effective_freq(stru +@@ -1553,6 +1553,10 @@ static int calculate_effective_freq(stru WARN(!best_freq, "pl022: Matching cpsdvsr and scr not found for %d Hz rate \n", freq); diff --git a/target/linux/starfive/patches-6.18/0025-spi-pl022-Fix-spi-overlay-falut.patch b/target/linux/starfive/patches-6.18/0025-spi-pl022-Fix-spi-overlay-falut.patch index 4d0f276230..906cec0911 100644 --- a/target/linux/starfive/patches-6.18/0025-spi-pl022-Fix-spi-overlay-falut.patch +++ b/target/linux/starfive/patches-6.18/0025-spi-pl022-Fix-spi-overlay-falut.patch @@ -14,7 +14,7 @@ Signed-off-by: Hal Feng --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c -@@ -1908,7 +1908,6 @@ static int pl022_platform_probe(struct p +@@ -1905,7 +1905,6 @@ static int pl022_platform_probe(struct p /* If open CONFIG_PM, auto_runtime_pm should be false when of-platform.*/ host->auto_runtime_pm = true; host->transfer_one = pl022_transfer_one; @@ -22,7 +22,7 @@ Signed-off-by: Hal Feng host->handle_err = pl022_handle_err; host->unprepare_transfer_hardware = pl022_unprepare_transfer_hardware; host->rt = platform_info->rt; -@@ -2435,8 +2434,6 @@ static void starfive_of_pl022_remove(str +@@ -2432,8 +2431,6 @@ static void starfive_of_pl022_remove(str if (pl022->host_info->enable_dma) pl022_dma_remove(pl022); diff --git a/target/linux/starfive/patches-6.18/0027-RISC-V-Create-unique-identification-for-SoC-PMU.patch b/target/linux/starfive/patches-6.18/0027-RISC-V-Create-unique-identification-for-SoC-PMU.patch index b18e10f2ac..9adc727571 100644 --- a/target/linux/starfive/patches-6.18/0027-RISC-V-Create-unique-identification-for-SoC-PMU.patch +++ b/target/linux/starfive/patches-6.18/0027-RISC-V-Create-unique-identification-for-SoC-PMU.patch @@ -30,7 +30,7 @@ Signed-off-by: João Mário Domingos --- a/drivers/perf/riscv_pmu_sbi.c +++ b/drivers/perf/riscv_pmu_sbi.c -@@ -1326,6 +1326,46 @@ static struct ctl_table sbi_pmu_sysctl_t +@@ -1419,6 +1419,46 @@ static const struct ctl_table sbi_pmu_sy }, }; @@ -77,7 +77,7 @@ Signed-off-by: João Mário Domingos static int pmu_sbi_device_probe(struct platform_device *pdev) { struct riscv_pmu *pmu = NULL; -@@ -1375,6 +1415,13 @@ static int pmu_sbi_device_probe(struct p +@@ -1468,6 +1508,13 @@ static int pmu_sbi_device_probe(struct p pmu->event_unmapped = pmu_sbi_event_unmapped; pmu->csr_index = pmu_sbi_csr_index; diff --git a/target/linux/starfive/patches-6.18/0030-riscv-dts-starfive-vf2-add-reserved-memory-for-E24.patch b/target/linux/starfive/patches-6.18/0030-riscv-dts-starfive-vf2-add-reserved-memory-for-E24.patch index dcc3dc1920..e2cd85f0b8 100644 --- a/target/linux/starfive/patches-6.18/0030-riscv-dts-starfive-vf2-add-reserved-memory-for-E24.patch +++ b/target/linux/starfive/patches-6.18/0030-riscv-dts-starfive-vf2-add-reserved-memory-for-E24.patch @@ -29,4 +29,4 @@ Signed-off-by: Zoltan HERPAI + }; }; - &gmac1 { + &gmac0 { diff --git a/target/linux/starfive/patches-6.18/1002-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch b/target/linux/starfive/patches-6.18/1002-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch index db83fe9ba7..fffbc009e9 100644 --- a/target/linux/starfive/patches-6.18/1002-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch +++ b/target/linux/starfive/patches-6.18/1002-serial-8250_dw-Add-starfive-jh7100-hsuart-compatible.patch @@ -15,7 +15,7 @@ Signed-off-by: Emil Renner Berthing --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c -@@ -777,6 +777,7 @@ static const struct of_device_id dw8250_ +@@ -973,6 +973,7 @@ static const struct of_device_id dw8250_ { .compatible = "marvell,armada-38x-uart", .data = &dw8250_armada_38x_data }, { .compatible = "renesas,rzn1-uart", .data = &dw8250_renesas_rzn1_data }, { .compatible = "sophgo,sg2044-uart", .data = &dw8250_skip_set_rate_data }, diff --git a/target/linux/starfive/patches-6.18/1003-drivers-tty-serial-8250-update-driver-for-JH7100.patch b/target/linux/starfive/patches-6.18/1003-drivers-tty-serial-8250-update-driver-for-JH7100.patch index 6d41247359..875f71d4c0 100644 --- a/target/linux/starfive/patches-6.18/1003-drivers-tty-serial-8250-update-driver-for-JH7100.patch +++ b/target/linux/starfive/patches-6.18/1003-drivers-tty-serial-8250-update-driver-for-JH7100.patch @@ -9,7 +9,7 @@ Subject: [PATCH 1003/1021] drivers/tty/serial/8250: update driver for JH7100 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c -@@ -68,8 +68,16 @@ static const struct serial8250_config ua +@@ -60,8 +60,16 @@ static const struct serial8250_config ua }, [PORT_16550] = { .name = "16550", diff --git a/target/linux/starfive/patches-6.18/1004-power-reset-tps65086-Allow-building-as-a-module.patch b/target/linux/starfive/patches-6.18/1004-power-reset-tps65086-Allow-building-as-a-module.patch index b8dd18fff8..9d50f12bb1 100644 --- a/target/linux/starfive/patches-6.18/1004-power-reset-tps65086-Allow-building-as-a-module.patch +++ b/target/linux/starfive/patches-6.18/1004-power-reset-tps65086-Allow-building-as-a-module.patch @@ -11,8 +11,8 @@ Signed-off-by: Emil Renner Berthing --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig -@@ -217,7 +217,7 @@ config POWER_RESET_ST - Reset support for STMicroelectronics boards. +@@ -247,7 +247,7 @@ config POWER_RESET_TORADEX_EC + If unsure, say N. config POWER_RESET_TPS65086 - bool "TPS65086 restart driver" diff --git a/target/linux/starfive/patches-6.18/1007-reset-starfive-Add-JH7100-audio-reset-driver.patch b/target/linux/starfive/patches-6.18/1007-reset-starfive-Add-JH7100-audio-reset-driver.patch index 5954e5807e..52a169a261 100644 --- a/target/linux/starfive/patches-6.18/1007-reset-starfive-Add-JH7100-audio-reset-driver.patch +++ b/target/linux/starfive/patches-6.18/1007-reset-starfive-Add-JH7100-audio-reset-driver.patch @@ -20,7 +20,7 @@ Signed-off-by: Emil Renner Berthing --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -22078,7 +22078,7 @@ STARFIVE JH71X0 RESET CONTROLLER DRIVERS +@@ -24566,7 +24566,7 @@ STARFIVE JH71X0 RESET CONTROLLER DRIVERS M: Emil Renner Berthing M: Hal Feng S: Maintained diff --git a/target/linux/starfive/patches-6.18/1010-pinctrl-starfive-Reset-pinmux-settings.patch b/target/linux/starfive/patches-6.18/1010-pinctrl-starfive-Reset-pinmux-settings.patch index bf1c2d80f3..d904baa511 100644 --- a/target/linux/starfive/patches-6.18/1010-pinctrl-starfive-Reset-pinmux-settings.patch +++ b/target/linux/starfive/patches-6.18/1010-pinctrl-starfive-Reset-pinmux-settings.patch @@ -49,7 +49,7 @@ Signed-off-by: Emil Renner Berthing struct starfive_pinctrl { struct gpio_chip gc; struct pinctrl_gpio_range gpios; -@@ -1210,6 +1214,65 @@ static void starfive_disable_clock(void +@@ -1212,6 +1216,65 @@ static void starfive_disable_clock(void clk_disable_unprepare(data); } @@ -115,7 +115,7 @@ Signed-off-by: Emil Renner Berthing static int starfive_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -1271,6 +1334,9 @@ static int starfive_probe(struct platfor +@@ -1273,6 +1336,9 @@ static int starfive_probe(struct platfor writel(value, sfp->padctl + IO_PADSHARE_SEL); } diff --git a/target/linux/starfive/patches-6.18/1011-net-stmmac-use-GFP_DMA32.patch b/target/linux/starfive/patches-6.18/1011-net-stmmac-use-GFP_DMA32.patch index 7ddad83585..69da01cd60 100644 --- a/target/linux/starfive/patches-6.18/1011-net-stmmac-use-GFP_DMA32.patch +++ b/target/linux/starfive/patches-6.18/1011-net-stmmac-use-GFP_DMA32.patch @@ -19,7 +19,7 @@ Signed-off-by: Matteo Croce if (priv->dma_cap.host_dma_width <= 32) gfp |= GFP_DMA32; -@@ -4756,7 +4756,7 @@ static inline void stmmac_rx_refill(stru +@@ -4750,7 +4750,7 @@ static inline void stmmac_rx_refill(stru struct stmmac_rx_queue *rx_q = &priv->dma_conf.rx_queue[queue]; int dirty = stmmac_rx_dirty(priv, queue); unsigned int entry = rx_q->dirty_rx; diff --git a/target/linux/starfive/patches-6.18/1012-dt-bindings-dma-dw-axi-dmac-Increase-DMA-channel-lim.patch b/target/linux/starfive/patches-6.18/1012-dt-bindings-dma-dw-axi-dmac-Increase-DMA-channel-lim.patch index 047fb94251..c6d3e6f728 100644 --- a/target/linux/starfive/patches-6.18/1012-dt-bindings-dma-dw-axi-dmac-Increase-DMA-channel-lim.patch +++ b/target/linux/starfive/patches-6.18/1012-dt-bindings-dma-dw-axi-dmac-Increase-DMA-channel-lim.patch @@ -24,9 +24,9 @@ Signed-off-by: Geert Uytterhoeven - maximum: 8 + maximum: 16 - resets: - minItems: 1 -@@ -81,14 +81,14 @@ properties: + dma-noncoherent: true + +@@ -83,14 +83,14 @@ properties: Channel priority specifier associated with the DMA channels. $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1 diff --git a/target/linux/starfive/patches-6.18/1015-hwrng-Add-StarFive-JH7100-Random-Number-Generator-dr.patch b/target/linux/starfive/patches-6.18/1015-hwrng-Add-StarFive-JH7100-Random-Number-Generator-dr.patch index 549f7f8646..d6e22bed85 100644 --- a/target/linux/starfive/patches-6.18/1015-hwrng-Add-StarFive-JH7100-Random-Number-Generator-dr.patch +++ b/target/linux/starfive/patches-6.18/1015-hwrng-Add-StarFive-JH7100-Random-Number-Generator-dr.patch @@ -16,7 +16,7 @@ Signed-off-by: Emil Renner Berthing --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig -@@ -323,6 +323,19 @@ config HW_RANDOM_POWERNV +@@ -349,6 +349,19 @@ config HW_RANDOM_POWERNV If unsure, say Y. @@ -38,7 +38,7 @@ Signed-off-by: Emil Renner Berthing depends on ARCH_HISI || COMPILE_TEST --- a/drivers/char/hw_random/Makefile +++ b/drivers/char/hw_random/Makefile -@@ -28,6 +28,7 @@ obj-$(CONFIG_HW_RANDOM_OCTEON) += octeon +@@ -29,6 +29,7 @@ obj-$(CONFIG_HW_RANDOM_OCTEON) += octeon obj-$(CONFIG_HW_RANDOM_NOMADIK) += nomadik-rng.o obj-$(CONFIG_HW_RANDOM_PSERIES) += pseries-rng.o obj-$(CONFIG_HW_RANDOM_POWERNV) += powernv-rng.o diff --git a/target/linux/starfive/patches-6.18/1023-riscv-dts-starfive-visionfive2-add-SYSLED-support.patch b/target/linux/starfive/patches-6.18/1023-riscv-dts-starfive-visionfive2-add-SYSLED-support.patch index c5898470c3..e8db0c9290 100644 --- a/target/linux/starfive/patches-6.18/1023-riscv-dts-starfive-visionfive2-add-SYSLED-support.patch +++ b/target/linux/starfive/patches-6.18/1023-riscv-dts-starfive-visionfive2-add-SYSLED-support.patch @@ -31,4 +31,4 @@ Signed-off-by: Zoltan HERPAI + }; }; - &gmac1 { + &gmac0 {