ramips: 6.12: manually rebuilding patches

Manually rebuilding patches.

Signed-off-by: Mieczyslaw Nalewaj <[email protected]>

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/

target/linux/ramips/patches-6.12/314-MIPS-add-bootargs-override-property.patch

@@ -17,7 +17,7 @@ Signed-off-by: David Bauer <[email protected]>
 
 --- 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 <[email protected]>
 +
 +	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 <[email protected]>
  	bool dt_bootargs = false;
 
  	/*
-@@ -579,6 +599,14 @@ static void __init bootcmdline_init(void
+@@ -571,6 +591,14 @@ static void __init bootcmdline_init(void
  	}
 
  	/*

target/linux/ramips/patches-6.12/315-owrt-hack-fix-mt7688-cache-issue.patch

@@ -10,15 +10,15 @@ Signed-off-by: John Crispin <[email protected]>
 
 --- 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();
 -	device_tree_init();
 
  	/*
  	 * 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();

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 <[email protected]>
 
 --- 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>
 
@@ -40,7 +40,7 @@ Signed-off-by: Thomas Bogendoerfer <[email protected]>
  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)
  {

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)
  {

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 <[email protected]>
  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 <[email protected]>
 +
 +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 <[email protected]>
 +};
 --- 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;

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 <[email protected]>
  	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

target/linux/ramips/patches-6.12/720-NET-no-auto-carrier-off-support.patch

@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <[email protected]>
 
 --- 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 <[email protected]>
  	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;

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 <[email protected]>
 
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -594,6 +594,13 @@ config GPIO_SNPS_CREG
+@@ -653,6 +653,13 @@ 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.
 
@@ -31,7 +31,7 @@ Signed-off-by: John Crispin <[email protected]>
  	depends on PLAT_SPEAR
 --- 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

target/linux/ramips/patches-6.12/804-dma-ralink-add-back-gdma-driver.patch

@@ -14,7 +14,7 @@ Signed-off-by: Shiji Yang <[email protected]>
 
 --- 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 <[email protected]>
  	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

target/linux/ramips/patches-6.12/810-uvc-add-iPassion-iP2970-support.patch

@@ -13,7 +13,7 @@ Signed-off-by: John Crispin <[email protected]>
 
 --- 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 <[email protected]>
 @@ -19,6 +19,11 @@
  #include <linux/wait.h>
  #include <linux/atomic.h>
- #include <asm/unaligned.h>
+ #include <linux/unaligned.h>
 +#include <linux/skbuff.h>
 +#include <linux/kobject.h>
 +#include <linux/netlink.h>
@@ -64,7 +64,7 @@ Signed-off-by: John Crispin <[email protected]>
 
  #include <media/v4l2-common.h>
 
-@@ -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 <[email protected]>
  	/* 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 <[email protected]>
 
  /* 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];

target/linux/ramips/patches-6.12/821-SPI-ralink-add-Ralink-SoC-spi-driver.patch

@@ -16,7 +16,7 @@ Acked-by: John Crispin <[email protected]>
 
 --- 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 <[email protected]>
  	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 <[email protected]>
 +		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 <[email protected]>
 +
 +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 <[email protected]>
 +	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 <[email protected]>
 +	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 <[email protected]>
 +			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 <[email protected]>
 +
 +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 <[email protected]>
 +	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 <[email protected]>
 +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 <[email protected]>
 +	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 <[email protected]>
 +	if (ret)
 +		return ret;
 +
-+	return devm_spi_register_master(dev, master);
++	return devm_spi_register_controller(dev, master);
 +}
 +
 +MODULE_ALIAS("platform:" DRIVER_NAME);