starfive: refresh patches
authorRobert Marko <robimarko@gmail.com>
Tue, 12 Mar 2024 09:11:00 +0000 (10:11 +0100)
committerRobert Marko <robimarko@gmail.com>
Tue, 12 Mar 2024 09:27:38 +0000 (10:27 +0100)
CI reported that patches need to be refreshed, so lets refresh.

Signed-off-by: Robert Marko <robimarko@gmail.com>
15 files changed:
target/linux/starfive/patches-6.1/0016-MAINTAINERS-generalise-StarFive-clk-reset-entries.patch
target/linux/starfive/patches-6.1/0026-dt-bindings-pinctrl-Add-StarFive-JH7110-sys-pinctrl.patch
target/linux/starfive/patches-6.1/0028-pinctrl-starfive-Add-StarFive-JH7110-sys-controller-.patch
target/linux/starfive/patches-6.1/0032-clk-starfive-Add-StarFive-JH7110-PLL-clock-driver.patch
target/linux/starfive/patches-6.1/0036-soc-starfive-Add-StarFive-JH71XX-pmu-driver.patch
target/linux/starfive/patches-6.1/0037-dt-bindings-soc-starfive-Add-StarFive-syscon-module.patch
target/linux/starfive/patches-6.1/0043-dt-bindings-net-Add-support-StarFive-dwmac.patch
target/linux/starfive/patches-6.1/0044-net-stmmac-Add-glue-layer-for-StarFive-JH7110-SoC.patch
target/linux/starfive/patches-6.1/0102-hwrng-starfive-Add-TRNG-driver-for-StarFive-SoC.patch
target/linux/starfive/patches-6.1/0105-drivers-watchdog-Add-StarFive-Watchdog-driver.patch
target/linux/starfive/patches-6.1/0108-mmc-starfive-Add-sdio-emmc-driver-support.patch
target/linux/starfive/patches-6.1/0110-hwmon-sfctemp-Add-StarFive-JH71x0-temperature-sensor.patch
target/linux/starfive/patches-6.1/0116-RISC-V-Add-arch-functions-to-support-hibernation-sus.patch
target/linux/starfive/patches-6.1/1013-net-stmmac-use-GFP_DMA32.patch
target/linux/starfive/patches-6.1/1022-reset-starfive-Add-JH7100-audio-reset-driver.patch

index 68b96fa38815b1f691e3337b3561b60af2f6a957..d3f9a9cf2242cdbc9233026edf3cc177e5e11ca3 100644 (file)
@@ -13,7 +13,7 @@ Signed-off-by: shanlong.li <shanlong.li@starfivetech.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19650,12 +19650,13 @@ M:   Emil Renner Berthing <kernel@esmil.dk
+@@ -19657,12 +19657,13 @@ M:   Emil Renner Berthing <kernel@esmil.dk
  S:    Maintained
  F:    arch/riscv/boot/dts/starfive/
  
@@ -31,7 +31,7 @@ Signed-off-by: shanlong.li <shanlong.li@starfivetech.com>
  
  STARFIVE JH7100 PINCTRL DRIVER
  M:    Emil Renner Berthing <kernel@esmil.dk>
-@@ -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
  
index eab4e6ee9fbfa6b091f449eceeb26573fad3f4b4..9b3f41ec1eeb36ef2f65e0f90b8bd6984eaaf9fd 100644 (file)
@@ -165,7 +165,7 @@ Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
 +...
 --- 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
  
index a9310aadc354a026368bbe98c822d56c98abddb3..d5735b5980176f6dfe349d67dca99f0a2ef66cba 100644 (file)
@@ -24,7 +24,7 @@ Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19664,7 +19664,7 @@ M:     Jianlong Huang <jianlong.huang@starfi
+@@ -19671,7 +19671,7 @@ M:     Jianlong Huang <jianlong.huang@starfi
  L:    linux-gpio@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
index 711e0775ccd3ade6ad455c58412ed24a6121c6b4..69dc662f10c57e6eb93fd96a1cf2ccf2ea690cb8 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Xingyu Wu <xingyu.wu@starfivetech.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19650,6 +19650,12 @@ M:    Emil Renner Berthing <kernel@esmil.dk
+@@ -19657,6 +19657,12 @@ M:    Emil Renner Berthing <kernel@esmil.dk
  S:    Maintained
  F:    arch/riscv/boot/dts/starfive/
  
