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>

diff --git a/target/linux/ramips/patches-6.12/200-add-ralink-eth.patch b/target/linux/ramips/patches-6.12/200-add-ralink-eth.patch
index c52c12526b4ce101f475852d044aeac05498804b..da1c5aaa5e55d8df8eec9ce529a53cc86ada6db5 100644 (file)
--- a/target/linux/ramips/patches-6.12/200-add-ralink-eth.patch
+++ b/target/linux/ramips/patches-6.12/200-add-ralink-eth.patch
@@ -1,6 +1,6 @@
 --- a/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/brocade/Kconfig"
  source "drivers/net/ethernet/qualcomm/Kconfig"
@@ -10,7 +10,7 @@
  source "drivers/net/ethernet/renesas/Kconfig"
 --- a/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_QLOGIC) += qlogic/
  obj-$(CONFIG_NET_VENDOR_QUALCOMM) += qualcomm/

diff --git a/target/linux/ramips/patches-6.12/315-owrt-hack-fix-mt7688-cache-issue.patch b/target/linux/ramips/patches-6.12/315-owrt-hack-fix-mt7688-cache-issue.patch
index 2bb3d55d709213768f3c3b330f7f2262376431b1..4bf5f6c33af4f6b2b123d0ed9a7feb55b8d49551 100644 (file)
--- a/target/linux/ramips/patches-6.12/315-owrt-hack-fix-mt7688-cache-issue.patch
+++ b/target/linux/ramips/patches-6.12/315-owrt-hack-fix-mt7688-cache-issue.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/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_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
-@@ -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();
        paging_init();

diff --git a/target/linux/ramips/patches-6.12/320-MIPS-add-support-for-buggy-MT7621S-core-detection.patch b/target/linux/ramips/patches-6.12/320-MIPS-add-support-for-buggy-MT7621S-core-detection.patch
index 50329953cf4a39853a716c37f26391886d2c01bc..b1580c4e901f33c55a85afc0a55453fb08a40dbb 100644 (file)
--- a/target/linux/ramips/patches-6.12/320-MIPS-add-support-for-buggy-MT7621S-core-detection.patch
+++ b/target/linux/ramips/patches-6.12/320-MIPS-add-support-for-buggy-MT7621S-core-detection.patch
@@ -41,7 +41,7 @@ Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
 
 --- a/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/types.h>
  
@@ -50,7 +50,7 @@ Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
  extern unsigned long __cps_access_bad_size(void)
        __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())
                return 0;
  

diff --git a/target/linux/ramips/patches-6.12/324-mt7621-perfctr-fix.patch b/target/linux/ramips/patches-6.12/324-mt7621-perfctr-fix.patch
index dfeac7eb993dcd1796dd1ff5847456e482f8e2a0..0aa18840771c4c77f19e20b32c681054dcc5fd6b 100644 (file)
--- a/target/linux/ramips/patches-6.12/324-mt7621-perfctr-fix.patch
+++ b/target/linux/ramips/patches-6.12/324-mt7621-perfctr-fix.patch
@@ -1,6 +1,6 @@
 --- a/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)
  {

diff --git a/target/linux/ramips/patches-6.12/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch b/target/linux/ramips/patches-6.12/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch
index f87edd3e6737b0c54b761f9be1868622a8a79841..0183199348df11a56d92b3ead3d24bc314540fdb 100644 (file)
--- a/target/linux/ramips/patches-6.12/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch
+++ b/target/linux/ramips/patches-6.12/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch
@@ -37,7 +37,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
        depends on MTD_NAND_ECC_MEDIATEK
 --- a/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_BRCMNAND)               += brcmnand/
  obj-$(CONFIG_MTD_NAND_QCOM)           += qcom_nandc.o

