ramips: 6.12: automatically rebuilding patches

Automatic rebasing of patches.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/18654
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Mieczyslaw Nalewaj 2025-05-30 07:59:40 +02:00 committed by Hauke Mehrtens
parent 65add58add
commit d798bef016
14 changed files with 29 additions and 29 deletions

View file

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/Kconfig --- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig
@@ -166,6 +166,7 @@ source "drivers/net/ethernet/pensando/Kc @@ -175,6 +175,7 @@ source "drivers/net/ethernet/pensando/Kc
source "drivers/net/ethernet/qlogic/Kconfig" source "drivers/net/ethernet/qlogic/Kconfig"
source "drivers/net/ethernet/brocade/Kconfig" source "drivers/net/ethernet/brocade/Kconfig"
source "drivers/net/ethernet/qualcomm/Kconfig" source "drivers/net/ethernet/qualcomm/Kconfig"
@ -10,7 +10,7 @@
source "drivers/net/ethernet/renesas/Kconfig" source "drivers/net/ethernet/renesas/Kconfig"
--- a/drivers/net/ethernet/Makefile --- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_NET_VENDOR_PACKET_ENGINES) @@ -78,6 +78,7 @@ obj-$(CONFIG_NET_VENDOR_PACKET_ENGINES)
obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
obj-$(CONFIG_NET_VENDOR_QUALCOMM) += qualcomm/ obj-$(CONFIG_NET_VENDOR_QUALCOMM) += qualcomm/

View file

