bmips: 6.6: refresh kernel patches

refresh 6.6. kernel patches via 'make target/linux/refresh'

Signed-off-by: Goetz Goerisch <[email protected]>
[refresh patches]
Signed-off-by: Álvaro Fernández Rojas <[email protected]>

target/linux/bmips/patches-6.6/100-irqchip-add-support-for-bcm6345-style-external-inter.patch

@@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
 +};
 --- a/drivers/irqchip/Kconfig
 +++ b/drivers/irqchip/Kconfig
-@@ -109,6 +109,10 @@ config I8259
+@@ -111,6 +111,10 @@ config I8259
  	bool
  	select IRQ_DOMAIN
  
@@ -63,7 +63,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
  	select GENERIC_IRQ_CHIP
 --- a/drivers/irqchip/Makefile
 +++ b/drivers/irqchip/Makefile
-@@ -63,6 +63,7 @@ obj-$(CONFIG_XTENSA_MX)			+= irq-xtensa-
+@@ -62,6 +62,7 @@ obj-$(CONFIG_XTENSA_MX)			+= irq-xtensa-
  obj-$(CONFIG_XILINX_INTC)		+= irq-xilinx-intc.o
  obj-$(CONFIG_IRQ_CROSSBAR)		+= irq-crossbar.o
  obj-$(CONFIG_SOC_VF610)			+= irq-vf610-mscm-ir.o

target/linux/bmips/patches-6.6/200-mips-bmips-automatically-detect-CPU-frequency.patch

@@ -15,7 +15,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/arch/mips/bmips/setup.c
 +++ b/arch/mips/bmips/setup.c
-@@ -32,13 +32,52 @@
+@@ -31,13 +31,52 @@
  
  #define RELO_NORMAL_VEC		BIT(18)
  
@@ -68,7 +68,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  struct bmips_quirk {
  	const char		*compatible;
  	void			(*quirk_fn)(void);
-@@ -154,17 +193,161 @@ const char *get_system_type(void)
+@@ -153,17 +192,161 @@ const char *get_system_type(void)
  	return "Generic BMIPS kernel";
  }
  

target/linux/bmips/patches-6.6/201-mips-bmips-automatically-detect-RAM-size.patch

@@ -15,15 +15,15 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/arch/mips/bmips/setup.c
 +++ b/arch/mips/bmips/setup.c
-@@ -19,6 +19,7 @@
- #include <linux/of_platform.h>
+@@ -18,6 +18,7 @@
+ #include <linux/of_fdt.h>
  #include <linux/libfdt.h>
  #include <linux/smp.h>
 +#include <linux/types.h>
  #include <asm/addrspace.h>
  #include <asm/bmips.h>
  #include <asm/bootinfo.h>
-@@ -35,13 +36,16 @@
+@@ -34,13 +35,16 @@
  #define REG_BCM6318_SOB		((void __iomem *)CKSEG1ADDR(0x10000900))
  #define BCM6318_FREQ_SHIFT	23
  #define BCM6318_FREQ_MASK	(0x3 << BCM6318_FREQ_SHIFT)
@@ -40,7 +40,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  #define REG_BCM6358_DDR_PLLC	((void __iomem *)0xfffe12b8)
  #define BCM6358_PLLC_M1_SHIFT	0
  #define BCM6358_PLLC_M1_MASK	(0xff << BCM6358_PLLC_M1_SHIFT)
-@@ -53,7 +57,9 @@
+@@ -52,7 +56,9 @@
  #define REG_BCM6362_MISC_SB	((void __iomem *)CKSEG1ADDR(0x10001814))
  #define BCM6362_FCVO_SHIFT	1
  #define BCM6362_FCVO_MASK	(0x1f << BCM6362_FCVO_SHIFT)
@@ -50,7 +50,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  #define REG_BCM6368_DDR_PLLC	((void __iomem *)CKSEG1ADDR(0x100012a0))
  #define BCM6368_PLLC_P1_SHIFT	0
  #define BCM6368_PLLC_P1_MASK	(0xf << BCM6368_PLLC_P1_SHIFT)
-@@ -68,6 +74,21 @@
+@@ -67,6 +73,21 @@
  #define REG_BCM63268_MISC_SB	((void __iomem *)CKSEG1ADDR(0x10001814))
  #define BCM63268_FCVO_SHIFT	21
  #define BCM63268_FCVO_MASK	(0xf << BCM63268_FCVO_SHIFT)
@@ -72,7 +72,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  
  extern bool bmips_rac_flush_disable;
  
