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 c52c12526b4ce1..da1c5aaa5e55d8 100644 --- 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/314-MIPS-add-bootargs-override-property.patch b/target/linux/ramips/patches-6.12/314-MIPS-add-bootargs-override-property.patch index ac3f3b7aba6436..fa03d3a14b95ff 100644 --- a/target/linux/ramips/patches-6.12/314-MIPS-add-bootargs-override-property.patch +++ b/target/linux/ramips/patches-6.12/314-MIPS-add-bootargs-override-property.patch @@ -17,7 +17,7 @@ Signed-off-by: David Bauer --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c -@@ -564,8 +564,28 @@ static int __init bootcmdline_scan_chose +@@ -556,8 +556,28 @@ static int __init bootcmdline_scan_chose #endif /* CONFIG_OF_EARLY_FLATTREE */ @@ -33,7 +33,7 @@ Signed-off-by: David Bauer + + p = of_get_flat_dt_prop(node, "bootargs-override", &l); + if (p != NULL && l > 0) { -+ strlcpy(boot_command_line, p, COMMAND_LINE_SIZE); ++ strscpy(boot_command_line, p, COMMAND_LINE_SIZE); + *dt_bootargs = true; + } + @@ -46,7 +46,7 @@ Signed-off-by: David Bauer bool dt_bootargs = false; /* -@@ -579,6 +599,14 @@ static void __init bootcmdline_init(void +@@ -571,6 +591,14 @@ static void __init bootcmdline_init(void } /* 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 2bb3d55d709213..4bf5f6c33af4f6 100644 --- 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 --- 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 /* * 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 ef54835f89c2a3..6f0598e6372563 100644 --- 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 @@ -31,7 +31,7 @@ Signed-off-by: Thomas Bogendoerfer --- 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 #include @@ -40,7 +40,7 @@ Signed-off-by: Thomas Bogendoerfer extern unsigned long __cps_access_bad_size(void) __compiletime_error("Bad size for CPS accessor"); -@@ -162,12 +164,31 @@ static inline uint64_t mips_cps_cluster_ +@@ -163,12 +165,31 @@ static inline uint64_t mips_cps_cluster_ */ static inline unsigned int mips_cps_numcores(unsigned int cluster) { 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 dfeac7eb993dcd..0aa18840771c4c 100644 --- 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/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch b/target/linux/ramips/patches-6.12/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch index 0e68aa590712ba..2d780878be72b0 100644 --- a/target/linux/ramips/patches-6.12/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch +++ b/target/linux/ramips/patches-6.12/405-mtd-spi-nor-Add-support-for-BoHong-bh25q128as.patch @@ -26,12 +26,12 @@ Signed-off-by: David Bauer spi-nor-objs := core.o sfdp.o swp.o otp.o sysfs.o spi-nor-objs += atmel.o +spi-nor-objs += bohong.o - spi-nor-objs += catalyst.o spi-nor-objs += eon.o spi-nor-objs += esmt.o + spi-nor-objs += everspin.o --- /dev/null +++ b/drivers/mtd/spi-nor/bohong.c -@@ -0,0 +1,21 @@ +@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2005, Intec Automation Inc. @@ -44,8 +44,12 @@ Signed-off-by: David Bauer + +static const struct flash_info bohong_parts[] = { + /* BoHong Microelectronics */ -+ { "bh25q128as", INFO(0x684018, 0, 64 * 1024, 256) -+ NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { ++ .id = SNOR_ID(0x68, 0x40, 0x18), ++ .name = "bh25q128s", ++ .size = SZ_16M, ++ .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, ++ }, +}; + +const struct spi_nor_manufacturer spi_nor_bohong = { @@ -55,21 +59,21 @@ Signed-off-by: David Bauer +}; --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -2001,6 +2001,7 @@ int spi_nor_sr2_bit7_quad_enable(struct +@@ -1966,6 +1966,7 @@ int spi_nor_sr2_bit7_quad_enable(struct static const struct spi_nor_manufacturer *manufacturers[] = { &spi_nor_atmel, + &spi_nor_bohong, - &spi_nor_catalyst, &spi_nor_eon, &spi_nor_esmt, + &spi_nor_everspin, --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h -@@ -631,6 +631,7 @@ struct sfdp { +@@ -580,6 +580,7 @@ struct sfdp { /* Manufacturer drivers. */ extern const struct spi_nor_manufacturer spi_nor_atmel; +extern const struct spi_nor_manufacturer spi_nor_bohong; - extern const struct spi_nor_manufacturer spi_nor_catalyst; extern const struct spi_nor_manufacturer spi_nor_eon; extern const struct spi_nor_manufacturer spi_nor_esmt; + extern const struct spi_nor_manufacturer spi_nor_everspin; 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 f87edd3e6737b0..0183199348df11 100644 --- 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 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 58e7ff37253e4a..af9f256da102be 100644 --- 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 --- 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 +@@ -1107,7 +1107,7 @@ static void phy_link_change(struct phy_d if (up) netif_carrier_on(netdev); @@ -21,7 +21,7 @@ Signed-off-by: John Crispin 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 23c9ce32d069ab..ed0de092546c30 100644 --- 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 --- 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 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 3d2bdbaf403077..4f39000a5efa5e 100644 --- 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 --- 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 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/810-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-6.12/810-uvc-add-iPassion-iP2970-support.patch index 71adf6600f61ce..71173705be6112 100644 --- a/target/linux/ramips/patches-6.12/810-uvc-add-iPassion-iP2970-support.patch +++ b/target/linux/ramips/patches-6.12/810-uvc-add-iPassion-iP2970-support.patch @@ -13,7 +13,7 @@ Signed-off-by: John Crispin --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c -@@ -3183,6 +3183,18 @@ static const struct usb_device_id uvc_id +@@ -3072,6 +3072,18 @@ static const struct usb_device_id uvc_id .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = UVC_INFO_META(V4L2_META_FMT_D4XX) }, @@ -55,7 +55,7 @@ Signed-off-by: John Crispin @@ -19,6 +19,11 @@ #include #include - #include + #include +#include +#include +#include @@ -64,7 +64,7 @@ Signed-off-by: John Crispin #include -@@ -1275,9 +1280,149 @@ static void uvc_video_decode_data(struct +@@ -1298,9 +1303,149 @@ static void uvc_video_decode_data(struct uvc_urb->async_operations++; } @@ -214,7 +214,7 @@ Signed-off-by: John Crispin /* 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"); -@@ -1859,6 +2004,8 @@ static int uvc_init_video_isoc(struct uv +@@ -1882,6 +2027,8 @@ static int uvc_init_video_isoc(struct uv if (npackets == 0) return -ENOMEM; @@ -234,7 +234,7 @@ Signed-off-by: John Crispin /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 -@@ -585,6 +587,7 @@ struct uvc_device { +@@ -590,6 +592,7 @@ struct uvc_device { struct input_dev *input; char input_phys[64]; diff --git a/target/linux/ramips/patches-6.12/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch b/target/linux/ramips/patches-6.12/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch index f0d8c80fd5a6e0..61ef3c9a7a6357 100644 --- a/target/linux/ramips/patches-6.12/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch +++ b/target/linux/ramips/patches-6.12/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch @@ -16,7 +16,7 @@ Acked-by: John Crispin --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -895,6 +895,12 @@ config SPI_QCOM_GENI +@@ -923,6 +923,12 @@ config SPI_QCOM_GENI This driver can also be built as a module. If so, the module will be called spi-geni-qcom. @@ -31,7 +31,7 @@ Acked-by: John Crispin depends on (PLAT_SAMSUNG || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST) --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -117,6 +117,7 @@ obj-$(CONFIG_SPI_RB4XX) += spi-rb4xx.o +@@ -121,6 +121,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 @@ -168,7 +168,7 @@ Acked-by: John Crispin + SPI_CS_HIGH) + +struct rt2880_spi { -+ struct spi_master *master; ++ struct spi_controller *master; + void __iomem *base; + u32 speed; + u16 wait_loops; @@ -178,7 +178,7 @@ Acked-by: John Crispin + +static inline struct rt2880_spi *spidev_to_rt2880_spi(struct spi_device *spi) +{ -+ return spi_master_get_devdata(spi->master); ++ return spi_controller_get_devdata(spi->controller); +} + +static inline u32 rt2880_spi_read(struct rt2880_spi *rs, u32 reg) @@ -235,7 +235,7 @@ Acked-by: John Crispin + return prescale; +} + -+static u32 get_arbiter_offset(struct spi_master *master) ++static u32 get_arbiter_offset(struct spi_controller *master) +{ + u32 offset; + @@ -269,9 +269,9 @@ Acked-by: John Crispin + return -ETIMEDOUT; +} + -+static void rt2880_dump_reg(struct spi_master *master) ++static void rt2880_dump_reg(struct spi_controller *master) +{ -+ struct rt2880_spi *rs = spi_master_get_devdata(master); ++ struct rt2880_spi *rs = spi_controller_get_devdata(master); + + dev_dbg(&master->dev, "stat: %08x, cfg: %08x, ctl: %08x, " \ + "data: %08x, arb: %08x\n", @@ -282,10 +282,10 @@ Acked-by: John Crispin + rt2880_spi_read(rs, get_arbiter_offset(master))); +} + -+static int rt2880_spi_transfer_one(struct spi_master *master, ++static int rt2880_spi_transfer_one(struct spi_controller *master, + struct spi_device *spi, struct spi_transfer *xfer) +{ -+ struct rt2880_spi *rs = spi_master_get_devdata(master); ++ struct rt2880_spi *rs = spi_controller_get_devdata(master); + unsigned len; + const u8 *tx = xfer->tx_buf; + u8 *rx = xfer->rx_buf; @@ -332,8 +332,8 @@ Acked-by: John Crispin + +static int rt2880_spi_setup(struct spi_device *spi) +{ -+ struct spi_master *master = spi->master; -+ struct rt2880_spi *rs = spi_master_get_devdata(master); ++ struct spi_controller *master = spi->controller; ++ struct rt2880_spi *rs = spi_controller_get_devdata(master); + u32 reg, old_reg, arbit_off; + + if ((spi->max_speed_hz > master->max_speed_hz) || @@ -391,10 +391,10 @@ Acked-by: John Crispin + return 0; +} + -+static int rt2880_spi_prepare_message(struct spi_master *master, ++static int rt2880_spi_prepare_message(struct spi_controller *master, + struct spi_message *msg) +{ -+ struct rt2880_spi *rs = spi_master_get_devdata(master); ++ struct rt2880_spi *rs = spi_controller_get_devdata(master); + struct spi_device *spi = msg->spi; + u32 reg; + @@ -450,7 +450,7 @@ Acked-by: John Crispin +static int rt2880_spi_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; -+ struct spi_master *master; ++ struct spi_controller *master; + struct rt2880_spi *rs; + void __iomem *base; + struct clk *clk; @@ -475,13 +475,13 @@ Acked-by: John Crispin + master->bits_per_word_mask = SPI_BPW_MASK(8); + master->min_speed_hz = clk_get_rate(clk) / 128; + master->max_speed_hz = clk_get_rate(clk) / 2; -+ master->flags = SPI_MASTER_HALF_DUPLEX; ++ master->flags = SPI_CONTROLLER_HALF_DUPLEX; + master->setup = rt2880_spi_setup; + master->prepare_message = rt2880_spi_prepare_message; + master->set_cs = rt2880_spi_set_cs; + master->transfer_one = rt2880_spi_transfer_one, + -+ rs = spi_master_get_devdata(master); ++ rs = spi_controller_get_devdata(master); + rs->master = master; + rs->base = base; + rs->clk = clk; @@ -490,7 +490,7 @@ Acked-by: John Crispin + if (ret) + return ret; + -+ return devm_spi_register_master(dev, master); ++ return devm_spi_register_controller(dev, master); +} + +MODULE_ALIAS("platform:" DRIVER_NAME); diff --git a/target/linux/ramips/patches-6.12/825-i2c-MIPS-adds-ralink-I2C-driver.patch b/target/linux/ramips/patches-6.12/825-i2c-MIPS-adds-ralink-I2C-driver.patch index c8cfb784ce5b32..f56565e370d0db 100644 --- a/target/linux/ramips/patches-6.12/825-i2c-MIPS-adds-ralink-I2C-driver.patch +++ b/target/linux/ramips/patches-6.12/825-i2c-MIPS-adds-ralink-I2C-driver.patch @@ -45,7 +45,7 @@ Signed-off-by: John Crispin +}; --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -1021,6 +1021,11 @@ config I2C_RK3X +@@ -1060,6 +1060,11 @@ config 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 depends on ARCH_RENESAS || COMPILE_TEST --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile -@@ -96,6 +96,7 @@ obj-$(CONFIG_I2C_PCA_PLATFORM) += i2c-pc +@@ -98,6 +98,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 @@ -442,7 +442,7 @@ Signed-off-by: John Crispin + adap->dev.parent = dev; + i2c_set_adapdata(adap, i2c); + adap->dev.of_node = pdev->dev.of_node; -+ strlcpy(adap->name, dev_name(dev), sizeof(adap->name)); ++ strscpy(adap->name, dev_name(dev), sizeof(adap->name)); + adap->quirks = &rt_i2c_quirks; + + restart = rt_i2c_init(i2c); 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 c19b0606a1ad66..42620e610574bf 100644 --- 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 --- 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 1d5c6dcd40cc0a..483aab97448ad1 100644 --- 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 @@ -7,7 +7,7 @@ Signed-off-by: Shiji Yang --- 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 @@ -20,7 +20,7 @@ Signed-off-by: Shiji Yang #define PAD_DS_TUNE 0x188 #define PAD_CMD_TUNE 0x18c #define EMMC51_CFG0 0x204 -@@ -1795,6 +1799,16 @@ static void msdc_init_hw(struct msdc_hos +@@ -1812,6 +1816,16 @@ 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 4a7ad8f6fad380..e96ec26401e86c 100644 --- 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 --- 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 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/ @@ -59,7 +59,7 @@ Signed-off-by: John Crispin +obj-$(CONFIG_SND_RALINK_SOC_I2S) += snd-soc-ralink-i2s.o --- /dev/null +++ b/sound/soc/ralink/ralink-i2s.c -@@ -0,0 +1,941 @@ +@@ -0,0 +1,939 @@ +/* + * Copyright (C) 2010, Lars-Peter Clausen + * Copyright (C) 2016 Michael Lee @@ -978,13 +978,11 @@ Signed-off-by: John Crispin + return ralink_i2s_debugfs_create(i2s); +} + -+static int ralink_i2s_remove(struct platform_device *pdev) ++static void ralink_i2s_remove(struct platform_device *pdev) +{ + struct ralink_i2s *i2s = platform_get_drvdata(pdev); + + ralink_i2s_debugfs_remove(i2s); -+ -+ return 0; +} + +static struct platform_driver ralink_i2s_driver = { 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 663a9bfe7dc5a4..df360b380f027c 100644 --- 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 --- 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/845-pwm-add-mediatek-support.patch b/target/linux/ramips/patches-6.12/845-pwm-add-mediatek-support.patch index e7d11a04297cb8..0670617d49a995 100644 --- a/target/linux/ramips/patches-6.12/845-pwm-add-mediatek-support.patch +++ b/target/linux/ramips/patches-6.12/845-pwm-add-mediatek-support.patch @@ -13,7 +13,7 @@ Signed-off-by: John Crispin --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig -@@ -415,6 +415,15 @@ config PWM_MICROCHIP_CORE +@@ -452,6 +452,15 @@ config PWM_MICROCHIP_CORE To compile this driver as a module, choose M here: the module will be called pwm-microchip-core. @@ -31,7 +31,7 @@ Signed-off-by: John Crispin depends on ARCH_MXS || COMPILE_TEST --- a/drivers/pwm/Makefile +++ b/drivers/pwm/Makefile -@@ -35,6 +35,7 @@ obj-$(CONFIG_PWM_LPSS_PCI) += pwm-lpss-p +@@ -38,6 +38,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 @@ -41,7 +41,7 @@ Signed-off-by: John Crispin obj-$(CONFIG_PWM_MXS) += pwm-mxs.o --- /dev/null +++ b/drivers/pwm/pwm-mediatek-ramips.c -@@ -0,0 +1,187 @@ +@@ -0,0 +1,185 @@ +/* + * Mediatek Pulse Width Modulator driver + * @@ -197,15 +197,13 @@ Signed-off-by: John Crispin + return devm_pwmchip_add(&pdev->dev, &pc->chip); +} + -+static int mtk_pwm_remove(struct platform_device *pdev) ++static void mtk_pwm_remove(struct platform_device *pdev) +{ + struct mtk_pwm_chip *pc = platform_get_drvdata(pdev); + int i; + + for (i = 0; i < NUM_PWM; i++) + pwm_disable(&pc->chip.pwms[i]); -+ -+ return 0; +} + +static const struct of_device_id mtk_pwm_of_match[] = { diff --git a/target/linux/ramips/patches-6.12/860-ramips-add-eip93-driver.patch b/target/linux/ramips/patches-6.12/860-ramips-add-eip93-driver.patch index de7e37817c0a33..a276f4227732c6 100644 --- a/target/linux/ramips/patches-6.12/860-ramips-add-eip93-driver.patch +++ b/target/linux/ramips/patches-6.12/860-ramips-add-eip93-driver.patch @@ -2256,7 +2256,7 @@ +#endif /* _EIP93_DES_H_ */ --- /dev/null +++ b/drivers/crypto/mtk-eip93/eip93-main.c -@@ -0,0 +1,465 @@ +@@ -0,0 +1,463 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2019 - 2021 @@ -2689,15 +2689,13 @@ + return 0; +} + -+static int mtk_crypto_remove(struct platform_device *pdev) ++static void mtk_crypto_remove(struct platform_device *pdev) +{ + struct mtk_device *mtk = platform_get_drvdata(pdev); + + mtk_unregister_algs(ARRAY_SIZE(mtk_algs)); + mtk_cleanup(mtk); + dev_info(mtk->dev, "EIP93 removed.\n"); -+ -+ return 0; +} + +#if defined(CONFIG_OF) @@ -3258,7 +3256,7 @@ +#endif --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig -@@ -797,4 +797,6 @@ config CRYPTO_DEV_SA2UL +@@ -852,4 +852,6 @@ config CRYPTO_DEV_SA2UL source "drivers/crypto/aspeed/Kconfig" source "drivers/crypto/starfive/Kconfig" @@ -3267,7 +3265,7 @@ endif # CRYPTO_HW --- a/drivers/crypto/Makefile +++ b/drivers/crypto/Makefile -@@ -51,3 +51,4 @@ obj-y += hisilicon/ +@@ -52,3 +52,4 @@ obj-y += hisilicon/ obj-$(CONFIG_CRYPTO_DEV_AMLOGIC_GXL) += amlogic/ obj-y += intel/ obj-y += starfive/