@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/arch/mips/kernel/setup.c --- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c
@@ -706,7 +706,6 @@ static void __init arch_mem_init(char ** @@ -698,7 +698,6 @@ static void __init arch_mem_init(char **
mips_reserve_vmcore(); mips_reserve_vmcore();
mips_parse_crashkernel(); mips_parse_crashkernel();
@ -18,7 +18,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/* /*
* In order to reduce the possibility of kernel panic when failed to * In order to reduce the possibility of kernel panic when failed to
@@ -842,6 +841,7 @@ void __init setup_arch(char **cmdline_p) @@ -828,6 +827,7 @@ void __init setup_arch(char **cmdline_p)
cpu_cache_init(); cpu_cache_init();
paging_init(); paging_init();

View file

@ -41,7 +41,7 @@ Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
--- a/arch/mips/include/asm/mips-cps.h --- a/arch/mips/include/asm/mips-cps.h
+++ b/arch/mips/include/asm/mips-cps.h +++ b/arch/mips/include/asm/mips-cps.h
@@ -11,6 +11,8 @@ @@ -12,6 +12,8 @@
#include <linux/io.h> #include <linux/io.h>
#include <linux/types.h> #include <linux/types.h>
@ -50,7 +50,7 @@ Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
extern unsigned long __cps_access_bad_size(void) extern unsigned long __cps_access_bad_size(void)
__compiletime_error("Bad size for CPS accessor"); __compiletime_error("Bad size for CPS accessor");
@@ -165,6 +167,10 @@ static inline unsigned int mips_cps_numc @@ -166,6 +168,10 @@ static inline unsigned int mips_cps_numc
if (!mips_cm_present()) if (!mips_cm_present())
return 0; return 0;

View file

@ -1,6 +1,6 @@
--- a/arch/mips/ralink/irq-gic.c --- a/arch/mips/ralink/irq-gic.c
+++ b/arch/mips/ralink/irq-gic.c +++ b/arch/mips/ralink/irq-gic.c
@@ -13,6 +13,12 @@ @@ -14,6 +14,12 @@
int get_c0_perfcount_int(void) int get_c0_perfcount_int(void)
{ {

View file

@ -37,7 +37,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
depends on MTD_NAND_ECC_MEDIATEK depends on MTD_NAND_ECC_MEDIATEK
--- a/drivers/mtd/nand/raw/Makefile --- a/drivers/mtd/nand/raw/Makefile
+++ b/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_MTD_NAND_SUNXI) += sunxi_n @@ -47,6 +47,7 @@ obj-$(CONFIG_MTD_NAND_SUNXI) += sunxi_n
obj-$(CONFIG_MTD_NAND_HISI504) += hisi504_nand.o obj-$(CONFIG_MTD_NAND_HISI504) += hisi504_nand.o
obj-$(CONFIG_MTD_NAND_BRCMNAND) += brcmnand/ obj-$(CONFIG_MTD_NAND_BRCMNAND) += brcmnand/
obj-$(CONFIG_MTD_NAND_QCOM) += qcom_nandc.o obj-$(CONFIG_MTD_NAND_QCOM) += qcom_nandc.o

View file

@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/net/phy/phy_device.c --- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c
@@ -1075,7 +1075,7 @@ static void phy_link_change(struct phy_d @@ -295,7 +295,7 @@ static void phy_link_change(struct phy_d
if (up) if (up)
netif_carrier_on(netdev); netif_carrier_on(netdev);
@ -21,7 +21,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
if (phydev->mii_ts && phydev->mii_ts->link_state) if (phydev->mii_ts && phydev->mii_ts->link_state)
--- a/include/linux/phy.h --- a/include/linux/phy.h
+++ b/include/linux/phy.h +++ b/include/linux/phy.h
@@ -661,6 +661,7 @@ struct phy_device { @@ -675,6 +675,7 @@ struct phy_device {
unsigned downshifted_rate:1; unsigned downshifted_rate:1;
unsigned is_on_sfp_module:1; unsigned is_on_sfp_module:1;
unsigned mac_managed_pm:1; unsigned mac_managed_pm:1;

View file

@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/gpio/Kconfig --- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig
@@ -509,6 +509,14 @@ config GPIO_PXA @@ -555,6 +555,14 @@ config GPIO_PXA
help help
Say yes here to support the PXA GPIO device. Say yes here to support the PXA GPIO device.
@ -32,7 +32,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
depends on ARCH_RENESAS || COMPILE_TEST depends on ARCH_RENESAS || COMPILE_TEST
--- a/drivers/gpio/Makefile --- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile
@@ -130,6 +130,7 @@ obj-$(CONFIG_GPIO_PISOSR) += gpio-pisos @@ -135,6 +135,7 @@ obj-$(CONFIG_GPIO_PISOSR) += gpio-pisos
obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o
obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o

View file

@ -14,7 +14,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
--- a/drivers/dma/Kconfig --- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig
@@ -532,6 +532,12 @@ config PLX_DMA @@ -564,6 +564,12 @@ config PLX_DMA
These are exposed via extra functions on the switch's These are exposed via extra functions on the switch's
upstream port. Each function exposes one DMA channel. upstream port. Each function exposes one DMA channel.
@ -29,7 +29,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
depends on ARCH_U8500 depends on ARCH_U8500
--- a/drivers/dma/Makefile --- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile +++ b/drivers/dma/Makefile
@@ -64,6 +64,7 @@ obj-$(CONFIG_PL330_DMA) += pl330.o @@ -69,6 +69,7 @@ obj-$(CONFIG_PL330_DMA) += pl330.o
obj-$(CONFIG_PLX_DMA) += plx_dma.o obj-$(CONFIG_PLX_DMA) += plx_dma.o
obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/ obj-$(CONFIG_PPC_BESTCOMM) += bestcomm/
obj-$(CONFIG_PXA_DMA) += pxa_dma.o obj-$(CONFIG_PXA_DMA) += pxa_dma.o

View file

@ -62,7 +62,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
#define MT76X8_GPIO_MODE_WDT 14 #define MT76X8_GPIO_MODE_WDT 14
#define MT76X8_GPIO_MODE_SPI 12 #define MT76X8_GPIO_MODE_SPI 12
#define MT76X8_GPIO_MODE_SDMODE 10 #define MT76X8_GPIO_MODE_SDMODE 10
@@ -74,6 +78,12 @@ static struct mtmips_pmx_func refclk_grp @@ -68,6 +72,12 @@ static struct mtmips_pmx_func refclk_grp
static struct mtmips_pmx_func perst_grp[] = { FUNC("perst", 0, 36, 1) }; static struct mtmips_pmx_func perst_grp[] = { FUNC("perst", 0, 36, 1) };
static struct mtmips_pmx_func wdt_grp[] = { FUNC("wdt", 0, 38, 1) }; static struct mtmips_pmx_func wdt_grp[] = { FUNC("wdt", 0, 38, 1) };
static struct mtmips_pmx_func spi_grp[] = { FUNC("spi", 0, 7, 4) }; static struct mtmips_pmx_func spi_grp[] = { FUNC("spi", 0, 7, 4) };
@ -74,8 +74,8 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+static struct mtmips_pmx_func esd_grp[] = { FUNC("iot", 0, 47, 1) }; +static struct mtmips_pmx_func esd_grp[] = { FUNC("iot", 0, 47, 1) };
static struct mtmips_pmx_func sd_mode_grp[] = { static struct mtmips_pmx_func sd_mode_grp[] = {
FUNC("jtag", 3, 22, 8), FUNC("sdxc jtag", 3, 22, 8),
@@ -216,6 +226,7 @@ static struct mtmips_pmx_group mt76x8_pi @@ -182,6 +192,7 @@ static struct mtmips_pmx_group mt76x8_pi
GRP("perst", perst_grp, 1, MT76X8_GPIO_MODE_PERST), GRP("perst", perst_grp, 1, MT76X8_GPIO_MODE_PERST),
GRP("wdt", wdt_grp, 1, MT76X8_GPIO_MODE_WDT), GRP("wdt", wdt_grp, 1, MT76X8_GPIO_MODE_WDT),
GRP("spi", spi_grp, 1, MT76X8_GPIO_MODE_SPI), GRP("spi", spi_grp, 1, MT76X8_GPIO_MODE_SPI),
@ -83,7 +83,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
GRP_G("sdmode", sd_mode_grp, MT76X8_GPIO_MODE_MASK, GRP_G("sdmode", sd_mode_grp, MT76X8_GPIO_MODE_MASK,
1, MT76X8_GPIO_MODE_SDMODE), 1, MT76X8_GPIO_MODE_SDMODE),
GRP_G("uart0", uart0_grp, MT76X8_GPIO_MODE_MASK, GRP_G("uart0", uart0_grp, MT76X8_GPIO_MODE_MASK,
@@ -257,7 +268,18 @@ static struct mtmips_pmx_group mt76x8_pi @@ -223,7 +234,18 @@ static struct mtmips_pmx_group mt76x8_pi
static int mt76x8_pinctrl_probe(struct platform_device *pdev) static int mt76x8_pinctrl_probe(struct platform_device *pdev)
{ {

View file

@ -25,7 +25,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/mmc/host/Kconfig --- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig
@@ -1059,6 +1059,8 @@ config MMC_OWL @@ -1089,6 +1089,8 @@ config MMC_OWL
config MMC_SDHCI_EXTERNAL_DMA config MMC_SDHCI_EXTERNAL_DMA
bool bool

View file

@ -9,7 +9,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
--- a/drivers/mmc/host/mtk-sd.c --- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c
@@ -75,8 +75,12 @@ @@ -74,8 +74,12 @@
#define MSDC_PATCH_BIT 0xb0 #define MSDC_PATCH_BIT 0xb0
#define MSDC_PATCH_BIT1 0xb4 #define MSDC_PATCH_BIT1 0xb4
#define MSDC_PATCH_BIT2 0xb8 #define MSDC_PATCH_BIT2 0xb8
@ -22,7 +22,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
#define PAD_DS_TUNE 0x188 #define PAD_DS_TUNE 0x188
#define PAD_CMD_TUNE 0x18c #define PAD_CMD_TUNE 0x18c
#define EMMC51_CFG0 0x204 #define EMMC51_CFG0 0x204
@@ -402,6 +406,7 @@ struct mtk_mmc_compatible { @@ -407,6 +411,7 @@ struct mtk_mmc_compatible {
bool enhance_rx; bool enhance_rx;
bool support_64g; bool support_64g;
bool use_internal_cd; bool use_internal_cd;
@ -30,7 +30,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
}; };
struct msdc_tune_para { struct msdc_tune_para {
@@ -539,6 +544,7 @@ static const struct mtk_mmc_compatible m @@ -545,6 +550,7 @@ static const struct mtk_mmc_compatible m
.stop_clk_fix = false, .stop_clk_fix = false,
.enhance_rx = false, .enhance_rx = false,
.use_internal_cd = true, .use_internal_cd = true,
@ -38,7 +38,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
}; };
static const struct mtk_mmc_compatible mt7622_compat = { static const struct mtk_mmc_compatible mt7622_compat = {
@@ -1731,9 +1737,11 @@ static void msdc_init_hw(struct msdc_hos @@ -1738,9 +1744,11 @@ static void msdc_init_hw(struct msdc_hos
} }
writel(0, host->base + MSDC_IOCON); writel(0, host->base + MSDC_IOCON);
sdr_set_field(host->base + MSDC_IOCON, MSDC_IOCON_DDLSEL, 0); sdr_set_field(host->base + MSDC_IOCON, MSDC_IOCON_DDLSEL, 0);
@ -53,7 +53,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
sdr_set_bits(host->base + EMMC50_CFG0, EMMC50_CFG_CFCSTS_SEL); sdr_set_bits(host->base + EMMC50_CFG0, EMMC50_CFG_CFCSTS_SEL);
if (host->dev_comp->stop_clk_fix) { if (host->dev_comp->stop_clk_fix) {
@@ -1797,6 +1805,18 @@ static void msdc_init_hw(struct msdc_hos @@ -1814,6 +1822,18 @@ static void msdc_init_hw(struct msdc_hos
MSDC_PAD_TUNE_RXDLYSEL); MSDC_PAD_TUNE_RXDLYSEL);
} }

View file

@ -19,7 +19,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/sound/soc/Kconfig --- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig +++ b/sound/soc/Kconfig
@@ -99,6 +99,7 @@ source "sound/soc/mxs/Kconfig" @@ -107,6 +107,7 @@ source "sound/soc/mxs/Kconfig"
source "sound/soc/pxa/Kconfig" source "sound/soc/pxa/Kconfig"
source "sound/soc/qcom/Kconfig" source "sound/soc/qcom/Kconfig"
source "sound/soc/rockchip/Kconfig" source "sound/soc/rockchip/Kconfig"
@ -29,7 +29,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
source "sound/soc/sof/Kconfig" source "sound/soc/sof/Kconfig"
--- a/sound/soc/Makefile --- a/sound/soc/Makefile
+++ b/sound/soc/Makefile +++ b/sound/soc/Makefile
@@ -56,6 +56,7 @@ obj-$(CONFIG_SND_SOC) += kirkwood/ @@ -60,6 +60,7 @@ obj-$(CONFIG_SND_SOC) += kirkwood/
obj-$(CONFIG_SND_SOC) += pxa/ obj-$(CONFIG_SND_SOC) += pxa/
obj-$(CONFIG_SND_SOC) += qcom/ obj-$(CONFIG_SND_SOC) += qcom/
obj-$(CONFIG_SND_SOC) += rockchip/ obj-$(CONFIG_SND_SOC) += rockchip/

View file

@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/tty/serial/serial_core.c --- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c
@@ -482,6 +482,9 @@ uart_get_baud_rate(struct uart_port *por @@ -503,6 +503,9 @@ uart_get_baud_rate(struct uart_port *por
break; break;
} }

View file

@ -27,7 +27,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/drivers/input/keyboard/Kconfig --- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig +++ b/drivers/input/keyboard/Kconfig
@@ -616,6 +616,17 @@ config KEYBOARD_SUNKBD @@ -604,6 +604,17 @@ config KEYBOARD_SUNKBD
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called sunkbd. module will be called sunkbd.
@ -47,7 +47,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
depends on ARCH_SHMOBILE || COMPILE_TEST depends on ARCH_SHMOBILE || COMPILE_TEST
--- a/drivers/input/keyboard/Makefile --- a/drivers/input/keyboard/Makefile
+++ b/drivers/input/keyboard/Makefile +++ b/drivers/input/keyboard/Makefile
@@ -66,6 +66,7 @@ obj-$(CONFIG_KEYBOARD_STOWAWAY) += stow @@ -65,6 +65,7 @@ obj-$(CONFIG_KEYBOARD_STOWAWAY) += stow
obj-$(CONFIG_KEYBOARD_ST_KEYSCAN) += st-keyscan.o obj-$(CONFIG_KEYBOARD_ST_KEYSCAN) += st-keyscan.o
obj-$(CONFIG_KEYBOARD_SUN4I_LRADC) += sun4i-lradc-keys.o obj-$(CONFIG_KEYBOARD_SUN4I_LRADC) += sun4i-lradc-keys.o
obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o obj-$(CONFIG_KEYBOARD_SUNKBD) += sunkbd.o