-@@ -78,6 +99,11 @@ struct bmips_cpufreq {
+@@ -77,6 +98,11 @@ struct bmips_cpufreq {
  	u32			(*cpu_freq)(void);
  };
  
@@ -84,7 +84,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  struct bmips_quirk {
  	const char		*compatible;
  	void			(*quirk_fn)(void);
-@@ -352,9 +378,90 @@ void __init plat_time_init(void)
+@@ -351,9 +377,90 @@ void __init plat_time_init(void)
  	mips_hpt_frequency = freq;
  }
  
@@ -175,7 +175,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  	const struct bmips_quirk *q;
  
  	set_io_port_base(0);
-@@ -372,6 +479,18 @@ void __init plat_mem_setup(void)
+@@ -374,6 +481,18 @@ void __init plat_mem_setup(void)
  
  	__dt_setup_arch(dtb);
  

target/linux/bmips/patches-6.6/202-mips-bmips-tweak-Kconfig-options.patch

@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -274,19 +274,13 @@ config BMIPS_GENERIC
+@@ -272,19 +272,13 @@ config BMIPS_GENERIC
  	select SYNC_R4K
  	select COMMON_CLK
  	select BCM6345_L1_IRQ
@@ -33,7 +33,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  	select SWAP_IO_SPACE
  	select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
  	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
-@@ -296,6 +290,7 @@ config BMIPS_GENERIC
+@@ -294,6 +288,7 @@ config BMIPS_GENERIC
  	select HAVE_PCI
  	select PCI_DRIVERS_GENERIC
  	select FW_CFE
@@ -43,7 +43,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  	  BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
 --- a/drivers/irqchip/Kconfig
 +++ b/drivers/irqchip/Kconfig
-@@ -122,7 +122,6 @@ config BCM6345_L1_IRQ
+@@ -124,7 +124,6 @@ config BCM6345_L1_IRQ
  config BCM7038_L1_IRQ
  	tristate "Broadcom STB 7038-style L1/L2 interrupt controller driver"
  	depends on ARCH_BRCMSTB || BMIPS_GENERIC
@@ -51,7 +51,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  	select GENERIC_IRQ_CHIP
  	select IRQ_DOMAIN
  	select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
-@@ -130,14 +129,12 @@ config BCM7038_L1_IRQ
+@@ -132,14 +131,12 @@ config BCM7038_L1_IRQ
  config BCM7120_L2_IRQ
  	tristate "Broadcom STB 7120-style L2 interrupt controller driver"
  	depends on ARCH_BRCMSTB || BMIPS_GENERIC

target/linux/bmips/patches-6.6/203-mips-bmips-dma-fix-CBR-address.patch

@@ -46,7 +46,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  }
 --- a/arch/mips/bmips/setup.c
 +++ b/arch/mips/bmips/setup.c
-@@ -90,7 +90,7 @@
+@@ -89,7 +89,7 @@
  
  #define DDR_CSEND_REG		0x8
  
@@ -55,7 +55,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  
  static const unsigned long kbase = VMLINUX_LOAD_ADDRESS & 0xfff00000;
  
-@@ -171,12 +171,6 @@ static void bcm6358_quirks(void)
+@@ -170,12 +170,6 @@ static void bcm6358_quirks(void)
  	 * disable SMP for now
  	 */
  	bmips_smp_enabled = 0;
@@ -68,7 +68,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  }
  
  static void bcm6368_quirks(void)
-@@ -209,6 +203,11 @@ static void __init bmips_init_cfe(void)
+@@ -208,6 +202,11 @@ static void __init bmips_init_cfe(void)
  
  void __init prom_init(void)
  {

target/linux/bmips/patches-6.6/204-mips-bmips-enable-RAC-on-BMIPS4350.patch

@@ -19,7 +19,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/arch/mips/kernel/smp-bmips.c
 +++ b/arch/mips/kernel/smp-bmips.c
-@@ -615,6 +615,20 @@ void bmips_cpu_setup(void)
+@@ -620,6 +620,20 @@ void bmips_cpu_setup(void)
  		__raw_readl(cbr + BMIPS_RAC_ADDRESS_RANGE);
  		break;
  

target/linux/bmips/patches-6.6/210-revert-macronix-nand-block-protection.patch

@@ -19,7 +19,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/drivers/mtd/nand/raw/nand_macronix.c
 +++ b/drivers/mtd/nand/raw/nand_macronix.c
-@@ -12,10 +12,6 @@
+@@ -13,10 +13,6 @@
  #define MACRONIX_READ_RETRY_BIT BIT(0)
  #define MACRONIX_NUM_READ_RETRY_MODES 6
  
@@ -30,7 +30,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  #define ONFI_FEATURE_ADDR_MXIC_RANDOMIZER 0xB0
  #define MACRONIX_RANDOMIZER_BIT BIT(1)
  #define MACRONIX_RANDOMIZER_ENPGM BIT(0)
-@@ -179,73 +175,6 @@ static void macronix_nand_fix_broken_get
+@@ -189,73 +185,6 @@ static void macronix_nand_fix_broken_get
  		     ONFI_FEATURE_ADDR_TIMING_MODE, 1);
  }
  
