ramips: 6.6: refresh patches

Refresh kernel patches.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>

diff --git a/target/linux/ramips/patches-6.6/300-mt7620-export-chip-version-and-pkg.patch b/target/linux/ramips/patches-6.6/300-mt7620-export-chip-version-and-pkg.patch
index 4f4fe9018a1cec6512c91792946d7e4b29ad3e4e..6b80acec98fb10ea1a7e909cc3b7829d89cade35 100644 (file)
--- a/target/linux/ramips/patches-6.6/300-mt7620-export-chip-version-and-pkg.patch
+++ b/target/linux/ramips/patches-6.6/300-mt7620-export-chip-version-and-pkg.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/include/asm/mach-ralink/mt7620.h
 +++ b/arch/mips/include/asm/mach-ralink/mt7620.h
 --- a/arch/mips/include/asm/mach-ralink/mt7620.h
 +++ b/arch/mips/include/asm/mach-ralink/mt7620.h

-@@ -61,4 +61,16 @@ static inline int mt7620_get_eco(void)
+@@ -62,4 +62,16 @@ static inline int mt7620_get_eco(void)

        return rt_sysc_r32(SYSC_REG_CHIP_REV) & CHIP_REV_ECO_MASK;
  }
  
        return rt_sysc_r32(SYSC_REG_CHIP_REV) & CHIP_REV_ECO_MASK;
  }
  

diff --git a/target/linux/ramips/patches-6.6/314-MIPS-add-bootargs-override-property.patch b/target/linux/ramips/patches-6.6/314-MIPS-add-bootargs-override-property.patch
index 26a28167c637a134a35da44b97d3e479ceb8b29f..f9975986fe6c8c7ece29f724ab2ec9076337849a 100644 (file)
--- a/target/linux/ramips/patches-6.6/314-MIPS-add-bootargs-override-property.patch
+++ b/target/linux/ramips/patches-6.6/314-MIPS-add-bootargs-override-property.patch
@@ -17,7 +17,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/arch/mips/kernel/setup.c
 +++ b/arch/mips/kernel/setup.c
 
 --- a/arch/mips/kernel/setup.c
 +++ b/arch/mips/kernel/setup.c

-@@ -557,8 +557,28 @@ static int __init bootcmdline_scan_chose
+@@ -563,8 +563,28 @@ static int __init bootcmdline_scan_chose

  
  #endif /* CONFIG_OF_EARLY_FLATTREE */
  
  
  #endif /* CONFIG_OF_EARLY_FLATTREE */
  


@@ -46,7 +46,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
        bool dt_bootargs = false;
  
        /*
        bool dt_bootargs = false;
  
        /*

-@@ -572,6 +592,14 @@ static void __init bootcmdline_init(void
+@@ -578,6 +598,14 @@ static void __init bootcmdline_init(void

        }
  
        /*
        }
  
        /*

diff --git a/target/linux/ramips/patches-6.6/315-owrt-hack-fix-mt7688-cache-issue.patch b/target/linux/ramips/patches-6.6/315-owrt-hack-fix-mt7688-cache-issue.patch
index c31e6d7cde28f96a9de06a191d05fe061ba49206..04f0a67325d35a80e319486c927bd41b38be8417 100644 (file)
--- a/target/linux/ramips/patches-6.6/315-owrt-hack-fix-mt7688-cache-issue.patch
+++ b/target/linux/ramips/patches-6.6/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
 
 --- a/arch/mips/kernel/setup.c
 +++ b/arch/mips/kernel/setup.c

-@@ -699,7 +699,6 @@ static void __init arch_mem_init(char **
+@@ -705,7 +705,6 @@ static void __init arch_mem_init(char **

        mips_reserve_vmcore();
  
        mips_parse_crashkernel();
        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
  
        /*
         * In order to reduce the possibility of kernel panic when failed to

-@@ -834,6 +833,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -841,6 +840,7 @@ void __init setup_arch(char **cmdline_p)

  
        cpu_cache_init();
        paging_init();
  
        cpu_cache_init();
        paging_init();

diff --git a/target/linux/ramips/patches-6.6/400-mtd-cfi-cmdset-0002-force-word-write.patch b/target/linux/ramips/patches-6.6/400-mtd-cfi-cmdset-0002-force-word-write.patch
index 7011bbe50b2d4ab441da2420a7c4cc4987aac15b..a1b861e412537da1469ea8b7d47245792e5333c6 100644 (file)
--- a/target/linux/ramips/patches-6.6/400-mtd-cfi-cmdset-0002-force-word-write.patch
+++ b/target/linux/ramips/patches-6.6/400-mtd-cfi-cmdset-0002-force-word-write.patch
@@ -9,7 +9,7 @@ Subject: [PATCH 37/53] mtd: cfi cmdset 0002 force word write
 
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
 
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c

-@@ -40,7 +40,7 @@
+@@ -38,7 +38,7 @@

  #include <linux/mtd/xip.h>
  
  #define AMD_BOOTLOC_BUG
  #include <linux/mtd/xip.h>
  
  #define AMD_BOOTLOC_BUG

diff --git a/target/linux/ramips/patches-6.6/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch b/target/linux/ramips/patches-6.6/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
index 3b88f7860288424ba99ac80cc86483bef33d030d..0e68aa590712bab9c232b86692ab80e8a44d875a 100644 (file)
--- a/target/linux/ramips/patches-6.6/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
+++ b/target/linux/ramips/patches-6.6/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch
@@ -55,7 +55,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 +};
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c
 +};
 --- a/drivers/mtd/spi-nor/core.c
 +++ b/drivers/mtd/spi-nor/core.c

-@@ -1620,6 +1620,7 @@ int spi_nor_sr2_bit7_quad_enable(struct
+@@ -2001,6 +2001,7 @@ int spi_nor_sr2_bit7_quad_enable(struct

  
  static const struct spi_nor_manufacturer *manufacturers[] = {
        &spi_nor_atmel,
  
  static const struct spi_nor_manufacturer *manufacturers[] = {
        &spi_nor_atmel,


@@ -65,7 +65,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
        &spi_nor_esmt,
 --- a/drivers/mtd/spi-nor/core.h
 +++ b/drivers/mtd/spi-nor/core.h
        &spi_nor_esmt,
 --- a/drivers/mtd/spi-nor/core.h
 +++ b/drivers/mtd/spi-nor/core.h

-@@ -617,6 +617,7 @@ struct sfdp {
+@@ -631,6 +631,7 @@ struct sfdp {

  
  /* Manufacturer drivers. */
  extern const struct spi_nor_manufacturer spi_nor_atmel;
  
  /* Manufacturer drivers. */
  extern const struct spi_nor_manufacturer spi_nor_atmel;

