From a158f9f4058b3e401bd54e1efeee291ee6e9a256 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Tue, 12 Mar 2024 10:11:00 +0100 Subject: [PATCH] starfive: refresh patches CI reported that patches need to be refreshed, so lets refresh. Signed-off-by: Robert Marko --- ...16-MAINTAINERS-generalise-StarFive-clk-reset-entries.patch | 4 ++-- ...-dt-bindings-pinctrl-Add-StarFive-JH7110-sys-pinctrl.patch | 2 +- ...pinctrl-starfive-Add-StarFive-JH7110-sys-controller-.patch | 2 +- ...32-clk-starfive-Add-StarFive-JH7110-PLL-clock-driver.patch | 2 +- .../0036-soc-starfive-Add-StarFive-JH71XX-pmu-driver.patch | 2 +- ...-dt-bindings-soc-starfive-Add-StarFive-syscon-module.patch | 4 ++-- .../0043-dt-bindings-net-Add-support-StarFive-dwmac.patch | 2 +- ...44-net-stmmac-Add-glue-layer-for-StarFive-JH7110-SoC.patch | 2 +- ...0102-hwrng-starfive-Add-TRNG-driver-for-StarFive-SoC.patch | 2 +- .../0105-drivers-watchdog-Add-StarFive-Watchdog-driver.patch | 2 +- .../0108-mmc-starfive-Add-sdio-emmc-driver-support.patch | 2 +- ...hwmon-sfctemp-Add-StarFive-JH71x0-temperature-sensor.patch | 2 +- ...RISC-V-Add-arch-functions-to-support-hibernation-sus.patch | 2 +- .../starfive/patches-6.1/1013-net-stmmac-use-GFP_DMA32.patch | 2 +- .../1022-reset-starfive-Add-JH7100-audio-reset-driver.patch | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/target/linux/starfive/patches-6.1/0016-MAINTAINERS-generalise-StarFive-clk-reset-entries.patch b/target/linux/starfive/patches-6.1/0016-MAINTAINERS-generalise-StarFive-clk-reset-entries.patch index 68b96fa3881..d3f9a9cf224 100644 --- a/target/linux/starfive/patches-6.1/0016-MAINTAINERS-generalise-StarFive-clk-reset-entries.patch +++ b/target/linux/starfive/patches-6.1/0016-MAINTAINERS-generalise-StarFive-clk-reset-entries.patch @@ -13,7 +13,7 @@ Signed-off-by: shanlong.li --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19650,12 +19650,13 @@ M: Emil Renner Berthing STARFIVE JH7100 PINCTRL DRIVER M: Emil Renner Berthing -@@ -19665,12 +19666,13 @@ F: Documentation/devicetree/bindings/pin +@@ -19672,12 +19673,13 @@ F: Documentation/devicetree/bindings/pin F: drivers/pinctrl/starfive/ F: include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h diff --git a/target/linux/starfive/patches-6.1/0026-dt-bindings-pinctrl-Add-StarFive-JH7110-sys-pinctrl.patch b/target/linux/starfive/patches-6.1/0026-dt-bindings-pinctrl-Add-StarFive-JH7110-sys-pinctrl.patch index eab4e6ee9fb..9b3f41ec1ee 100644 --- a/target/linux/starfive/patches-6.1/0026-dt-bindings-pinctrl-Add-StarFive-JH7110-sys-pinctrl.patch +++ b/target/linux/starfive/patches-6.1/0026-dt-bindings-pinctrl-Add-StarFive-JH7110-sys-pinctrl.patch @@ -165,7 +165,7 @@ Signed-off-by: Hal Feng +... --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19658,13 +19658,15 @@ F: Documentation/devicetree/bindings/clo +@@ -19665,13 +19665,15 @@ F: Documentation/devicetree/bindings/clo F: drivers/clk/starfive/clk-starfive-jh71* F: include/dt-bindings/clock/starfive?jh71*.h diff --git a/target/linux/starfive/patches-6.1/0028-pinctrl-starfive-Add-StarFive-JH7110-sys-controller-.patch b/target/linux/starfive/patches-6.1/0028-pinctrl-starfive-Add-StarFive-JH7110-sys-controller-.patch index a9310aadc35..d5735b59801 100644 --- a/target/linux/starfive/patches-6.1/0028-pinctrl-starfive-Add-StarFive-JH7110-sys-controller-.patch +++ b/target/linux/starfive/patches-6.1/0028-pinctrl-starfive-Add-StarFive-JH7110-sys-controller-.patch @@ -24,7 +24,7 @@ Signed-off-by: Hal Feng --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19664,7 +19664,7 @@ M: Jianlong Huang --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19650,6 +19650,12 @@ M: Emil Renner Berthing --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19682,6 +19682,20 @@ F: Documentation/devicetree/bindings/res +@@ -19689,6 +19689,20 @@ F: Documentation/devicetree/bindings/res F: drivers/reset/starfive/reset-starfive-jh71* F: include/dt-bindings/reset/starfive?jh71*.h diff --git a/target/linux/starfive/patches-6.1/0037-dt-bindings-soc-starfive-Add-StarFive-syscon-module.patch b/target/linux/starfive/patches-6.1/0037-dt-bindings-soc-starfive-Add-StarFive-syscon-module.patch index c4bf9bc56f7..75b1d947b03 100644 --- a/target/linux/starfive/patches-6.1/0037-dt-bindings-soc-starfive-Add-StarFive-syscon-module.patch +++ b/target/linux/starfive/patches-6.1/0037-dt-bindings-soc-starfive-Add-StarFive-syscon-module.patch @@ -76,7 +76,7 @@ Signed-off-by: William Qiu +... --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19656,6 +19656,11 @@ S: Supported +@@ -19663,6 +19663,11 @@ S: Supported F: Documentation/devicetree/bindings/clock/starfive,jh7110-pll.yaml F: drivers/clk/starfive/clk-starfive-jh7110-pll.* @@ -88,7 +88,7 @@ Signed-off-by: William Qiu STARFIVE JH71X0 CLOCK DRIVERS M: Emil Renner Berthing M: Hal Feng -@@ -19686,6 +19691,7 @@ STARFIVE SOC DRIVER +@@ -19693,6 +19698,7 @@ STARFIVE SOC DRIVER M: Conor Dooley S: Maintained T: git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/ diff --git a/target/linux/starfive/patches-6.1/0043-dt-bindings-net-Add-support-StarFive-dwmac.patch b/target/linux/starfive/patches-6.1/0043-dt-bindings-net-Add-support-StarFive-dwmac.patch index 4487c6995fd..a66452c3820 100644 --- a/target/linux/starfive/patches-6.1/0043-dt-bindings-net-Add-support-StarFive-dwmac.patch +++ b/target/linux/starfive/patches-6.1/0043-dt-bindings-net-Add-support-StarFive-dwmac.patch @@ -175,7 +175,7 @@ Signed-off-by: Samin Guo + }; --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19650,6 +19650,12 @@ M: Emil Renner Berthing --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19655,6 +19655,7 @@ M: Emil Renner Berthing S: Maintained F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml diff --git a/target/linux/starfive/patches-6.1/0102-hwrng-starfive-Add-TRNG-driver-for-StarFive-SoC.patch b/target/linux/starfive/patches-6.1/0102-hwrng-starfive-Add-TRNG-driver-for-StarFive-SoC.patch index e9f8387e7fd..1ab18838e65 100644 --- a/target/linux/starfive/patches-6.1/0102-hwrng-starfive-Add-TRNG-driver-for-StarFive-SoC.patch +++ b/target/linux/starfive/patches-6.1/0102-hwrng-starfive-Add-TRNG-driver-for-StarFive-SoC.patch @@ -19,7 +19,7 @@ Signed-off-by: Jia Jie Ho --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19709,6 +19709,12 @@ F: Documentation/devicetree/bindings/pow +@@ -19716,6 +19716,12 @@ F: Documentation/devicetree/bindings/pow F: drivers/soc/starfive/jh71xx_pmu.c F: include/dt-bindings/power/starfive,jh7110-pmu.h diff --git a/target/linux/starfive/patches-6.1/0105-drivers-watchdog-Add-StarFive-Watchdog-driver.patch b/target/linux/starfive/patches-6.1/0105-drivers-watchdog-Add-StarFive-Watchdog-driver.patch index ec330250e2e..d7113de0ec8 100644 --- a/target/linux/starfive/patches-6.1/0105-drivers-watchdog-Add-StarFive-Watchdog-driver.patch +++ b/target/linux/starfive/patches-6.1/0105-drivers-watchdog-Add-StarFive-Watchdog-driver.patch @@ -18,7 +18,7 @@ Reviewed-by: Guenter Roeck --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19715,6 +19715,13 @@ S: Supported +@@ -19722,6 +19722,13 @@ S: Supported F: Documentation/devicetree/bindings/rng/starfive* F: drivers/char/hw_random/starfive-trng.c diff --git a/target/linux/starfive/patches-6.1/0108-mmc-starfive-Add-sdio-emmc-driver-support.patch b/target/linux/starfive/patches-6.1/0108-mmc-starfive-Add-sdio-emmc-driver-support.patch index 3aecc0a2042..fecad30928e 100644 --- a/target/linux/starfive/patches-6.1/0108-mmc-starfive-Add-sdio-emmc-driver-support.patch +++ b/target/linux/starfive/patches-6.1/0108-mmc-starfive-Add-sdio-emmc-driver-support.patch @@ -17,7 +17,7 @@ Signed-off-by: William Qiu --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19657,6 +19657,12 @@ S: Maintained +@@ -19664,6 +19664,12 @@ S: Maintained F: Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml F: drivers/net/ethernet/stmicro/stmmac/dwmac-starfive.c diff --git a/target/linux/starfive/patches-6.1/0110-hwmon-sfctemp-Add-StarFive-JH71x0-temperature-sensor.patch b/target/linux/starfive/patches-6.1/0110-hwmon-sfctemp-Add-StarFive-JH71x0-temperature-sensor.patch index b52cbd2ba51..aa062021ac5 100644 --- a/target/linux/starfive/patches-6.1/0110-hwmon-sfctemp-Add-StarFive-JH71x0-temperature-sensor.patch +++ b/target/linux/starfive/patches-6.1/0110-hwmon-sfctemp-Add-StarFive-JH71x0-temperature-sensor.patch @@ -71,7 +71,7 @@ Signed-off-by: Hal Feng +================ ==== ============================================= --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -18679,6 +18679,14 @@ L: netdev@vger.kernel.org +@@ -18686,6 +18686,14 @@ L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/sfc/ diff --git a/target/linux/starfive/patches-6.1/0116-RISC-V-Add-arch-functions-to-support-hibernation-sus.patch b/target/linux/starfive/patches-6.1/0116-RISC-V-Add-arch-functions-to-support-hibernation-sus.patch index eae0559d9cd..a47c49d968b 100644 --- a/target/linux/starfive/patches-6.1/0116-RISC-V-Add-arch-functions-to-support-hibernation-sus.patch +++ b/target/linux/starfive/patches-6.1/0116-RISC-V-Add-arch-functions-to-support-hibernation-sus.patch @@ -132,7 +132,7 @@ Reviewed-by: Andrew Jones #endif --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile -@@ -65,6 +65,7 @@ obj-$(CONFIG_MODULES) += module.o +@@ -67,6 +67,7 @@ obj-$(CONFIG_MODULES) += module.o obj-$(CONFIG_MODULE_SECTIONS) += module-sections.o obj-$(CONFIG_CPU_PM) += suspend_entry.o suspend.o diff --git a/target/linux/starfive/patches-6.1/1013-net-stmmac-use-GFP_DMA32.patch b/target/linux/starfive/patches-6.1/1013-net-stmmac-use-GFP_DMA32.patch index a341c96bcf8..5bbb4cc4c51 100644 --- a/target/linux/starfive/patches-6.1/1013-net-stmmac-use-GFP_DMA32.patch +++ b/target/linux/starfive/patches-6.1/1013-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; -@@ -4613,7 +4613,7 @@ static inline void stmmac_rx_refill(stru +@@ -4615,7 +4615,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.1/1022-reset-starfive-Add-JH7100-audio-reset-driver.patch b/target/linux/starfive/patches-6.1/1022-reset-starfive-Add-JH7100-audio-reset-driver.patch index dc25d354d6e..bf3eff01574 100644 --- a/target/linux/starfive/patches-6.1/1022-reset-starfive-Add-JH7100-audio-reset-driver.patch +++ b/target/linux/starfive/patches-6.1/1022-reset-starfive-Add-JH7100-audio-reset-driver.patch @@ -20,7 +20,7 @@ Signed-off-by: Emil Renner Berthing --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -19704,7 +19704,7 @@ STARFIVE JH71X0 RESET CONTROLLER DRIVERS +@@ -19711,7 +19711,7 @@ STARFIVE JH71X0 RESET CONTROLLER DRIVERS M: Emil Renner Berthing M: Hal Feng S: Maintained -- 2.30.2