@@ -104,11 +104,11 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  static int nand_power_down_op(struct nand_chip *chip)
  {
  	int ret;
-@@ -323,7 +252,6 @@ static int macronix_nand_init(struct nan
+@@ -488,7 +417,6 @@ static int macronix_nand_init(struct nan
  
  	macronix_nand_fix_broken_get_timings(chip);
  	macronix_nand_onfi_init(chip);
 -	macronix_nand_block_protection_support(chip);
  	macronix_nand_deep_power_down_support(chip);
+ 	macronix_nand_setup_otp(chip);
  
- 	return 0;

target/linux/bmips/patches-6.6/502-net-mdio-mux-bcm6368-allow-disabling.patch

@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/drivers/net/mdio/Kconfig
 +++ b/drivers/net/mdio/Kconfig
-@@ -219,7 +219,6 @@ config MDIO_BUS_MUX_BCM6368
+@@ -244,7 +244,6 @@ config MDIO_BUS_MUX_BCM6368
  	tristate "Broadcom BCM6368 MDIO bus multiplexers"
  	depends on OF && OF_MDIO && (BMIPS_GENERIC || COMPILE_TEST)
  	select MDIO_BUS_MUX

target/linux/bmips/patches-6.6/600-mips-bmips-add-pci-support.patch

@@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -288,7 +288,6 @@ config BMIPS_GENERIC
+@@ -286,7 +286,6 @@ config BMIPS_GENERIC
  	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
  	select HARDIRQS_SW_RESEND
  	select HAVE_PCI

target/linux/bmips/patches-6.6/601-pci-controllers-add-bcm6328-pcie-support.patch

@@ -14,9 +14,9 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/drivers/pci/controller/Kconfig
 +++ b/drivers/pci/controller/Kconfig
-@@ -3,6 +3,11 @@
- menu "PCI controller drivers"
- 	depends on PCI
+@@ -173,6 +173,11 @@ config PCI_LOONGSON
+ 	  Say Y here if you want to enable PCI controller support on
+ 	  Loongson systems.
  
 +config PCIE_BCM6328
 +	bool "BCM6328 PCIe controller"

target/linux/bmips/patches-6.6/602-pci-controllers-add-bcm6318-pcie-support.patch

@@ -14,9 +14,9 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/drivers/pci/controller/Kconfig
 +++ b/drivers/pci/controller/Kconfig
-@@ -3,6 +3,11 @@
- menu "PCI controller drivers"
- 	depends on PCI
+@@ -173,6 +173,11 @@ config PCI_LOONGSON
+ 	  Say Y here if you want to enable PCI controller support on
+ 	  Loongson systems.
  
 +config PCIE_BCM6318
 +	bool "BCM6318 PCIe controller"

target/linux/bmips/patches-6.6/603-pci-controllers-add-bcm6348-pci-support.patch

@@ -14,9 +14,9 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/drivers/pci/controller/Kconfig
 +++ b/drivers/pci/controller/Kconfig
-@@ -3,6 +3,11 @@
- menu "PCI controller drivers"
- 	depends on PCI
+@@ -173,6 +173,11 @@ config PCI_LOONGSON
+ 	  Say Y here if you want to enable PCI controller support on
+ 	  Loongson systems.
  
 +config PCI_BCM6348
 +	bool "BCM6348 PCI controller"

target/linux/bmips/patches-6.6/700-leds-add-support-for-Sercomm-MSP430-LED-controller.patch

@@ -17,7 +17,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/drivers/leds/Kconfig
 +++ b/drivers/leds/Kconfig
-@@ -283,6 +283,15 @@ config LEDS_COBALT_RAQ
+@@ -299,6 +299,15 @@ config LEDS_COBALT_RAQ
  	help
  	  This option enables support for the Cobalt Raq series LEDs.
  
@@ -35,9 +35,9 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  	depends on LEDS_CLASS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -76,6 +76,7 @@ obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o
+@@ -78,6 +78,7 @@ obj-$(CONFIG_LEDS_POWERNV)		+= leds-powe
+ obj-$(CONFIG_LEDS_PWM)			+= leds-pwm.o
  obj-$(CONFIG_LEDS_REGULATOR)		+= leds-regulator.o
- obj-$(CONFIG_LEDS_S3C24XX)		+= leds-s3c24xx.o
  obj-$(CONFIG_LEDS_SC27XX_BLTC)		+= leds-sc27xx-bltc.o
 +obj-$(CONFIG_LEDS_SERCOMM_MSP430)	+= leds-sercomm-msp430.o
  obj-$(CONFIG_LEDS_SUNFIRE)		+= leds-sunfire.o