ath79: refresh patches and configs to introduce kernel 6.1 support

[openwrt/staging/blocktrron.git] / target / linux / ath79 / patches-6.1 / 911-mikrotik-rb91x.patch

diff --git a/target/linux/ath79/patches-6.1/911-mikrotik-rb91x.patch b/target/linux/ath79/patches-6.1/911-mikrotik-rb91x.patch
index 94967bf674c47150cc6361990c279d817b695a0b..768ab6fb49ad8c41753232ddd52a74e2a58e7eec 100644 (file)
--- a/target/linux/ath79/patches-6.1/911-mikrotik-rb91x.patch
+++ b/target/linux/ath79/patches-6.1/911-mikrotik-rb91x.patch
@@ -29,11 +29,10 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
 
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -353,6 +353,13 @@ config GPIO_IXP4XX
-         IXP4xx series of chips.
+@@ -368,6 +368,12 @@ config GPIO_IXP4XX
  
          If unsure, say N.
-+
+ 
 +config GPIO_LATCH
 +      tristate "MikroTik RouterBOARD GPIO latch support"
 +      depends on ATH79
@@ -43,7 +42,7 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  config GPIO_LOGICVC
        tristate "Xylon LogiCVC GPIO support"
        depends on MFD_SYSCON && OF
-@@ -529,6 +536,10 @@ config GPIO_ROCKCHIP
+@@ -544,6 +550,10 @@ config GPIO_ROCKCHIP
        help
          Say yes here to support GPIO on Rockchip SoCs.
  
@@ -56,7 +55,7 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
        depends on MFD_SYSCON
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
-@@ -75,6 +75,7 @@ obj-$(CONFIG_GPIO_IT87)                      += gpio-it87.o
+@@ -76,6 +76,7 @@ obj-$(CONFIG_GPIO_IT87)                      += gpio-it87.o
  obj-$(CONFIG_GPIO_IXP4XX)             += gpio-ixp4xx.o
  obj-$(CONFIG_GPIO_JANZ_TTL)           += gpio-janz-ttl.o
  obj-$(CONFIG_GPIO_KEMPLD)             += gpio-kempld.o
@@ -64,7 +63,7 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  obj-$(CONFIG_GPIO_LOGICVC)            += gpio-logicvc.o
  obj-$(CONFIG_GPIO_LOONGSON1)          += gpio-loongson1.o
  obj-$(CONFIG_GPIO_LOONGSON)           += gpio-loongson.o
-@@ -123,6 +124,7 @@ obj-$(CONFIG_GPIO_PMIC_EIC_SPRD)   += gpio
+@@ -124,6 +125,7 @@ obj-$(CONFIG_GPIO_PMIC_EIC_SPRD)   += gpio
  obj-$(CONFIG_GPIO_PXA)                        += gpio-pxa.o
  obj-$(CONFIG_GPIO_RASPBERRYPI_EXP)    += gpio-raspberrypi-exp.o
  obj-$(CONFIG_GPIO_RB4XX)              += gpio-rb4xx.o
@@ -74,7 +73,7 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  obj-$(CONFIG_GPIO_RDA)                        += gpio-rda.o
 --- a/drivers/mtd/nand/raw/Kconfig
 +++ b/drivers/mtd/nand/raw/Kconfig
-@@ -570,4 +570,10 @@ config MTD_NAND_RB4XX
+@@ -572,4 +572,10 @@ config MTD_NAND_RB4XX
          Enables support for the NAND flash chip on Mikrotik Routerboard
          RB4xx series.
  
@@ -87,8 +86,8 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
  endif # MTD_RAW_NAND
 --- a/drivers/mtd/nand/raw/Makefile
 +++ b/drivers/mtd/nand/raw/Makefile
-@@ -60,6 +60,7 @@ obj-$(CONFIG_MTD_NAND_ROCKCHIP)              += rock
- obj-$(CONFIG_MTD_NAND_PL35X)          += pl35x-nand-controller.o
+@@ -61,6 +61,7 @@ obj-$(CONFIG_MTD_NAND_PL35X)         += pl35x-n
+ obj-$(CONFIG_MTD_NAND_RENESAS)                += renesas-nand-controller.o
  obj-$(CONFIG_MTD_NAND_AR934X)         += ar934x_nand.o
  obj-$(CONFIG_MTD_NAND_RB4XX)          += nand_rb4xx.o
 +obj-$(CONFIG_MTD_NAND_RB91X)          += rb91x_nand.o