index a5a33876fad769c9442b0b2251324ce2cac5dbe1..81c7548aa0bb1f9e9d54b047fd14398ecab063b4 100644 (file)
@@ -28,7 +28,7 @@ Reviewed-by: Heiko Stuebner <heiko@sntech.de>
 
 --- 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
  
index c4bf9bc56f7fcdda90870556e0c727387e53f82a..75b1d947b0333a96707df7e6be7860398578addc 100644 (file)
@@ -76,7 +76,7 @@ Signed-off-by: William Qiu <william.qiu@starfivetech.com>
 +...
 --- 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 <william.qiu@starfivetech.com>
  STARFIVE JH71X0 CLOCK DRIVERS
  M:    Emil Renner Berthing <kernel@esmil.dk>
  M:    Hal Feng <hal.feng@starfivetech.com>
-@@ -19686,6 +19691,7 @@ STARFIVE SOC DRIVER
+@@ -19693,6 +19698,7 @@ STARFIVE SOC DRIVER
  M:    Conor Dooley <conor@kernel.org>
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
index 4487c6995fd19afcfb9bebe6d3e79def085f6a9d..a66452c3820847b4d4df58f7bcffd8b1dec3b152 100644 (file)
@@ -175,7 +175,7 @@ Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
 +    };
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19650,6 +19650,12 @@ M:    Emil Renner Berthing <kernel@esmil.dk
+@@ -19657,6 +19657,12 @@ M:    Emil Renner Berthing <kernel@esmil.dk
  S:    Maintained
  F:    arch/riscv/boot/dts/starfive/
  
index 37ad5a192a34ada9bde3910ec0c44cad9d6be177..59609809c17aeaac99677b38618937eaa440d91d 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Samin Guo <samin.guo@starfivetech.com>
 
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -19655,6 +19655,7 @@ M:     Emil Renner Berthing <kernel@esmil.dk
+@@ -19662,6 +19662,7 @@ M:     Emil Renner Berthing <kernel@esmil.dk
  M:    Samin Guo <samin.guo@starfivetech.com>
  S:    Maintained
  F:    Documentation/devicetree/bindings/net/starfive,jh7110-dwmac.yaml
index e9f8387e7fd263a7da4d3ede6de3467ad926479e..1ab18838e65687a7e0f42351cf8df3e03fd2ee7b 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Jia Jie Ho <jiajie.ho@starfivetech.com>
 
 --- 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
  
index ec330250e2eaadfa324efebbed271142ccbe14e4..d7113de0ec8c4cba86cb489807628b1b83a1d139 100644 (file)
@@ -18,7 +18,7 @@ Reviewed-by: Guenter Roeck <linux@roeck-us.net>
 
 --- 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
  
index 3aecc0a20424c640a2641c52acf6985fa003e324..fecad30928e5837035cfe200ac375c9d80fdf2b8 100644 (file)
@@ -17,7 +17,7 @@ Signed-off-by: William Qiu <william.qiu@starfivetech.com>
 
 --- 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
  
index b52cbd2ba519077f58a4b65c0ed2bfcf883d8991..aa062021ac53fa6367076ef697a33608199d9c1e 100644 (file)
@@ -71,7 +71,7 @@ Signed-off-by: Hal Feng <hal.feng@starfivetech.com>
 +================ ==== =============================================
 --- 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/
  
index eae0559d9cd197193f3475d9f70c43143e9e2bb5..a47c49d968bce092d65a723d0aa2eb3a943ce8a5 100644 (file)
@@ -132,7 +132,7 @@ Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
  #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
index a341c96bcf8571526cadaa592b78d6bb2159d0aa..5bbb4cc4c51a7e38b8751d65c88d475e903e4bd6 100644 (file)
@@ -19,7 +19,7 @@ Signed-off-by: Matteo Croce <mcroce@microsoft.com>
  
        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;
index dc25d354d6e65455acf2ef4795cd97b44a60aae4..bf3eff015746598b6b7f4dca84ee9b71c52cdec0 100644 (file)
@@ -20,7 +20,7 @@ Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
 
 --- 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 <kernel@esmil.dk>
  M:    Hal Feng <hal.feng@starfivetech.com>
  S:    Maintained