diff --git a/target/linux/ramips/patches-6.12/720-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-6.12/720-NET-no-auto-carrier-off-support.patch
index 58e7ff37253e4a0ef2b9d28a5a9d2f0f7563909d..68c68883328257b027679ddc72ab1167521a030b 100644 (file)
--- a/target/linux/ramips/patches-6.12/720-NET-no-auto-carrier-off-support.patch
+++ b/target/linux/ramips/patches-6.12/720-NET-no-auto-carrier-off-support.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/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)
                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)
 --- a/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 is_on_sfp_module:1;
        unsigned mac_managed_pm:1;

diff --git a/target/linux/ramips/patches-6.12/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-6.12/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
index 23c9ce32d069ab95aaf0ac5b41cc3cc02a180472..ed0de092546c30b64154e8a1c31c961953efe97f 100644 (file)
--- a/target/linux/ramips/patches-6.12/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
+++ b/target/linux/ramips/patches-6.12/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
@@ -15,7 +15,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -509,6 +509,14 @@ config GPIO_PXA
+@@ -555,6 +555,14 @@ config GPIO_PXA
        help
          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
 --- a/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_PMIC_EIC_SPRD)      += gpio-pmic-eic-sprd.o
  obj-$(CONFIG_GPIO_PXA)                        += gpio-pxa.o

diff --git a/target/linux/ramips/patches-6.12/804-dma-ralink-add-back-gdma-driver.patch b/target/linux/ramips/patches-6.12/804-dma-ralink-add-back-gdma-driver.patch
index 3d2bdbaf4030775e29c1a83c2d9adbc9568e04c6..4f39000a5efa5e5db8192d133c830be52a7f0f1a 100644 (file)
--- a/target/linux/ramips/patches-6.12/804-dma-ralink-add-back-gdma-driver.patch
+++ b/target/linux/ramips/patches-6.12/804-dma-ralink-add-back-gdma-driver.patch
@@ -14,7 +14,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
 
 --- a/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
          upstream port. Each function exposes one DMA channel.
  
@@ -29,7 +29,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
        depends on ARCH_U8500
 --- a/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_PPC_BESTCOMM) += bestcomm/
  obj-$(CONFIG_PXA_DMA) += pxa_dma.o

diff --git a/target/linux/ramips/patches-6.12/809-pinctrl-mtmips-allow-mux-SDXC-pins-for-mt76x8.patch b/target/linux/ramips/patches-6.12/809-pinctrl-mtmips-allow-mux-SDXC-pins-for-mt76x8.patch
index 69dcd7fb2c82c763a49c6b0046afeb61f8b9810e..17add6054eb66c0b9bf83915785f1f1be5b8462a 100644 (file)
--- a/target/linux/ramips/patches-6.12/809-pinctrl-mtmips-allow-mux-SDXC-pins-for-mt76x8.patch
+++ b/target/linux/ramips/patches-6.12/809-pinctrl-mtmips-allow-mux-SDXC-pins-for-mt76x8.patch
@@ -62,7 +62,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
  #define MT76X8_GPIO_MODE_WDT          14
  #define MT76X8_GPIO_MODE_SPI          12
  #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 wdt_grp[] = { FUNC("wdt", 0, 38, 1) };
  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 sd_mode_grp[] = {
-       FUNC("jtag", 3, 22, 8),
-@@ -216,6 +226,7 @@ static struct mtmips_pmx_group mt76x8_pi
+       FUNC("sdxc jtag", 3, 22, 8),
+@@ -182,6 +192,7 @@ static struct mtmips_pmx_group mt76x8_pi
        GRP("perst", perst_grp, 1, MT76X8_GPIO_MODE_PERST),
        GRP("wdt", wdt_grp, 1, MT76X8_GPIO_MODE_WDT),
        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,
                                1, MT76X8_GPIO_MODE_SDMODE),
        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)
  {

diff --git a/target/linux/ramips/patches-6.12/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch b/target/linux/ramips/patches-6.12/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index c19b0606a1ad66aa28b0c2b55ef9c43c2a4499b1..42620e610574bf00d739f89d601c9b74938571da 100644 (file)
--- a/target/linux/ramips/patches-6.12/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++ b/target/linux/ramips/patches-6.12/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -25,7 +25,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/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
        bool
  

diff --git a/target/linux/ramips/patches-6.12/831-mmc-mtk-sd-initialize-pad-delay-and-drive-strength.patch b/target/linux/ramips/patches-6.12/831-mmc-mtk-sd-initialize-pad-delay-and-drive-strength.patch
index 7fd7b3af43d28a6b693cfc6997cc79567c449471..85159019b61fa25b3fc0dcddf5800c5eea84f8c6 100644 (file)
--- a/target/linux/ramips/patches-6.12/831-mmc-mtk-sd-initialize-pad-delay-and-drive-strength.patch
+++ b/target/linux/ramips/patches-6.12/831-mmc-mtk-sd-initialize-pad-delay-and-drive-strength.patch
@@ -9,7 +9,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
 
 --- a/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_BIT1  0xb4
  #define MSDC_PATCH_BIT2  0xb8
@@ -22,7 +22,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
  #define PAD_DS_TUNE      0x188
  #define PAD_CMD_TUNE     0x18c
  #define EMMC51_CFG0    0x204
-@@ -402,6 +406,7 @@ struct mtk_mmc_compatible {
+@@ -407,6 +411,7 @@ struct mtk_mmc_compatible {
        bool enhance_rx;
        bool support_64g;
        bool use_internal_cd;
@@ -30,7 +30,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
  };
  
  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,
        .enhance_rx = false,
        .use_internal_cd = true,
@@ -38,7 +38,7 @@ Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
  };
  
  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);
        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);
  
        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);
        }
  