diff --git a/target/linux/ramips/patches-6.6/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch b/target/linux/ramips/patches-6.6/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch
index 438cc1ea8fe83072f864d93f32e16fab61790caf..51f1a5ec5e6332d2d9a462ea8ce7a392821488fe 100644 (file)
--- a/target/linux/ramips/patches-6.6/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch
+++ b/target/linux/ramips/patches-6.6/410-mtd-rawnand-add-driver-support-for-MT7621-nand-flash.patch
@@ -20,7 +20,7 @@ Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
 
 --- a/drivers/mtd/nand/raw/Kconfig
 +++ b/drivers/mtd/nand/raw/Kconfig
 
 --- a/drivers/mtd/nand/raw/Kconfig
 +++ b/drivers/mtd/nand/raw/Kconfig

-@@ -352,6 +352,14 @@ config MTD_NAND_QCOM
+@@ -338,6 +338,14 @@ config MTD_NAND_QCOM

          Enables support for NAND flash chips on SoCs containing the EBI2 NAND
          controller. This controller is found on IPQ806x SoC.
  
          Enables support for NAND flash chips on SoCs containing the EBI2 NAND
          controller. This controller is found on IPQ806x SoC.
  


@@ -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
        depends on MTD_NAND_ECC_MEDIATEK
 --- a/drivers/mtd/nand/raw/Makefile
 +++ b/drivers/mtd/nand/raw/Makefile

-@@ -48,6 +48,7 @@ obj-$(CONFIG_MTD_NAND_SUNXI)         += sunxi_n
+@@ -46,6 +46,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
  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.6/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-6.6/700-net-ethernet-mediatek-support-net-labels.patch
index a6e2aa04ca305389c6a2381b234ec0904b762dec..0a7f7785dbcaf98c8bf24b5694553db4298ad006 100644 (file)
--- a/target/linux/ramips/patches-6.6/700-net-ethernet-mediatek-support-net-labels.patch
+++ b/target/linux/ramips/patches-6.6/700-net-ethernet-mediatek-support-net-labels.patch
@@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c