diff --git a/target/linux/ramips/patches-6.12/835-asoc-add-mt7620-support.patch b/target/linux/ramips/patches-6.12/835-asoc-add-mt7620-support.patch
index e53725d43579e7de60a922bb7fb4e20279fa2296..d4027c904ad3f8a6425d0778587afab1a97a33e4 100644 (file)
--- a/target/linux/ramips/patches-6.12/835-asoc-add-mt7620-support.patch
+++ b/target/linux/ramips/patches-6.12/835-asoc-add-mt7620-support.patch
@@ -19,7 +19,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/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/qcom/Kconfig"
  source "sound/soc/rockchip/Kconfig"
@@ -29,7 +29,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  source "sound/soc/sof/Kconfig"
 --- a/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) += qcom/
  obj-$(CONFIG_SND_SOC) += rockchip/

diff --git a/target/linux/ramips/patches-6.12/840-serial-add-ugly-custom-baud-rate-hack.patch b/target/linux/ramips/patches-6.12/840-serial-add-ugly-custom-baud-rate-hack.patch
index 663a9bfe7dc5a473054c4339311fe1b27a9d1c10..df360b380f027c63c7ca7340fef4cb061da4fcb9 100644 (file)
--- a/target/linux/ramips/patches-6.12/840-serial-add-ugly-custom-baud-rate-hack.patch
+++ b/target/linux/ramips/patches-6.12/840-serial-add-ugly-custom-baud-rate-hack.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/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;
        }
  

diff --git a/target/linux/ramips/patches-6.12/870-Input-sx951x-add-Semtech-SX9512-SX9513-driver.patch b/target/linux/ramips/patches-6.12/870-Input-sx951x-add-Semtech-SX9512-SX9513-driver.patch
index 9b724e9d5266feaad597a4783d31fe4abcc266bd..8c2f9074b55ffa488901277153f0f0386593039a 100644 (file)
--- a/target/linux/ramips/patches-6.12/870-Input-sx951x-add-Semtech-SX9512-SX9513-driver.patch
+++ b/target/linux/ramips/patches-6.12/870-Input-sx951x-add-Semtech-SX9512-SX9513-driver.patch
@@ -27,7 +27,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/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
          module will be called sunkbd.
  
@@ -47,7 +47,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
        depends on ARCH_SHMOBILE || COMPILE_TEST
 --- a/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_SUN4I_LRADC)    += sun4i-lradc-keys.o
  obj-$(CONFIG_KEYBOARD_SUNKBD)         += sunkbd.o