-@@ -4643,6 +4643,7 @@ static const struct net_device_ops mtk_n
+@@ -4662,6 +4662,7 @@ static const struct net_device_ops mtk_n

  
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
  {
  
  static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
  {


@@ -22,9 +22,9 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
        const __be32 *_id = of_get_property(np, "reg", NULL);
        struct device_node *pcs_np;
        phy_interface_t phy_mode;
        const __be32 *_id = of_get_property(np, "reg", NULL);
        struct device_node *pcs_np;
        phy_interface_t phy_mode;

-@@ -4840,6 +4841,9 @@ static int mtk_add_mac(struct mtk_eth *e
-               register_netdevice_notifier(&mac->device_notifier);
-       }
+@@ -4875,6 +4876,9 @@ static int mtk_add_mac(struct mtk_eth *e
+                                               NETDEV_XDP_ACT_NDO_XMIT |
+                                               NETDEV_XDP_ACT_NDO_XMIT_SG;

  
 +      if (name)
 +              strlcpy(eth->netdev[id]->name, name, IFNAMSIZ);
  
 +      if (name)
 +              strlcpy(eth->netdev[id]->name, name, IFNAMSIZ);

diff --git a/target/linux/ramips/patches-6.6/720-Revert-net-phy-simplify-phy_link_change-arguments.patch b/target/linux/ramips/patches-6.6/720-Revert-net-phy-simplify-phy_link_change-arguments.patch
index 91159f2c6347deac70189398dc5b39b4c2c8fb68..f45544369dcf986aa1ae829e9ecc2958482eacf3 100644 (file)
--- a/target/linux/ramips/patches-6.6/720-Revert-net-phy-simplify-phy_link_change-arguments.patch
+++ b/target/linux/ramips/patches-6.6/720-Revert-net-phy-simplify-phy_link_change-arguments.patch
@@ -16,7 +16,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
 
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
 
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c

-@@ -71,13 +71,13 @@ static void phy_process_state_change(str
+@@ -72,13 +72,13 @@ static void phy_process_state_change(str

  
  static void phy_link_up(struct phy_device *phydev)
  {
  
  static void phy_link_up(struct phy_device *phydev)
  {


@@ -31,9 +31,9 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
 -      phydev->phy_link_change(phydev, false);
 +      phydev->phy_link_change(phydev, false, do_carrier);
        phy_led_trigger_change_speed(phydev);
 -      phydev->phy_link_change(phydev, false);
 +      phydev->phy_link_change(phydev, false, do_carrier);
        phy_led_trigger_change_speed(phydev);

+       WRITE_ONCE(phydev->link_down_events, phydev->link_down_events + 1);

  }
  }

- 
-@@ -595,7 +595,7 @@ int phy_start_cable_test(struct phy_devi
+@@ -823,7 +823,7 @@ int phy_start_cable_test(struct phy_devi

                goto out;
  
        /* Mark the carrier down until the test is complete */
                goto out;
  
        /* Mark the carrier down until the test is complete */


@@ -42,7 +42,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
  
        netif_testing_on(dev);
        err = phydev->drv->cable_test_start(phydev);
  
        netif_testing_on(dev);
        err = phydev->drv->cable_test_start(phydev);

-@@ -666,7 +666,7 @@ int phy_start_cable_test_tdr(struct phy_
+@@ -894,7 +894,7 @@ int phy_start_cable_test_tdr(struct phy_

                goto out;
  
        /* Mark the carrier down until the test is complete */
                goto out;
  
        /* Mark the carrier down until the test is complete */


@@ -51,7 +51,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
  
        netif_testing_on(dev);
        err = phydev->drv->cable_test_tdr_start(phydev, config);
  
        netif_testing_on(dev);
        err = phydev->drv->cable_test_tdr_start(phydev, config);

-@@ -738,7 +738,7 @@ static int phy_check_link_status(struct
+@@ -966,7 +966,7 @@ static int phy_check_link_status(struct

                phy_link_up(phydev);
        } else if (!phydev->link && phydev->state != PHY_NOLINK) {
                phydev->state = PHY_NOLINK;
                phy_link_up(phydev);
        } else if (!phydev->link && phydev->state != PHY_NOLINK) {
                phydev->state = PHY_NOLINK;


@@ -60,8 +60,8 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
        }
  
        return 0;
        }
  
        return 0;

-@@ -1224,7 +1224,7 @@ void phy_state_machine(struct work_struc
-       case PHY_HALTED:
+@@ -1485,7 +1485,7 @@ void phy_state_machine(struct work_struc
+       case PHY_ERROR:

                if (phydev->link) {
                        phydev->link = 0;
 -                      phy_link_down(phydev);
                if (phydev->link) {
                        phydev->link = 0;
 -                      phy_link_down(phydev);


@@ -71,7 +71,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
                break;
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
                break;
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c

-@@ -1037,14 +1037,16 @@ struct phy_device *phy_find_first(struct
+@@ -1069,14 +1069,16 @@ struct phy_device *phy_find_first(struct

  }
  EXPORT_SYMBOL(phy_find_first);
  
  }
  EXPORT_SYMBOL(phy_find_first);
  


@@ -95,7 +95,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
                phydev->mii_ts->link_state(phydev->mii_ts, phydev);
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c
                phydev->mii_ts->link_state(phydev->mii_ts, phydev);
 --- a/drivers/net/phy/phylink.c
 +++ b/drivers/net/phy/phylink.c

-@@ -1687,7 +1687,8 @@ bool phylink_expects_phy(struct phylink
+@@ -1724,7 +1724,8 @@ bool phylink_expects_phy(struct phylink

  }
  EXPORT_SYMBOL_GPL(phylink_expects_phy);
  
  }
  EXPORT_SYMBOL_GPL(phylink_expects_phy);
  


@@ -107,9 +107,9 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
        bool tx_pause, rx_pause;
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
        bool tx_pause, rx_pause;
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h

-@@ -739,7 +739,7 @@ struct phy_device {
+@@ -758,7 +758,7 @@ struct phy_device {

  
  

-       int pma_extable;
+       unsigned int link_down_events;

  
 -      void (*phy_link_change)(struct phy_device *phydev, bool up);
 +      void (*phy_link_change)(struct phy_device *, bool up, bool do_carrier);
  
 -      void (*phy_link_change)(struct phy_device *phydev, bool up);
 +      void (*phy_link_change)(struct phy_device *, bool up, bool do_carrier);

diff --git a/target/linux/ramips/patches-6.6/721-NET-no-auto-carrier-off-support.patch b/target/linux/ramips/patches-6.6/721-NET-no-auto-carrier-off-support.patch
index 2594c66048fe2e20dcae0f6c68b63c15c40994fa..e594ead86ff66fa71167c81d16389209124c1eee 100644 (file)
--- a/target/linux/ramips/patches-6.6/721-NET-no-auto-carrier-off-support.patch
+++ b/target/linux/ramips/patches-6.6/721-NET-no-auto-carrier-off-support.patch
@@ -11,7 +11,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c
 
 --- a/drivers/net/phy/phy.c
 +++ b/drivers/net/phy/phy.c

-@@ -738,7 +738,10 @@ static int phy_check_link_status(struct
+@@ -966,7 +966,10 @@ static int phy_check_link_status(struct

                phy_link_up(phydev);
        } else if (!phydev->link && phydev->state != PHY_NOLINK) {
                phydev->state = PHY_NOLINK;
                phy_link_up(phydev);
        } else if (!phydev->link && phydev->state != PHY_NOLINK) {
                phydev->state = PHY_NOLINK;


@@ -23,8 +23,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        }
  
        return 0;
        }
  
        return 0;

-@@ -1224,7 +1227,10 @@ void phy_state_machine(struct work_struc
-       case PHY_HALTED:
+@@ -1485,7 +1488,10 @@ void phy_state_machine(struct work_struc
+       case PHY_ERROR:

                if (phydev->link) {
                        phydev->link = 0;
 -                      phy_link_down(phydev, true);
                if (phydev->link) {
                        phydev->link = 0;
 -                      phy_link_down(phydev, true);


@@ -37,11 +37,11 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
                break;
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
                break;
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h

-@@ -647,6 +647,7 @@ struct phy_device {
+@@ -659,6 +659,7 @@ struct phy_device {

        unsigned downshifted_rate:1;
        unsigned is_on_sfp_module:1;
        unsigned mac_managed_pm:1;
 +      unsigned no_auto_carrier_off:1;
        unsigned downshifted_rate:1;
        unsigned is_on_sfp_module:1;
        unsigned mac_managed_pm:1;
 +      unsigned no_auto_carrier_off:1;

+       unsigned wol_enabled:1;

  
        unsigned autoneg:1;
  
        unsigned autoneg:1;

-       /* The most recently read link state */

diff --git a/target/linux/ramips/patches-6.6/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch b/target/linux/ramips/patches-6.6/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
index ff60b33cd42d808a0ef02d27dd6c4352a45ef635..75a7374054ae6f9b2fc930d6676a13fd65bccaa4 100644 (file)
--- a/target/linux/ramips/patches-6.6/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
+++ b/target/linux/ramips/patches-6.6/802-GPIO-MIPS-ralink-add-gpio-driver-for-ralink-SoC.patch
@@ -47,7 +47,7 @@ Cc: linux-gpio@vger.kernel.org
 +#endif /* __ASM_MACH_RALINK_GPIO_H */
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
 +#endif /* __ASM_MACH_RALINK_GPIO_H */
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig

-@@ -585,6 +585,12 @@ config GPIO_SNPS_CREG
+@@ -594,6 +594,12 @@ config GPIO_SNPS_CREG

          where only several fields in register belong to GPIO lines and
          each GPIO line owns a field with different length and on/off value.
  
          where only several fields in register belong to GPIO lines and
          each GPIO line owns a field with different length and on/off value.
  


@@ -62,7 +62,7 @@ Cc: linux-gpio@vger.kernel.org
        depends on PLAT_SPEAR
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
        depends on PLAT_SPEAR
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile

-@@ -122,6 +122,7 @@ obj-$(CONFIG_GPIO_PISOSR)          += gpio-pisos
+@@ -130,6 +130,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
  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


@@ -84,7 +84,7 @@ Cc: linux-gpio@vger.kernel.org
 +
 +#include <linux/module.h>
 +#include <linux/io.h>
 +
 +#include <linux/module.h>
 +#include <linux/io.h>

-+#include <linux/gpio.h>
++#include <linux/gpio/driver.h>

 +#include <linux/spinlock.h>
 +#include <linux/platform_device.h>
 +#include <linux/of_irq.h>
 +#include <linux/spinlock.h>
 +#include <linux/platform_device.h>
 +#include <linux/of_irq.h>


@@ -373,7 +373,7 @@ Cc: linux-gpio@vger.kernel.org
 +
 +      rg->chip.parent = &pdev->dev;
 +      rg->chip.label = dev_name(&pdev->dev);
 +
 +      rg->chip.parent = &pdev->dev;
 +      rg->chip.label = dev_name(&pdev->dev);

-+      rg->chip.of_node = np;
++      rg->chip.fwnode = of_node_to_fwnode(np);

 +      rg->chip.ngpio = be32_to_cpu(*ngpio);
 +      rg->chip.direction_input = ralink_gpio_direction_input;
 +      rg->chip.direction_output = ralink_gpio_direction_output;
 +      rg->chip.ngpio = be32_to_cpu(*ngpio);
 +      rg->chip.direction_input = ralink_gpio_direction_input;
 +      rg->chip.direction_output = ralink_gpio_direction_output;

diff --git a/target/linux/ramips/patches-6.6/808-pinctrl-mtmips-support-requesting-different-function.patch b/target/linux/ramips/patches-6.6/808-pinctrl-mtmips-support-requesting-different-function.patch
index 047808f1e6904d10ed41505ecafa3bca4298c4fb..e5b03507aa03ad2c41fe63d3a8f881b6bf31fcad 100644 (file)
--- a/target/linux/ramips/patches-6.6/808-pinctrl-mtmips-support-requesting-different-function.patch
+++ b/target/linux/ramips/patches-6.6/808-pinctrl-mtmips-support-requesting-different-function.patch
@@ -9,12 +9,12 @@ the group function flag when requesting a different function.
 
 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
 ---
 
 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
 ---

- drivers/pinctrl/ralink/pinctrl-ralink.c | 21 +++++++++++++++++----
+ drivers/pinctrl/mediatek/pinctrl-mtmips.c | 21 +++++++++++++++++----

  1 file changed, 17 insertions(+), 4 deletions(-)
 
  1 file changed, 17 insertions(+), 4 deletions(-)
 

---- a/drivers/pinctrl/ralink/pinctrl-ralink.c
-+++ b/drivers/pinctrl/ralink/pinctrl-ralink.c
-@@ -123,11 +123,24 @@ static int ralink_pmx_group_enable(struc
+--- a/drivers/pinctrl/mediatek/pinctrl-mtmips.c
++++ b/drivers/pinctrl/mediatek/pinctrl-mtmips.c
+@@ -123,11 +123,24 @@ static int mtmips_pmx_group_enable(struc

        int i;
        int shift;
  
        int i;
        int shift;
  

diff --git a/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch
index d48b668484fb3a8a1e4b1781831c6068d59dd090..80d5ec3b4afdfb1fcb255f54718b86985529c15f 100644 (file)
--- a/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch
+++ b/target/linux/ramips/patches-6.6/810-uvc-add-iPassion-iP2970-support.patch
@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c
 
 --- a/drivers/media/usb/uvc/uvc_driver.c
 +++ b/drivers/media/usb/uvc/uvc_driver.c

-@@ -2981,6 +2981,18 @@ static const struct usb_device_id uvc_id
+@@ -3120,6 +3120,18 @@ static const struct usb_device_id uvc_id

          .bInterfaceSubClass   = 1,
          .bInterfaceProtocol   = 0,
          .driver_info          = UVC_INFO_META(V4L2_META_FMT_D4XX) },
          .bInterfaceSubClass   = 1,
          .bInterfaceProtocol   = 0,
          .driver_info          = UVC_INFO_META(V4L2_META_FMT_D4XX) },


@@ -34,15 +34,15 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
 --- a/drivers/media/usb/uvc/uvc_status.c
 +++ b/drivers/media/usb/uvc/uvc_status.c
        { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, UVC_PC_PROTOCOL_15) },
 --- a/drivers/media/usb/uvc/uvc_status.c
 +++ b/drivers/media/usb/uvc/uvc_status.c

-@@ -223,6 +223,7 @@ static void uvc_status_complete(struct u
-                       if (uvc_event_control(urb, status, len))
+@@ -228,6 +228,7 @@ static void uvc_status_complete(struct u
+                       if (uvc_event_control(urb, dev->status, len))

                                /* The URB will be resubmitted in work context. */
                                return;
 +                      dev->motion = 1;
                        break;
                }
  
                                /* The URB will be resubmitted in work context. */
                                return;
 +                      dev->motion = 1;
                        break;
                }
  

-@@ -271,6 +272,7 @@ int uvc_status_init(struct uvc_device *d
+@@ -273,6 +274,7 @@ int uvc_status_init(struct uvc_device *d

        }
  
        pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress);
        }
  
        pipe = usb_rcvintpipe(dev->udev, ep->desc.bEndpointAddress);


@@ -64,7 +64,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  #include <media/v4l2-common.h>
  
  
  #include <media/v4l2-common.h>
  

-@@ -1231,9 +1236,149 @@ static void uvc_video_decode_data(struct
+@@ -1235,9 +1240,149 @@ static void uvc_video_decode_data(struct

        uvc_urb->async_operations++;
  }
  
        uvc_urb->async_operations++;
  }
  


@@ -214,7 +214,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        /* Mark the buffer as done if the EOF marker is set. */
        if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
                uvc_dbg(stream->dev, FRAME, "Frame complete (EOF found)\n");
        /* Mark the buffer as done if the EOF marker is set. */
        if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) {
                uvc_dbg(stream->dev, FRAME, "Frame complete (EOF found)\n");

-@@ -1815,6 +1960,8 @@ static int uvc_init_video_isoc(struct uv
+@@ -1819,6 +1964,8 @@ static int uvc_init_video_isoc(struct uv

        if (npackets == 0)
                return -ENOMEM;
  
        if (npackets == 0)
                return -ENOMEM;
  


@@ -225,7 +225,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        for_each_uvc_urb(uvc_urb, stream) {
 --- a/drivers/media/usb/uvc/uvcvideo.h
 +++ b/drivers/media/usb/uvc/uvcvideo.h
        for_each_uvc_urb(uvc_urb, stream) {
 --- a/drivers/media/usb/uvc/uvcvideo.h
 +++ b/drivers/media/usb/uvc/uvcvideo.h

-@@ -75,6 +75,8 @@
+@@ -73,6 +73,8 @@

  #define UVC_QUIRK_FORCE_Y8            0x00000800
  #define UVC_QUIRK_FORCE_BPP           0x00001000
  #define UVC_QUIRK_WAKE_AUTOSUSPEND    0x00002000
  #define UVC_QUIRK_FORCE_Y8            0x00000800
  #define UVC_QUIRK_FORCE_BPP           0x00001000
  #define UVC_QUIRK_WAKE_AUTOSUSPEND    0x00002000


@@ -234,8 +234,8 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  /* Format flags */
  #define UVC_FMT_FLAG_COMPRESSED               0x00000001
  
  /* Format flags */
  #define UVC_FMT_FLAG_COMPRESSED               0x00000001

-@@ -562,6 +564,7 @@ struct uvc_device {
-       u8 *status;
+@@ -582,6 +584,7 @@ struct uvc_device {
+ 

        struct input_dev *input;
        char input_phys[64];
 +      int motion;
        struct input_dev *input;
        char input_phys[64];
 +      int motion;

diff --git a/target/linux/ramips/patches-6.6/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch b/target/linux/ramips/patches-6.6/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch
index 9aaf86ffc715459491f303c4abbb5b650bcf8c58..6760d9f56cfcbc18afe5fc8ba7ef31b5304b3b40 100644 (file)
--- a/target/linux/ramips/patches-6.6/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch
+++ b/target/linux/ramips/patches-6.6/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch
@@ -16,7 +16,7 @@ Acked-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig
 
 --- a/drivers/spi/Kconfig
 +++ b/drivers/spi/Kconfig

-@@ -823,6 +823,12 @@ config SPI_QCOM_GENI
+@@ -895,6 +895,12 @@ config SPI_QCOM_GENI

          This driver can also be built as a module.  If so, the module
          will be called spi-geni-qcom.
  
          This driver can also be built as a module.  If so, the module
          will be called spi-geni-qcom.
  


@@ -26,19 +26,19 @@ Acked-by: John Crispin <blogic@openwrt.org>
 +      help
 +        This selects a driver for the Ralink RT288x/RT305x SPI Controller.
 +
 +      help
 +        This selects a driver for the Ralink RT288x/RT305x SPI Controller.
 +

- config SPI_S3C24XX
-       tristate "Samsung S3C24XX series SPI"
-       depends on ARCH_S3C24XX
+ config SPI_S3C64XX
+       tristate "Samsung S3C64XX/Exynos SoC series type SPI"
+       depends on (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST)

 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile
 --- a/drivers/spi/Makefile
 +++ b/drivers/spi/Makefile

-@@ -110,6 +110,7 @@ obj-$(CONFIG_SPI_RB4XX)                    += spi-rb4xx.o
+@@ -117,6 +117,7 @@ obj-$(CONFIG_SPI_RB4XX)                    += spi-rb4xx.o

  obj-$(CONFIG_MACH_REALTEK_RTL)                += spi-realtek-rtl.o
  obj-$(CONFIG_SPI_RPCIF)                       += spi-rpc-if.o
  obj-$(CONFIG_SPI_RSPI)                        += spi-rspi.o
 +obj-$(CONFIG_SPI_RT2880)              += spi-rt2880.o
  obj-$(CONFIG_MACH_REALTEK_RTL)                += spi-realtek-rtl.o
  obj-$(CONFIG_SPI_RPCIF)                       += spi-rpc-if.o
  obj-$(CONFIG_SPI_RSPI)                        += spi-rspi.o
 +obj-$(CONFIG_SPI_RT2880)              += spi-rt2880.o

- obj-$(CONFIG_SPI_S3C24XX)             += spi-s3c24xx-hw.o
- spi-s3c24xx-hw-y                      := spi-s3c24xx.o
+ obj-$(CONFIG_SPI_RZV2M_CSI)           += spi-rzv2m-csi.o

  obj-$(CONFIG_SPI_S3C64XX)             += spi-s3c64xx.o
  obj-$(CONFIG_SPI_S3C64XX)             += spi-s3c64xx.o

+ obj-$(CONFIG_SPI_SC18IS602)           += spi-sc18is602.o

 --- /dev/null
 +++ b/drivers/spi/spi-rt2880.c
 @@ -0,0 +1,535 @@
 --- /dev/null
 +++ b/drivers/spi/spi-rt2880.c
 @@ -0,0 +1,535 @@

diff --git a/target/linux/ramips/patches-6.6/825-i2c-MIPS-adds-ralink-I2C-driver.patch b/target/linux/ramips/patches-6.6/825-i2c-MIPS-adds-ralink-I2C-driver.patch
index 461cf6e222423c9d00deee073a0a7a2c54bb17cd..609ea7173592e77063d8fb80aecaaf7e24e1153b 100644 (file)
--- a/target/linux/ramips/patches-6.6/825-i2c-MIPS-adds-ralink-I2C-driver.patch
+++ b/target/linux/ramips/patches-6.6/825-i2c-MIPS-adds-ralink-I2C-driver.patch
@@ -45,7 +45,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +};
 --- a/drivers/i2c/busses/Kconfig
 +++ b/drivers/i2c/busses/Kconfig
 +};
 --- a/drivers/i2c/busses/Kconfig
 +++ b/drivers/i2c/busses/Kconfig

-@@ -998,6 +998,11 @@ config I2C_RK3X
+@@ -1021,6 +1021,11 @@ config I2C_RK3X

          This driver can also be built as a module. If so, the module will
          be called i2c-rk3x.
  
          This driver can also be built as a module. If so, the module will
          be called i2c-rk3x.
  


@@ -59,7 +59,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        depends on ARCH_RENESAS || COMPILE_TEST
 --- a/drivers/i2c/busses/Makefile
 +++ b/drivers/i2c/busses/Makefile
        depends on ARCH_RENESAS || COMPILE_TEST
 --- a/drivers/i2c/busses/Makefile
 +++ b/drivers/i2c/busses/Makefile

-@@ -95,6 +95,7 @@ obj-$(CONFIG_I2C_PCA_PLATFORM)       += i2c-pc
+@@ -96,6 +96,7 @@ obj-$(CONFIG_I2C_PCA_PLATFORM)       += i2c-pc

  obj-$(CONFIG_I2C_PNX)         += i2c-pnx.o
  obj-$(CONFIG_I2C_PXA)         += i2c-pxa.o
  obj-$(CONFIG_I2C_PXA_PCI)     += i2c-pxa-pci.o
  obj-$(CONFIG_I2C_PNX)         += i2c-pnx.o
  obj-$(CONFIG_I2C_PXA)         += i2c-pxa.o
  obj-$(CONFIG_I2C_PXA_PCI)     += i2c-pxa-pci.o

diff --git a/target/linux/ramips/patches-6.6/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch b/target/linux/ramips/patches-6.6/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index 37a10589a379a12c06881e36efedc2f1262a00ea..c19b0606a1ad66aa28b0c2b55ef9c43c2a4499b1 100644 (file)
--- a/target/linux/ramips/patches-6.6/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++ b/target/linux/ramips/patches-6.6/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
 
 --- a/drivers/mmc/host/Kconfig
 +++ b/drivers/mmc/host/Kconfig

-@@ -1102,6 +1102,8 @@ config MMC_OWL
+@@ -1059,6 +1059,8 @@ config MMC_OWL

  config MMC_SDHCI_EXTERNAL_DMA
        bool
  
  config MMC_SDHCI_EXTERNAL_DMA
        bool
  

diff --git a/target/linux/ramips/patches-6.6/835-asoc-add-mt7620-support.patch b/target/linux/ramips/patches-6.6/835-asoc-add-mt7620-support.patch
index 57f0ec2c506c29f9e5b89b9d2acbb2e4324b5a8e..2c40fba69412b911d52f6711d92cc72f60394a8a 100644 (file)
--- a/target/linux/ramips/patches-6.6/835-asoc-add-mt7620-support.patch
+++ b/target/linux/ramips/patches-6.6/835-asoc-add-mt7620-support.patch
@@ -20,7 +20,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/sound/soc/Kconfig
 +++ b/sound/soc/Kconfig
 
 --- a/sound/soc/Kconfig
 +++ b/sound/soc/Kconfig

-@@ -86,6 +86,7 @@ source "sound/soc/mxs/Kconfig"
+@@ -99,6 +99,7 @@ source "sound/soc/mxs/Kconfig"

  source "sound/soc/pxa/Kconfig"
  source "sound/soc/qcom/Kconfig"
  source "sound/soc/rockchip/Kconfig"
  source "sound/soc/pxa/Kconfig"
  source "sound/soc/qcom/Kconfig"
  source "sound/soc/rockchip/Kconfig"


@@ -30,7 +30,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  source "sound/soc/sof/Kconfig"
 --- a/sound/soc/Makefile
 +++ b/sound/soc/Makefile
  source "sound/soc/sof/Kconfig"
 --- a/sound/soc/Makefile
 +++ b/sound/soc/Makefile

-@@ -54,6 +54,7 @@ obj-$(CONFIG_SND_SOC)        += kirkwood/
+@@ -56,6 +56,7 @@ obj-$(CONFIG_SND_SOC)        += kirkwood/

  obj-$(CONFIG_SND_SOC) += pxa/
  obj-$(CONFIG_SND_SOC) += qcom/
  obj-$(CONFIG_SND_SOC) += rockchip/
  obj-$(CONFIG_SND_SOC) += pxa/
  obj-$(CONFIG_SND_SOC) += qcom/
  obj-$(CONFIG_SND_SOC) += rockchip/

diff --git a/target/linux/ramips/patches-6.6/840-serial-add-ugly-custom-baud-rate-hack.patch b/target/linux/ramips/patches-6.6/840-serial-add-ugly-custom-baud-rate-hack.patch
index 42a15a935c95671c09c49e7fb0e3d027e10e3eea..3d9028647092b5613761abbaa5dc194fc59db39f 100644 (file)
--- a/target/linux/ramips/patches-6.6/840-serial-add-ugly-custom-baud-rate-hack.patch
+++ b/target/linux/ramips/patches-6.6/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
 
 --- a/drivers/tty/serial/serial_core.c
 +++ b/drivers/tty/serial/serial_core.c

-@@ -445,6 +445,9 @@ uart_get_baud_rate(struct uart_port *por
+@@ -467,6 +467,9 @@ uart_get_baud_rate(struct uart_port *por

                break;
        }
  
                break;
        }
  

diff --git a/target/linux/ramips/patches-6.6/845-pwm-add-mediatek-support.patch b/target/linux/ramips/patches-6.6/845-pwm-add-mediatek-support.patch
index ab164f5ab83f4ab03b670467361f865045dd277f..67cc389fd5df9a4f8d414a47e18d6aa2b17b1371 100644 (file)
--- a/target/linux/ramips/patches-6.6/845-pwm-add-mediatek-support.patch
+++ b/target/linux/ramips/patches-6.6/845-pwm-add-mediatek-support.patch
@@ -13,9 +13,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 
 --- a/drivers/pwm/Kconfig
 +++ b/drivers/pwm/Kconfig
 
 --- a/drivers/pwm/Kconfig
 +++ b/drivers/pwm/Kconfig

-@@ -393,6 +393,15 @@ config PWM_MEDIATEK
+@@ -415,6 +415,15 @@ config PWM_MICROCHIP_CORE

          To compile this driver as a module, choose M here: the module
          To compile this driver as a module, choose M here: the module

-         will be called pwm-mediatek.
+         will be called pwm-microchip-core.

  
 +config PWM_MEDIATEK_RAMIPS
 +      tristate "Mediatek PWM support"
  
 +config PWM_MEDIATEK_RAMIPS
 +      tristate "Mediatek PWM support"


@@ -31,14 +31,14 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
        depends on ARCH_MXS || COMPILE_TEST
 --- a/drivers/pwm/Makefile
 +++ b/drivers/pwm/Makefile
        depends on ARCH_MXS || COMPILE_TEST
 --- a/drivers/pwm/Makefile
 +++ b/drivers/pwm/Makefile

-@@ -34,6 +34,7 @@ obj-$(CONFIG_PWM_LPSS_PCI)   += pwm-lpss-p
+@@ -35,6 +35,7 @@ obj-$(CONFIG_PWM_LPSS_PCI)   += pwm-lpss-p

  obj-$(CONFIG_PWM_LPSS_PLATFORM)       += pwm-lpss-platform.o
  obj-$(CONFIG_PWM_MESON)               += pwm-meson.o
  obj-$(CONFIG_PWM_MEDIATEK)    += pwm-mediatek.o
 +obj-$(CONFIG_PWM_MEDIATEK_RAMIPS)     += pwm-mediatek-ramips.o
  obj-$(CONFIG_PWM_LPSS_PLATFORM)       += pwm-lpss-platform.o
  obj-$(CONFIG_PWM_MESON)               += pwm-meson.o
  obj-$(CONFIG_PWM_MEDIATEK)    += pwm-mediatek.o
 +obj-$(CONFIG_PWM_MEDIATEK_RAMIPS)     += pwm-mediatek-ramips.o

+ obj-$(CONFIG_PWM_MICROCHIP_CORE)      += pwm-microchip-core.o

  obj-$(CONFIG_PWM_MTK_DISP)    += pwm-mtk-disp.o
  obj-$(CONFIG_PWM_MXS)         += pwm-mxs.o
  obj-$(CONFIG_PWM_MTK_DISP)    += pwm-mtk-disp.o
  obj-$(CONFIG_PWM_MXS)         += pwm-mxs.o

- obj-$(CONFIG_PWM_NTXEC)               += pwm-ntxec.o

 --- /dev/null
 +++ b/drivers/pwm/pwm-mediatek-ramips.c
 @@ -0,0 +1,197 @@
 --- /dev/null
 +++ b/drivers/pwm/pwm-mediatek-ramips.c
 @@ -0,0 +1,197 @@

diff --git a/target/linux/ramips/patches-6.6/850-awake-rt305x-dwc2-controller.patch b/target/linux/ramips/patches-6.6/850-awake-rt305x-dwc2-controller.patch
index 01ce44d70007aaba7ef1305b45a6b3eb11614492..a08056d8d9328f78690b22240f34ecd482d7f8dd 100644 (file)
--- a/target/linux/ramips/patches-6.6/850-awake-rt305x-dwc2-controller.patch
+++ b/target/linux/ramips/patches-6.6/850-awake-rt305x-dwc2-controller.patch
@@ -1,6 +1,6 @@
 --- a/drivers/usb/dwc2/platform.c
 +++ b/drivers/usb/dwc2/platform.c
 --- a/drivers/usb/dwc2/platform.c
 +++ b/drivers/usb/dwc2/platform.c

-@@ -462,6 +462,12 @@ static int dwc2_driver_probe(struct plat
+@@ -493,6 +493,12 @@ static int dwc2_driver_probe(struct plat

        if (retval)
                return retval;
  
        if (retval)
                return retval;
  

diff --git a/target/linux/ramips/patches-6.6/855-linkit_bootstrap.patch b/target/linux/ramips/patches-6.6/855-linkit_bootstrap.patch
index cd81601a72901de3fa2c48aeb5383d4e7a9f190c..16eaf619a037cda1831cddd8c2fc2bc68b9bc99d 100644 (file)
--- a/target/linux/ramips/patches-6.6/855-linkit_bootstrap.patch
+++ b/target/linux/ramips/patches-6.6/855-linkit_bootstrap.patch
@@ -1,6 +1,6 @@
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile
 --- a/drivers/misc/Makefile
 +++ b/drivers/misc/Makefile

-@@ -50,6 +50,7 @@ obj-$(CONFIG_ECHO)           += echo/
+@@ -52,6 +52,7 @@ obj-$(CONFIG_ECHO)           += echo/

  obj-$(CONFIG_CXL_BASE)                += cxl/
  obj-$(CONFIG_DW_XDATA_PCIE)   += dw-xdata-pcie.o
  obj-$(CONFIG_PCI_ENDPOINT_TEST)       += pci_endpoint_test.o
  obj-$(CONFIG_CXL_BASE)                += cxl/
  obj-$(CONFIG_DW_XDATA_PCIE)   += dw-xdata-pcie.o
  obj-$(CONFIG_PCI_ENDPOINT_TEST)       += pci_endpoint_test.o

diff --git a/target/linux/ramips/patches-6.6/860-ramips-add-eip93-driver.patch b/target/linux/ramips/patches-6.6/860-ramips-add-eip93-driver.patch
index 275b81e715967d8fb0421f060d2ba90170f9c3db..5d0b3104b16385fb967361abaa8033a4c1fca5ff 100644 (file)
--- a/target/linux/ramips/patches-6.6/860-ramips-add-eip93-driver.patch
+++ b/target/linux/ramips/patches-6.6/860-ramips-add-eip93-driver.patch
@@ -3260,17 +3260,17 @@
 +#endif
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig
 +#endif
 --- a/drivers/crypto/Kconfig
 +++ b/drivers/crypto/Kconfig

-@@ -824,4 +824,6 @@ config CRYPTO_DEV_SA2UL
- source "drivers/crypto/keembay/Kconfig"
+@@ -797,4 +797,6 @@ config CRYPTO_DEV_SA2UL

  source "drivers/crypto/aspeed/Kconfig"
  source "drivers/crypto/aspeed/Kconfig"

+ source "drivers/crypto/starfive/Kconfig"

  
 +source "drivers/crypto/mtk-eip93/Kconfig"
 +
  endif # CRYPTO_HW
 --- a/drivers/crypto/Makefile
 +++ b/drivers/crypto/Makefile
  
 +source "drivers/crypto/mtk-eip93/Kconfig"
 +
  endif # CRYPTO_HW
 --- a/drivers/crypto/Makefile
 +++ b/drivers/crypto/Makefile

-@@ -53,3 +53,4 @@ obj-y += xilinx/
- obj-y += hisilicon/
+@@ -51,3 +51,4 @@ obj-y += hisilicon/

  obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) += amlogic/
  obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) += amlogic/

- obj-y += keembay/
+ obj-y += intel/
+ obj-y += starfive/

 +obj-$(CONFIG_CRYPTO_DEV_EIP93) += mtk-eip93/
 +obj-$(CONFIG_CRYPTO_DEV_EIP93) += mtk-eip93/