diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 8e252153fe..87c43fdc0c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=215 +PKG_RELEASE:=216 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index fe908f7aa4..a77b669709 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -254,7 +254,6 @@ default_postinst() { fi if grep -m1 -q -s "^/etc/uci-defaults/" "$filelist"; then - . /lib/functions/system.sh [ -d /tmp/.uci ] || mkdir -p /tmp/.uci for i in $(grep -s "^/etc/uci-defaults/" "$filelist"); do ( [ -f "$i" ] && cd "$(dirname $i)" && . "$i" ) && rm -f "$i" diff --git a/package/base-files/files/lib/functions/system.sh b/package/base-files/files/lib/functions/system.sh index c9f8eb0c31..c7aa7bf75c 100644 --- a/package/base-files/files/lib/functions/system.sh +++ b/package/base-files/files/lib/functions/system.sh @@ -1,5 +1,6 @@ # Copyright (C) 2006-2013 OpenWrt.org +. /lib/functions.sh . /usr/share/libubox/jshn.sh get_mac_binary() { diff --git a/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch b/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch new file mode 100644 index 0000000000..daf3160952 --- /dev/null +++ b/package/kernel/broadcom-wl/patches/915-fix-wl_timer-for-4_15.patch @@ -0,0 +1,55 @@ +--- a/driver/wl_linux.c ++++ b/driver/wl_linux.c +@@ -235,7 +235,11 @@ + + }; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static void wl_timer(struct timer_list *tl); ++#else + static void wl_timer(ulong data); ++#endif + static void _wl_timer(wl_timer_t *t); + + #ifdef WLC_HIGH_ONLY +@@ -2512,6 +2517,18 @@ + } + #endif /* WLC_HIGH_ONLY */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++static void ++wl_timer(struct timer_list *tl) ++{ ++ wl_timer_t *t = from_timer(t, tl, timer); ++#ifndef WLC_HIGH_ONLY ++ _wl_timer(t); ++#else ++ wl_schedule_task(t->wl, wl_timer_task, t); ++#endif /* WLC_HIGH_ONLY */ ++} ++#else + static void + wl_timer(ulong data) + { +@@ -2522,6 +2539,7 @@ + wl_schedule_task(t->wl, wl_timer_task, t); + #endif /* WLC_HIGH_ONLY */ + } ++#endif /* linux >= 4.15.0 */ + + static void + _wl_timer(wl_timer_t *t) +@@ -2573,9 +2591,13 @@ + + bzero(t, sizeof(wl_timer_t)); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ timer_setup(&t->timer, wl_timer, 0); ++#else + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; ++#endif + t->wl = wl; + t->fn = fn; + t->arg = arg; diff --git a/package/kernel/broadcom-wl/patches/916-fix-compilation-for-5_4.patch b/package/kernel/broadcom-wl/patches/916-fix-compilation-for-5_4.patch new file mode 100644 index 0000000000..bc7b63df08 --- /dev/null +++ b/package/kernel/broadcom-wl/patches/916-fix-compilation-for-5_4.patch @@ -0,0 +1,18 @@ +--- a/driver/wl_iw.c ++++ b/driver/wl_iw.c +@@ -112,10 +112,14 @@ + ifr.ifr_data = (caddr_t) &ioc; + + /* Must be up for virtually all useful ioctls */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) ++ dev_open(dev, NULL); ++#else + dev_open(dev); ++#endif + + fs = get_fs(); +- set_fs(get_ds()); ++ set_fs(KERNEL_DS); + ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE); + set_fs(fs); + diff --git a/target/linux/bcm63xx/Makefile b/target/linux/bcm63xx/Makefile index a7f3c32fab..9e7e2b052e 100644 --- a/target/linux/bcm63xx/Makefile +++ b/target/linux/bcm63xx/Makefile @@ -13,7 +13,7 @@ BOARDNAME:=Broadcom BCM63xx SUBTARGETS:=generic smp FEATURES:=squashfs usb atm pci pcmcia usbgadget KERNEL_PATCHVER:=4.14 -KERNEL_TESTING_PATCHVER:=4.19 +KERNEL_TESTING_PATCHVER:=5.4 define Target/Description Build firmware images for Broadcom based xDSL/routers diff --git a/target/linux/bcm63xx/config-4.19 b/target/linux/bcm63xx/config-5.4 similarity index 83% rename from target/linux/bcm63xx/config-4.19 rename to target/linux/bcm63xx/config-5.4 index 8191088fa0..c1587b84d6 100644 --- a/target/linux/bcm63xx/config-4.19 +++ b/target/linux/bcm63xx/config-5.4 @@ -1,23 +1,22 @@ -CONFIG_ARCH_BINFMT_ELF_STATE=y +CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_ARCH_HAS_DMA_COHERENT_TO_PFN=y +CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -# CONFIG_ARCH_HAS_GCOV_PROFILE_ALL is not set -# CONFIG_ARCH_HAS_SG_CHAIN is not set -# CONFIG_ARCH_HAS_STRICT_KERNEL_RWX is not set -# CONFIG_ARCH_HAS_STRICT_MODULE_RWX is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y +CONFIG_ARCH_HAS_UNCACHED_SEGMENT=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y CONFIG_ARCH_MMAP_RND_BITS_MAX=15 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=15 -# CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set -# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_MEMREMAP_PROT=y CONFIG_ARCH_USE_QUEUED_RWLOCKS=y CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_BCM6345_EXT_IRQ=y CONFIG_BCM6345_PERIPH_IRQ=y @@ -55,36 +54,49 @@ CONFIG_BOARD_LIVEBOX=y CONFIG_CEVT_R4K=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLONE_BACKWARDS=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CPU_BIG_ENDIAN=y CONFIG_CPU_BMIPS=y CONFIG_CPU_BMIPS32_3300=y CONFIG_CPU_BMIPS4350=y CONFIG_CPU_GENERIC_DUMP_TLB=y +CONFIG_CPU_HAS_LOAD_STORE_LR=y CONFIG_CPU_HAS_PREFETCH=y CONFIG_CPU_HAS_SYNC=y CONFIG_CPU_MIPS32=y CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y +CONFIG_CPU_NO_EFFICIENT_FFS=y CONFIG_CPU_R4K_CACHE_TLB=y -CONFIG_CPU_R4K_FPU=y CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y CONFIG_CPU_SUPPORTS_CPUFREQ=y CONFIG_CPU_SUPPORTS_HIGHMEM=y CONFIG_CRASH_CORE=y CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CSRC_R4K=y CONFIG_DMA_NONCOHERENT=y +CONFIG_DMA_NONCOHERENT_CACHE_SYNC=y CONFIG_DTC=y CONFIG_EARLY_PRINTK=y +CONFIG_EFI_EARLYCON=y CONFIG_FIXED_PHY=y +CONFIG_FONT_8x16=y +CONFIG_FONT_AUTOSELECT=y +CONFIG_FONT_SUPPORT=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_GENERIC_ATOMIC64=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CMOS_UPDATE=y CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_IO=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_LIB_ASHLDI3=y +CONFIG_GENERIC_LIB_ASHRDI3=y +CONFIG_GENERIC_LIB_CMPDI2=y +CONFIG_GENERIC_LIB_LSHRDI3=y +CONFIG_GENERIC_LIB_UCMPDI2=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PINCONF=y CONFIG_GENERIC_PINCTRL_GROUPS=y @@ -96,51 +108,47 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_BCM63XX=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_SYSFS=y -# CONFIG_GRO_CELLS is not set CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_HAVE_ARCH_COMPILER_H=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y CONFIG_HAVE_ARCH_TRACEHOOK=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CBPF_JIT=y -CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_HAVE_ASM_MODVERSIONS=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CONTEXT_TRACKING=y CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_FAST_GUP=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_GENERIC_VDSO=y CONFIG_HAVE_IDE=y +CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_LATENCYTOP_SUPPORT=y -CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y CONFIG_HAVE_MEMBLOCK_NODE_MAP=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_NET_DSA=y CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_PCI=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HW_HAS_PCI=y CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_BCM63XX=y +# CONFIG_HW_RANDOM_BCM2835 is not set CONFIG_HZ=250 -# CONFIG_HZ_100 is not set CONFIG_HZ_250=y CONFIG_HZ_PERIODIC=y CONFIG_INITRAMFS_SOURCE="" @@ -155,9 +163,12 @@ CONFIG_LEDS_BCM6328=y CONFIG_LEDS_BCM6358=y CONFIG_LEDS_GPIO=y CONFIG_LIBFDT=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_MDIO_BUS=y CONFIG_MDIO_DEVICE=y +CONFIG_MEMFD_CREATE=y CONFIG_MFD_SYSCON=y +CONFIG_MIGRATION=y CONFIG_MIPS=y CONFIG_MIPS_ASID_BITS=8 CONFIG_MIPS_ASID_SHIFT=0 @@ -167,10 +178,8 @@ CONFIG_MIPS_CLOCK_VSYSCALL=y CONFIG_MIPS_CMDLINE_FROM_DTB=y # CONFIG_MIPS_ELF_APPENDED_DTB is not set CONFIG_MIPS_EXTERNAL_TIMER=y -# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set CONFIG_MIPS_L1_CACHE_SHIFT=4 CONFIG_MIPS_L1_CACHE_SHIFT_4=y -# CONFIG_MIPS_MACHINE is not set # CONFIG_MIPS_NO_APPENDED_DTB is not set CONFIG_MIPS_RAW_APPENDED_DTB=y CONFIG_MODULES_USE_ELF_REL=y @@ -184,7 +193,6 @@ CONFIG_MTD_CFI_BE_BYTE_SWAP=y CONFIG_MTD_CFI_STAA=y # CONFIG_MTD_COMPLEX_MAPPINGS is not set CONFIG_MTD_JEDECPROBE=y -CONFIG_MTD_M25P80=y CONFIG_MTD_PARSER_IMAGETAG=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_REDBOOT_PARTS=y @@ -193,13 +201,14 @@ CONFIG_MTD_SPI_NOR=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y -# CONFIG_NO_IOPORT_MAP is not set +CONFIG_NVMEM=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y CONFIG_OF_FLATTREE=y CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y +CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y CONFIG_OF_NET=y CONFIG_PCI=y @@ -221,15 +230,11 @@ CONFIG_PINCTRL_BCM6368=y CONFIG_PINCTRL_BCM63XX=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -# CONFIG_RCU_NEED_SEGCBLIST is not set -# CONFIG_RCU_STALL_COMMON is not set CONFIG_REGMAP=y CONFIG_REGMAP_MMIO=y CONFIG_RELAY=y CONFIG_RTL8366_SMI=y CONFIG_RTL8367_PHY=y -# CONFIG_SCHED_INFO is not set -# CONFIG_SCSI_DMA is not set # CONFIG_SERIAL_8250 is not set CONFIG_SERIAL_BCM63XX=y CONFIG_SERIAL_BCM63XX_CONSOLE=y @@ -237,7 +242,7 @@ CONFIG_SPI=y CONFIG_SPI_BCM63XX=y CONFIG_SPI_BCM63XX_HSSPI=y CONFIG_SPI_MASTER=y -CONFIG_SQUASHFS_EMBEDDED=y +CONFIG_SPI_MEM=y CONFIG_SRCU=y CONFIG_SSB=y CONFIG_SSB_B43_PCI_BRIDGE=y @@ -255,7 +260,6 @@ CONFIG_SWCONFIG_B53_MMAP_DRIVER=y CONFIG_SWCONFIG_B53_PHY_DRIVER=y CONFIG_SWCONFIG_B53_PHY_FIXUP=y CONFIG_SWCONFIG_B53_SPI_DRIVER=y -# CONFIG_SWCONFIG_B53_SRAB_DRIVER is not set CONFIG_SWPHY=y CONFIG_SYNC_R4K=y CONFIG_SYSCTL_EXCEPTION_TRACE=y @@ -268,10 +272,12 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y CONFIG_SYS_SUPPORTS_HOTPLUG_CPU=y CONFIG_SYS_SUPPORTS_SMP=y +CONFIG_TARGET_ISA_REV=0 CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TINY_SRCU=y CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y CONFIG_VM_EVENT_COUNTERS=y +CONFIG_WATCHDOG_CORE=y CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_WEAK_ORDERING=y diff --git a/target/linux/bcm63xx/patches-4.19/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch b/target/linux/bcm63xx/patches-4.19/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch deleted file mode 100644 index 6fd5cbb9e5..0000000000 --- a/target/linux/bcm63xx/patches-4.19/121-mtd-bcm63xxpart-move-imagetag-parsing-to-its-own-par.patch +++ /dev/null @@ -1,482 +0,0 @@ -From a2b8c7f648e168573905818dbb4cb90ca3957c65 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Wed, 28 Jun 2017 18:29:43 +0200 -Subject: [PATCH] mtd: bcm63xxpart: move imagetag parsing to its own parser - -Move the bcm963xx Image Tag parsing into its own partition parser. This -Allows reusing the parser with different full flash parsers. - -While moving it, rename it to bcm963* to better reflect it isn't chip -but board specific. - -Signed-off-by: Jonas Gorski ---- -I tried to keep the code as-is, to keep the changes as small as -possible. - -One side effect is that the partitions get renumbered, which means any -root=/dev/mtdblock* will now point to the wrong mtd device. But since -bcm963xx boards will require these hardcoded in the kernel commandline -anyway this should b a non issue, as it can be easily updated. - -There is no such thing in the mips/bcm63xx defconfig, so nothing to update -there. - - drivers/mtd/Kconfig | 1 + - drivers/mtd/bcm63xxpart.c | 155 ++---------------------- - drivers/mtd/parsers/Kconfig | 11 ++ - drivers/mtd/parsers/Makefile | 1 + - drivers/mtd/parsers/parser_imagetag.c | 214 ++++++++++++++++++++++++++++++++++ - 5 files changed, 235 insertions(+), 147 deletions(-) - create mode 100644 drivers/mtd/parsers/parser_imagetag.c - ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -162,6 +162,7 @@ config MTD_BCM63XX_PARTS - tristate "BCM63XX CFE partitioning support" - depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST - select CRC32 -+ select MTD_PARSER_IMAGETAG - help - This provides partions parsing for BCM63xx devices with CFE - bootloaders. ---- a/drivers/mtd/bcm63xxpart.c -+++ b/drivers/mtd/bcm63xxpart.c -@@ -93,51 +93,19 @@ static int bcm63xx_read_nvram(struct mtd - return 0; - } - --static int bcm63xx_read_image_tag(struct mtd_info *master, const char *name, -- loff_t tag_offset, struct bcm_tag *buf) --{ -- int ret; -- size_t retlen; -- u32 computed_crc; -- -- ret = mtd_read(master, tag_offset, sizeof(*buf), &retlen, (void *)buf); -- if (ret) -- return ret; -- -- if (retlen != sizeof(*buf)) -- return -EIO; -- -- computed_crc = crc32_le(IMAGETAG_CRC_START, (u8 *)buf, -- offsetof(struct bcm_tag, header_crc)); -- if (computed_crc == buf->header_crc) { -- STR_NULL_TERMINATE(buf->board_id); -- STR_NULL_TERMINATE(buf->tag_version); -- -- pr_info("%s: CFE image tag found at 0x%llx with version %s, board type %s\n", -- name, tag_offset, buf->tag_version, buf->board_id); -- -- return 0; -- } -- -- pr_warn("%s: CFE image tag at 0x%llx CRC invalid (expected %08x, actual %08x)\n", -- name, tag_offset, buf->header_crc, computed_crc); -- return 1; --} -+static const char * const bcm63xx_cfe_part_types[] = { -+ "bcm963xx-imagetag", -+ NULL, -+}; - - static int bcm63xx_parse_cfe_nor_partitions(struct mtd_info *master, - const struct mtd_partition **pparts, struct bcm963xx_nvram *nvram) - { -- /* CFE, NVRAM and global Linux are always present */ -- int nrparts = 3, curpart = 0; -- struct bcm_tag *buf = NULL; - struct mtd_partition *parts; -- int ret; -- unsigned int rootfsaddr, kerneladdr, spareaddr; -- unsigned int rootfslen, kernellen, sparelen, totallen; -+ int nrparts = 3, curpart = 0; - unsigned int cfelen, nvramlen; - unsigned int cfe_erasesize; - int i; -- bool rootfs_first = false; - - cfe_erasesize = max_t(uint32_t, master->erasesize, - BCM963XX_CFE_BLOCK_SIZE); -@@ -146,83 +114,9 @@ static int bcm63xx_parse_cfe_nor_partiti - nvramlen = nvram->psi_size * SZ_1K; - nvramlen = roundup(nvramlen, cfe_erasesize); - -- buf = vmalloc(sizeof(struct bcm_tag)); -- if (!buf) -- return -ENOMEM; -- -- /* Get the tag */ -- ret = bcm63xx_read_image_tag(master, "rootfs", cfelen, buf); -- if (!ret) { -- STR_NULL_TERMINATE(buf->flash_image_start); -- if (kstrtouint(buf->flash_image_start, 10, &rootfsaddr) || -- rootfsaddr < BCM963XX_EXTENDED_SIZE) { -- pr_err("invalid rootfs address: %*ph\n", -- (int)sizeof(buf->flash_image_start), -- buf->flash_image_start); -- goto invalid_tag; -- } -- -- STR_NULL_TERMINATE(buf->kernel_address); -- if (kstrtouint(buf->kernel_address, 10, &kerneladdr) || -- kerneladdr < BCM963XX_EXTENDED_SIZE) { -- pr_err("invalid kernel address: %*ph\n", -- (int)sizeof(buf->kernel_address), -- buf->kernel_address); -- goto invalid_tag; -- } -- -- STR_NULL_TERMINATE(buf->kernel_length); -- if (kstrtouint(buf->kernel_length, 10, &kernellen)) { -- pr_err("invalid kernel length: %*ph\n", -- (int)sizeof(buf->kernel_length), -- buf->kernel_length); -- goto invalid_tag; -- } -- -- STR_NULL_TERMINATE(buf->total_length); -- if (kstrtouint(buf->total_length, 10, &totallen)) { -- pr_err("invalid total length: %*ph\n", -- (int)sizeof(buf->total_length), -- buf->total_length); -- goto invalid_tag; -- } -- -- kerneladdr = kerneladdr - BCM963XX_EXTENDED_SIZE; -- rootfsaddr = rootfsaddr - BCM963XX_EXTENDED_SIZE; -- spareaddr = roundup(totallen, master->erasesize) + cfelen; -- -- if (rootfsaddr < kerneladdr) { -- /* default Broadcom layout */ -- rootfslen = kerneladdr - rootfsaddr; -- rootfs_first = true; -- } else { -- /* OpenWrt layout */ -- rootfsaddr = kerneladdr + kernellen; -- rootfslen = spareaddr - rootfsaddr; -- } -- } else if (ret > 0) { --invalid_tag: -- kernellen = 0; -- rootfslen = 0; -- rootfsaddr = 0; -- spareaddr = cfelen; -- } else { -- goto out; -- } -- sparelen = master->size - spareaddr - nvramlen; -- -- /* Determine number of partitions */ -- if (rootfslen > 0) -- nrparts++; -- -- if (kernellen > 0) -- nrparts++; -- - parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL); -- if (!parts) { -- ret = -ENOMEM; -- goto out; -- } -+ if (!parts) -+ return -ENOMEM; - - /* Start building partition list */ - parts[curpart].name = "CFE"; -@@ -230,30 +124,6 @@ invalid_tag: - parts[curpart].size = cfelen; - curpart++; - -- if (kernellen > 0) { -- int kernelpart = curpart; -- -- if (rootfslen > 0 && rootfs_first) -- kernelpart++; -- parts[kernelpart].name = "kernel"; -- parts[kernelpart].offset = kerneladdr; -- parts[kernelpart].size = kernellen; -- curpart++; -- } -- -- if (rootfslen > 0) { -- int rootfspart = curpart; -- -- if (kernellen > 0 && rootfs_first) -- rootfspart--; -- parts[rootfspart].name = "rootfs"; -- parts[rootfspart].offset = rootfsaddr; -- parts[rootfspart].size = rootfslen; -- if (sparelen > 0 && !rootfs_first) -- parts[rootfspart].size += sparelen; -- curpart++; -- } -- - parts[curpart].name = "nvram"; - parts[curpart].offset = master->size - nvramlen; - parts[curpart].size = nvramlen; -@@ -263,22 +133,13 @@ invalid_tag: - parts[curpart].name = "linux"; - parts[curpart].offset = cfelen; - parts[curpart].size = master->size - cfelen - nvramlen; -+ parts[curpart].types = bcm63xx_cfe_part_types; - - for (i = 0; i < nrparts; i++) - pr_info("Partition %d is %s offset %llx and length %llx\n", i, - parts[i].name, parts[i].offset, parts[i].size); - -- pr_info("Spare partition is offset %x and length %x\n", spareaddr, -- sparelen); -- - *pparts = parts; -- ret = 0; -- --out: -- vfree(buf); -- -- if (ret) -- return ret; - - return nrparts; - } ---- a/drivers/mtd/parsers/Kconfig -+++ b/drivers/mtd/parsers/Kconfig -@@ -1,3 +1,14 @@ -+config MTD_PARSER_IMAGETAG -+ tristate "Parser for BCM963XX Image Tag format partitions" -+ depends on BCM63XX || BMIPS || COMPILE_TEST -+ select CRC32 -+ help -+ Image Tag is the firmware header used by broadcom on their xDSL line -+ of devices. It is used to describe the offsets and lengths of kernel -+ and rootfs partitions. -+ This driver adds support for parsing a partition with an Image Tag -+ header and creates up to two partitions, kernel and rootfs. -+ - config MTD_PARSER_TRX - tristate "Parser for TRX format partitions" - depends on MTD && (BCM47XX || ARCH_BCM_5301X || COMPILE_TEST) ---- a/drivers/mtd/parsers/Makefile -+++ b/drivers/mtd/parsers/Makefile -@@ -1,2 +1,3 @@ -+obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o - obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o - obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o ---- /dev/null -+++ b/drivers/mtd/parsers/parser_imagetag.c -@@ -0,0 +1,214 @@ -+/* -+ * BCM63XX CFE image tag parser -+ * -+ * Copyright © 2006-2008 Florian Fainelli -+ * Mike Albon -+ * Copyright © 2009-2010 Daniel Dickinson -+ * Copyright © 2011-2013 Jonas Gorski -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ */ -+ -+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+/* Ensure strings read from flash structs are null terminated */ -+#define STR_NULL_TERMINATE(x) \ -+ do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0) -+ -+static int bcm963xx_read_imagetag(struct mtd_info *master, const char *name, -+ loff_t tag_offset, struct bcm_tag *buf) -+{ -+ int ret; -+ size_t retlen; -+ u32 computed_crc; -+ -+ ret = mtd_read(master, tag_offset, sizeof(*buf), &retlen, (void *)buf); -+ if (ret) -+ return ret; -+ -+ if (retlen != sizeof(*buf)) -+ return -EIO; -+ -+ computed_crc = crc32_le(IMAGETAG_CRC_START, (u8 *)buf, -+ offsetof(struct bcm_tag, header_crc)); -+ if (computed_crc == buf->header_crc) { -+ STR_NULL_TERMINATE(buf->board_id); -+ STR_NULL_TERMINATE(buf->tag_version); -+ -+ pr_info("%s: CFE image tag found at 0x%llx with version %s, board type %s\n", -+ name, tag_offset, buf->tag_version, buf->board_id); -+ -+ return 0; -+ } -+ -+ pr_warn("%s: CFE image tag at 0x%llx CRC invalid (expected %08x, actual %08x)\n", -+ name, tag_offset, buf->header_crc, computed_crc); -+ return -EINVAL; -+} -+ -+static int bcm963xx_parse_imagetag_partitions(struct mtd_info *master, -+ const struct mtd_partition **pparts, -+ struct mtd_part_parser_data *data) -+{ -+ /* CFE, NVRAM and global Linux are always present */ -+ int nrparts = 0, curpart = 0; -+ struct bcm_tag *buf = NULL; -+ struct mtd_partition *parts; -+ int ret; -+ unsigned int rootfsaddr, kerneladdr, spareaddr, offset; -+ unsigned int rootfslen, kernellen, sparelen, totallen; -+ int i; -+ bool rootfs_first = false; -+ -+ buf = vmalloc(sizeof(struct bcm_tag)); -+ if (!buf) -+ return -ENOMEM; -+ -+ /* Get the tag */ -+ ret = bcm963xx_read_imagetag(master, "rootfs", 0, buf); -+ if (!ret) { -+ STR_NULL_TERMINATE(buf->flash_image_start); -+ if (kstrtouint(buf->flash_image_start, 10, &rootfsaddr) || -+ rootfsaddr < BCM963XX_EXTENDED_SIZE) { -+ pr_err("invalid rootfs address: %*ph\n", -+ (int)sizeof(buf->flash_image_start), -+ buf->flash_image_start); -+ goto out; -+ } -+ -+ STR_NULL_TERMINATE(buf->kernel_address); -+ if (kstrtouint(buf->kernel_address, 10, &kerneladdr) || -+ kerneladdr < BCM963XX_EXTENDED_SIZE) { -+ pr_err("invalid kernel address: %*ph\n", -+ (int)sizeof(buf->kernel_address), -+ buf->kernel_address); -+ goto out; -+ } -+ -+ STR_NULL_TERMINATE(buf->kernel_length); -+ if (kstrtouint(buf->kernel_length, 10, &kernellen)) { -+ pr_err("invalid kernel length: %*ph\n", -+ (int)sizeof(buf->kernel_length), -+ buf->kernel_length); -+ goto out; -+ } -+ -+ STR_NULL_TERMINATE(buf->total_length); -+ if (kstrtouint(buf->total_length, 10, &totallen)) { -+ pr_err("invalid total length: %*ph\n", -+ (int)sizeof(buf->total_length), -+ buf->total_length); -+ goto out; -+ } -+ -+ /* -+ * Addresses are flash absolute, so convert to partition -+ * relative addresses. Assume either kernel or rootfs will -+ * directly follow the image tag. -+ */ -+ if (rootfsaddr < kerneladdr) -+ offset = rootfsaddr - sizeof(struct bcm_tag); -+ else -+ offset = kerneladdr - sizeof(struct bcm_tag); -+ -+ kerneladdr = kerneladdr - offset; -+ rootfsaddr = rootfsaddr - offset; -+ spareaddr = roundup(totallen, master->erasesize); -+ -+ if (rootfsaddr < kerneladdr) { -+ /* default Broadcom layout */ -+ rootfslen = kerneladdr - rootfsaddr; -+ rootfs_first = true; -+ } else { -+ /* OpenWrt layout */ -+ rootfsaddr = kerneladdr + kernellen; -+ rootfslen = spareaddr - rootfsaddr; -+ } -+ } else { -+ goto out; -+ } -+ sparelen = master->size - spareaddr; -+ -+ /* Determine number of partitions */ -+ if (rootfslen > 0) -+ nrparts++; -+ -+ if (kernellen > 0) -+ nrparts++; -+ -+ parts = kzalloc(sizeof(*parts) * nrparts + 10 * nrparts, GFP_KERNEL); -+ if (!parts) { -+ ret = -ENOMEM; -+ goto out; -+ } -+ -+ /* Start building partition list */ -+ if (kernellen > 0) { -+ int kernelpart = curpart; -+ -+ if (rootfslen > 0 && rootfs_first) -+ kernelpart++; -+ parts[kernelpart].name = "kernel"; -+ parts[kernelpart].offset = kerneladdr; -+ parts[kernelpart].size = kernellen; -+ curpart++; -+ } -+ -+ if (rootfslen > 0) { -+ int rootfspart = curpart; -+ -+ if (kernellen > 0 && rootfs_first) -+ rootfspart--; -+ parts[rootfspart].name = "rootfs"; -+ parts[rootfspart].offset = rootfsaddr; -+ parts[rootfspart].size = rootfslen; -+ if (sparelen > 0 && !rootfs_first) -+ parts[rootfspart].size += sparelen; -+ curpart++; -+ } -+ -+ for (i = 0; i < nrparts; i++) -+ pr_info("Partition %d is %s offset %llx and length %llx\n", i, -+ parts[i].name, parts[i].offset, parts[i].size); -+ -+ pr_info("Spare partition is offset %x and length %x\n", spareaddr, -+ sparelen); -+ -+ *pparts = parts; -+ ret = 0; -+ -+out: -+ vfree(buf); -+ -+ if (ret) -+ return ret; -+ -+ return nrparts; -+} -+ -+static struct mtd_part_parser bcm963xx_imagetag_parser = { -+ .parse_fn = bcm963xx_parse_imagetag_partitions, -+ .name = "bcm963xx-imagetag", -+}; -+module_mtd_part_parser(bcm963xx_imagetag_parser); -+ -+MODULE_LICENSE("GPL"); -+MODULE_AUTHOR("Daniel Dickinson "); -+MODULE_AUTHOR("Florian Fainelli "); -+MODULE_AUTHOR("Mike Albon "); -+MODULE_AUTHOR("Jonas Gorski -Date: Wed, 28 Jun 2017 18:34:42 +0200 -Subject: [PATCH 1/2] mtd: bcm63xxpart: add of_match_table - -Signed-off-by: Jonas Gorski ---- - drivers/mtd/bcm63xxpart.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/mtd/bcm63xxpart.c -+++ b/drivers/mtd/bcm63xxpart.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ - -@@ -172,9 +173,16 @@ out: - return ret; - }; - -+static const struct of_device_id parse_bcm63xx_cfe_match_table[] = { -+ { .compatible = "brcm,bcm963xx-cfe-nor-partitions" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, parse_bcm63xx_cfe_match_table); -+ - static struct mtd_part_parser bcm63xx_cfe_parser = { - .parse_fn = bcm63xx_parse_cfe_partitions, - .name = "bcm63xxpart", -+ .of_match_table = parse_bcm63xx_cfe_match_table, - }; - module_mtd_part_parser(bcm63xx_cfe_parser); - diff --git a/target/linux/bcm63xx/patches-4.19/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch b/target/linux/bcm63xx/patches-4.19/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch deleted file mode 100644 index 04978b374e..0000000000 --- a/target/linux/bcm63xx/patches-4.19/123-mtd-parser_bcm63xx_imagetag-add-of_match_table-suppo.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3303dd9f5b197cc2efd9cbd7b9b45fc1e510a393 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Wed, 28 Jun 2017 18:37:12 +0200 -Subject: [PATCH 2/2] mtd: parser_bcm63xx_imagetag: add of_match_table support - -Signed-off-by: Jonas Gorski ---- - drivers/mtd/parsers/parser_imagetag.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/mtd/parsers/parser_imagetag.c -+++ b/drivers/mtd/parsers/parser_imagetag.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - /* Ensure strings read from flash structs are null terminated */ - #define STR_NULL_TERMINATE(x) \ -@@ -200,9 +201,16 @@ out: - return nrparts; - } - -+static const struct of_device_id parse_bcm963xx_imagetag_match_table[] = { -+ { .compatible = "brcm,bcm963xx-imagetag" }, -+ {}, -+}; -+MODULE_DEVICE_TABLE(of, parse_bcm963xx_imagetag_match_table); -+ - static struct mtd_part_parser bcm963xx_imagetag_parser = { - .parse_fn = bcm963xx_parse_imagetag_partitions, - .name = "bcm963xx-imagetag", -+ .of_match_table = parse_bcm963xx_imagetag_match_table, - }; - module_mtd_part_parser(bcm963xx_imagetag_parser); - diff --git a/target/linux/bcm63xx/patches-4.19/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch b/target/linux/bcm63xx/patches-5.4/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch rename to target/linux/bcm63xx/patches-5.4/100-MIPS-BCM63XX-add-USB-host-clock-enable-delay.patch diff --git a/target/linux/bcm63xx/patches-4.19/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch b/target/linux/bcm63xx/patches-5.4/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch rename to target/linux/bcm63xx/patches-5.4/101-MIPS-BCM63XX-add-USB-device-clock-enable-delay-to-cl.patch diff --git a/target/linux/bcm63xx/patches-4.19/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch b/target/linux/bcm63xx/patches-5.4/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch rename to target/linux/bcm63xx/patches-5.4/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch diff --git a/target/linux/bcm63xx/patches-4.19/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch b/target/linux/bcm63xx/patches-5.4/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch rename to target/linux/bcm63xx/patches-5.4/103-MIPS-BCM63XX-add-OHCI-EHCI-configuration-bits-to-com.patch diff --git a/target/linux/bcm63xx/patches-4.19/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch b/target/linux/bcm63xx/patches-5.4/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch similarity index 93% rename from target/linux/bcm63xx/patches-4.19/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch rename to target/linux/bcm63xx/patches-5.4/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch index 64ea4731a1..ec90909d13 100644 --- a/target/linux/bcm63xx/patches-4.19/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch +++ b/target/linux/bcm63xx/patches-5.4/104-MIPS-BCM63XX-introduce-BCM63XX_OHCI-configuration-sy.patch @@ -18,7 +18,7 @@ Signed-off-by: Florian Fainelli +++ b/arch/mips/bcm63xx/Kconfig @@ -7,10 +7,17 @@ config BCM63XX_CPU_3368 select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI +config BCM63XX_OHCI + bool @@ -29,7 +29,7 @@ Signed-off-by: Florian Fainelli config BCM63XX_CPU_6328 bool "support 6328 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI config BCM63XX_CPU_6338 @@ -37,25 +37,25 @@ Signed-off-by: Florian Fainelli @@ -25,21 +32,25 @@ config BCM63XX_CPU_6348 bool "support 6348 CPU" select SYS_HAS_CPU_BMIPS32_3300 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI config BCM63XX_CPU_6358 bool "support 6358 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI config BCM63XX_CPU_6362 bool "support 6362 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI config BCM63XX_CPU_6368 bool "support 6368 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI endmenu diff --git a/target/linux/bcm63xx/patches-4.19/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch b/target/linux/bcm63xx/patches-5.4/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch rename to target/linux/bcm63xx/patches-5.4/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch diff --git a/target/linux/bcm63xx/patches-4.19/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch rename to target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch diff --git a/target/linux/bcm63xx/patches-4.19/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch b/target/linux/bcm63xx/patches-5.4/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch similarity index 95% rename from target/linux/bcm63xx/patches-4.19/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch rename to target/linux/bcm63xx/patches-5.4/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch index f7311a8f83..fed826c4cd 100644 --- a/target/linux/bcm63xx/patches-4.19/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch +++ b/target/linux/bcm63xx/patches-5.4/107-MIPS-BCM63XX-introduce-BCM63XX_EHCI-configuration-sy.patch @@ -32,7 +32,7 @@ Signed-off-by: Florian Fainelli config BCM63XX_CPU_6328 bool "support 6328 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select BCM63XX_EHCI @@ -40,21 +40,21 @@ Signed-off-by: Florian Fainelli bool "support 6338 CPU" @@ -39,18 +46,21 @@ config BCM63XX_CPU_6358 select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select BCM63XX_EHCI config BCM63XX_CPU_6362 bool "support 6362 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select BCM63XX_EHCI config BCM63XX_CPU_6368 bool "support 6368 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select BCM63XX_EHCI endmenu diff --git a/target/linux/bcm63xx/patches-4.19/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch b/target/linux/bcm63xx/patches-5.4/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch rename to target/linux/bcm63xx/patches-5.4/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch diff --git a/target/linux/bcm63xx/patches-4.19/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch rename to target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch diff --git a/target/linux/bcm63xx/patches-4.19/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch b/target/linux/bcm63xx/patches-5.4/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch rename to target/linux/bcm63xx/patches-5.4/110-MIPS-BCM63XX-EHCI-controller-does-not-support-overcu.patch diff --git a/target/linux/bcm63xx/patches-4.19/130-pinctrl-add-bcm63xx-base-code.patch b/target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch similarity index 98% rename from target/linux/bcm63xx/patches-4.19/130-pinctrl-add-bcm63xx-base-code.patch rename to target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch index 19ea476ca5..559ec94c2e 100644 --- a/target/linux/bcm63xx/patches-4.19/130-pinctrl-add-bcm63xx-base-code.patch +++ b/target/linux/bcm63xx/patches-5.4/130-pinctrl-add-bcm63xx-base-code.patch @@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig -@@ -341,6 +341,7 @@ config PINCTRL_OCELOT +@@ -387,6 +387,7 @@ config PINCTRL_OCELOT source "drivers/pinctrl/actions/Kconfig" source "drivers/pinctrl/aspeed/Kconfig" source "drivers/pinctrl/bcm/Kconfig" @@ -31,7 +31,7 @@ Signed-off-by: Jonas Gorski source "drivers/pinctrl/intel/Kconfig" --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile -@@ -46,6 +46,7 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl- +@@ -50,6 +50,7 @@ obj-$(CONFIG_PINCTRL_OCELOT) += pinctrl- obj-y += actions/ obj-$(CONFIG_ARCH_ASPEED) += aspeed/ obj-y += bcm/ diff --git a/target/linux/bcm63xx/patches-4.19/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/131-Documentation-add-BCM6328-pincontroller-binding-docu.patch diff --git a/target/linux/bcm63xx/patches-4.19/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch b/target/linux/bcm63xx/patches-5.4/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch rename to target/linux/bcm63xx/patches-5.4/132-pinctrl-add-a-pincontrol-driver-for-BCM6328.patch diff --git a/target/linux/bcm63xx/patches-4.19/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/133-Documentation-add-BCM6348-pincontroller-binding-docu.patch diff --git a/target/linux/bcm63xx/patches-4.19/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch b/target/linux/bcm63xx/patches-5.4/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch rename to target/linux/bcm63xx/patches-5.4/134-pinctrl-add-a-pincontrol-driver-for-BCM6348.patch diff --git a/target/linux/bcm63xx/patches-4.19/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/135-Documentation-add-BCM6358-pincontroller-binding-docu.patch diff --git a/target/linux/bcm63xx/patches-4.19/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch b/target/linux/bcm63xx/patches-5.4/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch rename to target/linux/bcm63xx/patches-5.4/136-pinctrl-add-a-pincontrol-driver-for-BCM6358.patch diff --git a/target/linux/bcm63xx/patches-4.19/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/137-Documentation-add-BCM6362-pincontroller-binding-docu.patch diff --git a/target/linux/bcm63xx/patches-4.19/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch b/target/linux/bcm63xx/patches-5.4/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch rename to target/linux/bcm63xx/patches-5.4/138-pinctrl-add-a-pincontrol-driver-for-BCM6362.patch diff --git a/target/linux/bcm63xx/patches-4.19/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/139-Documentation-add-BCM6368-pincontroller-binding-docu.patch diff --git a/target/linux/bcm63xx/patches-4.19/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch b/target/linux/bcm63xx/patches-5.4/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch rename to target/linux/bcm63xx/patches-5.4/140-pinctrl-add-a-pincontrol-driver-for-BCM6368.patch diff --git a/target/linux/bcm63xx/patches-4.19/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch b/target/linux/bcm63xx/patches-5.4/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch rename to target/linux/bcm63xx/patches-5.4/141-Documentation-add-BCM63268-pincontroller-binding-doc.patch diff --git a/target/linux/bcm63xx/patches-4.19/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch b/target/linux/bcm63xx/patches-5.4/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch rename to target/linux/bcm63xx/patches-5.4/142-pinctrl-add-a-pincontrol-driver-for-BCM63268.patch diff --git a/target/linux/bcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/bcm63xx/patches-5.4/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch similarity index 76% rename from target/linux/bcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch rename to target/linux/bcm63xx/patches-5.4/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index 13225beae6..ea836b8a80 100644 --- a/target/linux/bcm63xx/patches-4.19/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/bcm63xx/patches-5.4/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -29,7 +29,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c -@@ -363,12 +363,15 @@ static struct gpio_desc *of_parse_own_gp +@@ -621,12 +621,15 @@ static struct gpio_desc *of_parse_own_gp /** * of_gpiochip_scan_gpios - Scan gpio-controller for gpio definitions * @chip: gpio chip to act on @@ -48,8 +48,8 @@ Signed-off-by: Jonas Gorski { struct gpio_desc *desc = NULL; struct device_node *np; -@@ -376,7 +379,7 @@ static int of_gpiochip_scan_gpios(struct - enum gpio_lookup_flags lflags; +@@ -634,7 +637,7 @@ static int of_gpiochip_scan_gpios(struct + unsigned long lflags; enum gpiod_flags dflags; unsigned int i; - int ret; @@ -57,7 +57,7 @@ Signed-off-by: Jonas Gorski for_each_available_child_of_node(chip->of_node, np) { if (!of_property_read_bool(np, "gpio-hog")) -@@ -388,6 +391,10 @@ static int of_gpiochip_scan_gpios(struct +@@ -646,6 +649,10 @@ static int of_gpiochip_scan_gpios(struct if (IS_ERR(desc)) break; @@ -68,28 +68,24 @@ Signed-off-by: Jonas Gorski ret = gpiod_hog(desc, name, lflags, dflags); if (ret < 0) { of_node_put(np); -@@ -646,12 +653,13 @@ int of_gpiochip_add(struct gpio_chip *ch +@@ -904,9 +911,11 @@ int of_gpiochip_add(struct gpio_chip *ch of_node_get(chip->of_node); -- status = of_gpiochip_scan_gpios(chip); -- if (status) { +- ret = of_gpiochip_scan_gpios(chip); +- if (ret) - of_node_put(chip->of_node); -- gpiochip_remove_pin_ranges(chip); + if (!chip->request) { -+ status = of_gpiochip_scan_gpios(chip, 0, chip->ngpio); -+ if (status) { ++ ret = of_gpiochip_scan_gpios(chip, 0, chip->ngpio); ++ if (ret) + of_node_put(chip->of_node); -+ gpiochip_remove_pin_ranges(chip); -+ } - } -- - return status; - } ++ } + return ret; + } --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c -@@ -2205,7 +2205,8 @@ int gpiochip_add_pingroup_range(struct g +@@ -2580,7 +2580,8 @@ int gpiochip_add_pingroup_range(struct g list_add_tail(&pin_range->node, &gdev->pin_ranges); @@ -99,7 +95,7 @@ Signed-off-by: Jonas Gorski } EXPORT_SYMBOL_GPL(gpiochip_add_pingroup_range); -@@ -2262,7 +2263,7 @@ int gpiochip_add_pin_range(struct gpio_c +@@ -2637,7 +2638,7 @@ int gpiochip_add_pin_range(struct gpio_c list_add_tail(&pin_range->node, &gdev->pin_ranges); @@ -108,18 +104,18 @@ Signed-off-by: Jonas Gorski } EXPORT_SYMBOL_GPL(gpiochip_add_pin_range); ---- a/drivers/gpio/gpiolib.h -+++ b/drivers/gpio/gpiolib.h -@@ -103,6 +103,8 @@ struct gpio_desc *of_get_named_gpiod_fla - const char *list_name, int index, enum of_gpio_flags *flags); +--- a/drivers/gpio/gpiolib-of.h ++++ b/drivers/gpio/gpiolib-of.h +@@ -13,6 +13,8 @@ struct gpio_desc *of_find_gpio(struct de + unsigned long *lookupflags); int of_gpiochip_add(struct gpio_chip *gc); void of_gpiochip_remove(struct gpio_chip *gc); +int of_gpiochip_scan_gpios(struct gpio_chip *chip, unsigned int start, + unsigned int num); + int of_gpio_get_count(struct device *dev, const char *con_id); + bool of_gpio_need_valid_mask(const struct gpio_chip *gc); #else - static inline struct gpio_desc *of_find_gpio(struct device *dev, - const char *con_id, -@@ -118,6 +120,12 @@ static inline struct gpio_desc *of_get_n +@@ -25,6 +27,12 @@ static inline struct gpio_desc *of_find_ } static inline int of_gpiochip_add(struct gpio_chip *gc) { return 0; } static inline void of_gpiochip_remove(struct gpio_chip *gc) { } @@ -129,6 +125,6 @@ Signed-off-by: Jonas Gorski +{ + return 0; +} - #endif /* CONFIG_OF_GPIO */ - - #ifdef CONFIG_ACPI + static inline int of_gpio_get_count(struct device *dev, const char *con_id) + { + return 0; diff --git a/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch b/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch new file mode 100644 index 0000000000..490558362b --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/144-add-removed-syscon_regmap_lookup_by_pdevname.patch @@ -0,0 +1,68 @@ +From: Adrian Schmutzler +Date: Fri, 03 Apr 2020 19:50:03 +0200 +Subject: add removed helper syscon_regmap_lookup_by_pdevname + +The helper syscon_regmap_lookup_by_pdevname has been removed in 29d14b668d2f +("mfd: Remove unused helper syscon_regmap_lookup_by_pdevname") due to lack +of users. + +Thus, we have to maintain it locally. + +This patch includes a fix due to changes in driver_find_device; +kernel commit: 92ce7e83b4e5 ("driver_find_device: Unify the match function +with class_find_device()") + +Signed-off-by: Adrian Schmutzler + +--- a/drivers/mfd/syscon.c ++++ b/drivers/mfd/syscon.c +@@ -204,6 +204,27 @@ struct regmap *syscon_regmap_lookup_by_c + } + EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_compatible); + ++static int syscon_match_pdevname(struct device *dev, const void *data) ++{ ++ return !strcmp(dev_name(dev), (const char *)data); ++} ++ ++struct regmap *syscon_regmap_lookup_by_pdevname(const char *s) ++{ ++ struct device *dev; ++ struct syscon *syscon; ++ ++ dev = driver_find_device(&syscon_driver.driver, NULL, (void *)s, ++ syscon_match_pdevname); ++ if (!dev) ++ return ERR_PTR(-EPROBE_DEFER); ++ ++ syscon = dev_get_drvdata(dev); ++ ++ return syscon->regmap; ++} ++EXPORT_SYMBOL_GPL(syscon_regmap_lookup_by_pdevname); ++ + struct regmap *syscon_regmap_lookup_by_phandle(struct device_node *np, + const char *property) + { +--- a/include/linux/mfd/syscon.h ++++ b/include/linux/mfd/syscon.h +@@ -20,6 +20,7 @@ struct device_node; + extern struct regmap *device_node_to_regmap(struct device_node *np); + extern struct regmap *syscon_node_to_regmap(struct device_node *np); + extern struct regmap *syscon_regmap_lookup_by_compatible(const char *s); ++extern struct regmap *syscon_regmap_lookup_by_pdevname(const char *s); + extern struct regmap *syscon_regmap_lookup_by_phandle( + struct device_node *np, + const char *property); +@@ -38,6 +39,11 @@ static inline struct regmap *syscon_regm + { + return ERR_PTR(-ENOTSUPP); + } ++ ++static inline struct regmap *syscon_regmap_lookup_by_pdevname(const char *s) ++{ ++ return ERR_PTR(-ENOTSUPP); ++} + + static inline struct regmap *syscon_regmap_lookup_by_phandle( + struct device_node *np, diff --git a/target/linux/bcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch b/target/linux/bcm63xx/patches-5.4/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch rename to target/linux/bcm63xx/patches-5.4/206-USB-EHCI-allow-limiting-ports-for-ehci-platform.patch diff --git a/target/linux/bcm63xx/patches-4.19/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch similarity index 99% rename from target/linux/bcm63xx/patches-4.19/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch rename to target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch index 90b1640d16..652eb6c9bf 100644 --- a/target/linux/bcm63xx/patches-4.19/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch +++ b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch @@ -19,7 +19,8 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/Makefile +++ b/arch/mips/bcm63xx/boards/Makefile -@@ -1 +1,2 @@ +@@ -1,2 +1,3 @@ + # SPDX-License-Identifier: GPL-2.0-only +obj-y += board_common.o obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c diff --git a/target/linux/bcm63xx/patches-4.19/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch rename to target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch diff --git a/target/linux/bcm63xx/patches-4.19/309-cfe_version_mod.patch b/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/309-cfe_version_mod.patch rename to target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch diff --git a/target/linux/bcm63xx/patches-4.19/310-cfe_simplify_detection.patch b/target/linux/bcm63xx/patches-5.4/310-cfe_simplify_detection.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/310-cfe_simplify_detection.patch rename to target/linux/bcm63xx/patches-5.4/310-cfe_simplify_detection.patch diff --git a/target/linux/bcm63xx/patches-4.19/311-bcm63xxpart_use_cfedetection.patch b/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch similarity index 85% rename from target/linux/bcm63xx/patches-4.19/311-bcm63xxpart_use_cfedetection.patch rename to target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch index bca6adbf3c..19ed994b85 100644 --- a/target/linux/bcm63xx/patches-4.19/311-bcm63xxpart_use_cfedetection.patch +++ b/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch @@ -1,6 +1,6 @@ ---- a/drivers/mtd/bcm63xxpart.c -+++ b/drivers/mtd/bcm63xxpart.c -@@ -35,6 +35,8 @@ +--- a/drivers/mtd/parsers/bcm63xxpart.c ++++ b/drivers/mtd/parsers/bcm63xxpart.c +@@ -21,6 +21,8 @@ #include #include #include @@ -9,7 +9,7 @@ #define BCM963XX_CFE_BLOCK_SIZE SZ_64K /* always at least 64KiB */ -@@ -46,30 +48,6 @@ +@@ -32,30 +34,6 @@ #define STR_NULL_TERMINATE(x) \ do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0) @@ -40,7 +40,7 @@ static int bcm63xx_read_nvram(struct mtd_info *master, struct bcm963xx_nvram *nvram) { -@@ -152,7 +130,7 @@ static int bcm63xx_parse_cfe_partitions( +@@ -138,7 +116,7 @@ static int bcm63xx_parse_cfe_partitions( struct bcm963xx_nvram *nvram = NULL; int ret; diff --git a/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch b/target/linux/bcm63xx/patches-5.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch similarity index 99% rename from target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch rename to target/linux/bcm63xx/patches-5.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch index b75987ef35..00bbadcb95 100644 --- a/target/linux/bcm63xx/patches-4.19/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch +++ b/target/linux/bcm63xx/patches-5.4/320-irqchip-add-support-for-bcm6345-style-periphery-irq-.patch @@ -71,7 +71,7 @@ Signed-off-by: Jonas Gorski +}; --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig -@@ -129,6 +129,10 @@ config BRCMSTB_L2_IRQ +@@ -145,6 +145,10 @@ config DAVINCI_CP_INTC select GENERIC_IRQ_CHIP select IRQ_DOMAIN @@ -84,7 +84,7 @@ Signed-off-by: Jonas Gorski select GENERIC_IRQ_CHIP --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile -@@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o +@@ -17,6 +17,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o diff --git a/target/linux/bcm63xx/patches-4.19/321-irqchip-add-support-for-bcm6345-style-external-inter.patch b/target/linux/bcm63xx/patches-5.4/321-irqchip-add-support-for-bcm6345-style-external-inter.patch similarity index 99% rename from target/linux/bcm63xx/patches-4.19/321-irqchip-add-support-for-bcm6345-style-external-inter.patch rename to target/linux/bcm63xx/patches-5.4/321-irqchip-add-support-for-bcm6345-style-external-inter.patch index 4db80ef533..9c265ade90 100644 --- a/target/linux/bcm63xx/patches-4.19/321-irqchip-add-support-for-bcm6345-style-external-inter.patch +++ b/target/linux/bcm63xx/patches-5.4/321-irqchip-add-support-for-bcm6345-style-external-inter.patch @@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski +}; --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig -@@ -129,6 +129,10 @@ config BRCMSTB_L2_IRQ +@@ -145,6 +145,10 @@ config DAVINCI_CP_INTC select GENERIC_IRQ_CHIP select IRQ_DOMAIN @@ -63,7 +63,7 @@ Signed-off-by: Jonas Gorski select IRQ_DOMAIN --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile -@@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o +@@ -17,6 +17,7 @@ obj-$(CONFIG_ARCH_MMP) += irq-mmp.o obj-$(CONFIG_IRQ_MXS) += irq-mxs.o obj-$(CONFIG_ARCH_TEGRA) += irq-tegra.o obj-$(CONFIG_ARCH_S3C24XX) += irq-s3c24xx.o diff --git a/target/linux/bcm63xx/patches-4.19/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch similarity index 99% rename from target/linux/bcm63xx/patches-4.19/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch rename to target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch index f0ffc654f7..ec978a031d 100644 --- a/target/linux/bcm63xx/patches-4.19/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch +++ b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -283,6 +283,9 @@ config BCM63XX +@@ -290,6 +290,9 @@ config BCM63XX select SYNC_R4K select DMA_NONCOHERENT select IRQ_MIPS_CPU diff --git a/target/linux/bcm63xx/patches-4.19/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch b/target/linux/bcm63xx/patches-5.4/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch rename to target/linux/bcm63xx/patches-5.4/323-MIPS-BCM63XX-wire-up-BCM6358-s-external-interrupts-4.patch diff --git a/target/linux/bcm63xx/patches-4.19/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch b/target/linux/bcm63xx/patches-5.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch rename to target/linux/bcm63xx/patches-5.4/330-MIPS-BCM63XX-add-a-new-cpu-variant-helper.patch diff --git a/target/linux/bcm63xx/patches-4.19/331-MIPS-BCM63XX-define-variant-id-field.patch b/target/linux/bcm63xx/patches-5.4/331-MIPS-BCM63XX-define-variant-id-field.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/331-MIPS-BCM63XX-define-variant-id-field.patch rename to target/linux/bcm63xx/patches-5.4/331-MIPS-BCM63XX-define-variant-id-field.patch diff --git a/target/linux/bcm63xx/patches-4.19/332-MIPS-BCM63XX-detect-BCM6328-variants.patch b/target/linux/bcm63xx/patches-5.4/332-MIPS-BCM63XX-detect-BCM6328-variants.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/332-MIPS-BCM63XX-detect-BCM6328-variants.patch rename to target/linux/bcm63xx/patches-5.4/332-MIPS-BCM63XX-detect-BCM6328-variants.patch diff --git a/target/linux/bcm63xx/patches-4.19/333-MIPS-BCM63XX-detect-BCM6362-variants.patch b/target/linux/bcm63xx/patches-5.4/333-MIPS-BCM63XX-detect-BCM6362-variants.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/333-MIPS-BCM63XX-detect-BCM6362-variants.patch rename to target/linux/bcm63xx/patches-5.4/333-MIPS-BCM63XX-detect-BCM6362-variants.patch diff --git a/target/linux/bcm63xx/patches-4.19/334-MIPS-BCM63XX-detect-BCM6368-variants.patch b/target/linux/bcm63xx/patches-5.4/334-MIPS-BCM63XX-detect-BCM6368-variants.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/334-MIPS-BCM63XX-detect-BCM6368-variants.patch rename to target/linux/bcm63xx/patches-5.4/334-MIPS-BCM63XX-detect-BCM6368-variants.patch diff --git a/target/linux/bcm63xx/patches-4.19/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch b/target/linux/bcm63xx/patches-5.4/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch rename to target/linux/bcm63xx/patches-5.4/335-MIPS-BCM63XX-fix-PCIe-memory-window-size.patch diff --git a/target/linux/bcm63xx/patches-4.19/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch b/target/linux/bcm63xx/patches-5.4/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch rename to target/linux/bcm63xx/patches-5.4/336-MIPS-BCM63XX-dynamically-set-the-pcie-memory-windows.patch diff --git a/target/linux/bcm63xx/patches-4.19/337-MIPS-BCM63XX-widen-cpuid-field.patch b/target/linux/bcm63xx/patches-5.4/337-MIPS-BCM63XX-widen-cpuid-field.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/337-MIPS-BCM63XX-widen-cpuid-field.patch rename to target/linux/bcm63xx/patches-5.4/337-MIPS-BCM63XX-widen-cpuid-field.patch diff --git a/target/linux/bcm63xx/patches-4.19/338-MIPS-BCM63XX-increase-number-of-IRQs.patch b/target/linux/bcm63xx/patches-5.4/338-MIPS-BCM63XX-increase-number-of-IRQs.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/338-MIPS-BCM63XX-increase-number-of-IRQs.patch rename to target/linux/bcm63xx/patches-5.4/338-MIPS-BCM63XX-increase-number-of-IRQs.patch diff --git a/target/linux/bcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch similarity index 98% rename from target/linux/bcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch rename to target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch index 54ec472326..efd5f10534 100644 --- a/target/linux/bcm63xx/patches-4.19/339-MIPS-BCM63XX-add-support-for-BCM63268.patch +++ b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch @@ -22,14 +22,14 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig @@ -61,6 +61,11 @@ config BCM63XX_CPU_6368 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + +config BCM63XX_CPU_63268 + bool "support 63268 CPU" + select SYS_HAS_CPU_BMIPS4350 -+ select HW_HAS_PCI ++ select HAVE_PCI endmenu source "arch/mips/bcm63xx/boards/Kconfig" @@ -260,19 +260,19 @@ Signed-off-by: Jonas Gorski break; --- a/arch/mips/bcm63xx/dev-flash.c +++ b/arch/mips/bcm63xx/dev-flash.c -@@ -94,6 +94,12 @@ static int __init bcm63xx_detect_flash_t - case STRAPBUS_6368_BOOT_SEL_PARALLEL: - return BCM63XX_FLASH_TYPE_PARALLEL; - } +@@ -84,6 +84,12 @@ static int __init bcm63xx_detect_flash_t + return BCM63XX_FLASH_TYPE_SERIAL; + else + return BCM63XX_FLASH_TYPE_NAND; + case BCM63268_CPU_ID: + val = bcm_misc_readl(MISC_STRAPBUS_63268_REG); + if (val & STRAPBUS_63268_BOOT_SEL_SERIAL) + return BCM63XX_FLASH_TYPE_SERIAL; + else + return BCM63XX_FLASH_TYPE_NAND; - default: - return -EINVAL; - } + case BCM6368_CPU_ID: + val = bcm_gpio_readl(GPIO_STRAPBUS_REG); + switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { --- a/arch/mips/bcm63xx/dev-spi.c +++ b/arch/mips/bcm63xx/dev-spi.c @@ -51,7 +51,7 @@ int __init bcm63xx_spi_register(void) diff --git a/target/linux/bcm63xx/patches-4.19/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch b/target/linux/bcm63xx/patches-5.4/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch rename to target/linux/bcm63xx/patches-5.4/340-MIPS-BCM63XX-add-pcie-support-for-BCM63268.patch diff --git a/target/linux/bcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch similarity index 98% rename from target/linux/bcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch rename to target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch index b6119e91e4..5b05fa6bd5 100644 --- a/target/linux/bcm63xx/patches-4.19/341-MIPS-BCM63XX-add-support-for-BCM6318.patch +++ b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch @@ -28,7 +28,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 +config BCM63XX_CPU_6318 + bool "support 6318 CPU" + select SYS_HAS_CPU_BMIPS32_3300 -+ select HW_HAS_PCI ++ select HAVE_PCI + config BCM63XX_CPU_6328 bool "support 6328 CPU" @@ -124,7 +124,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 static unsigned int detect_cpu_clock(void) { u32 cpu_id = bcm63xx_get_cpu_id(); -@@ -142,6 +154,28 @@ static unsigned int detect_cpu_clock(voi +@@ -142,6 +154,30 @@ static unsigned int detect_cpu_clock(voi case BCM3368_CPU_ID: return 300000000; @@ -148,12 +148,14 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 + return 250000000; + case 3: + return 333000000; -+ }; ++ default: ++ return 320000000; ++ } + } case BCM6328_CPU_ID: { unsigned int tmp, mips_pll_fcvo; -@@ -297,6 +331,13 @@ static unsigned int detect_memory_size(v +@@ -297,6 +333,13 @@ static unsigned int detect_memory_size(v unsigned int cols = 0, rows = 0, is_32bits = 0, banks = 0; u32 val; @@ -167,7 +169,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 if (BCMCPU_IS_6328() || BCMCPU_IS_6362() || BCMCPU_IS_63268()) return bcm_ddr_readl(DDR_CSEND_REG) << 24; -@@ -343,6 +384,12 @@ void __init bcm63xx_cpu_init(void) +@@ -343,6 +386,12 @@ void __init bcm63xx_cpu_init(void) switch (current_cpu_type()) { case CPU_BMIPS3300: @@ -180,7 +182,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 if ((read_c0_prid() & PRID_IMP_MASK) != PRID_IMP_BMIPS3300_ALT) __cpu_name[cpu] = "Broadcom BCM6338"; /* fall-through */ -@@ -390,6 +437,10 @@ void __init bcm63xx_cpu_init(void) +@@ -390,6 +439,10 @@ void __init bcm63xx_cpu_init(void) bcm63xx_cpu_variant = bcm63xx_cpu_id; switch (bcm63xx_cpu_id) { diff --git a/target/linux/bcm63xx/patches-4.19/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch b/target/linux/bcm63xx/patches-5.4/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch rename to target/linux/bcm63xx/patches-5.4/342-MIPS-BCM63XX-split-PCIe-reset-signals.patch diff --git a/target/linux/bcm63xx/patches-4.19/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch b/target/linux/bcm63xx/patches-5.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch similarity index 98% rename from target/linux/bcm63xx/patches-4.19/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch rename to target/linux/bcm63xx/patches-5.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch index 3d9835df2c..1ebb451b59 100644 --- a/target/linux/bcm63xx/patches-4.19/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch +++ b/target/linux/bcm63xx/patches-5.4/343-MIPS-BCM63XX-add-PCIe-support-for-BCM6318.patch @@ -146,7 +146,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318 * _REG relative to RSET_OTP --- a/arch/mips/pci/ops-bcm63xx.c +++ b/arch/mips/pci/ops-bcm63xx.c -@@ -488,8 +488,12 @@ static int bcm63xx_pcie_read(struct pci_ +@@ -489,8 +489,12 @@ static int bcm63xx_pcie_read(struct pci_ if (!bcm63xx_pcie_can_access(bus, devfn)) return PCIBIOS_DEVICE_NOT_FOUND; @@ -161,7 +161,7 @@ Subject: [PATCH 53/53] MIPS: BCM63XX: add PCIe support for BCM6318 data = bcm_pcie_readl(reg); -@@ -508,8 +512,12 @@ static int bcm63xx_pcie_write(struct pci +@@ -509,8 +513,12 @@ static int bcm63xx_pcie_write(struct pci if (!bcm63xx_pcie_can_access(bus, devfn)) return PCIBIOS_DEVICE_NOT_FOUND; diff --git a/target/linux/bcm63xx/patches-4.19/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch b/target/linux/bcm63xx/patches-5.4/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch similarity index 96% rename from target/linux/bcm63xx/patches-4.19/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch rename to target/linux/bcm63xx/patches-5.4/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch index 298fffdfa1..cbe095c038 100644 --- a/target/linux/bcm63xx/patches-4.19/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch +++ b/target/linux/bcm63xx/patches-5.4/344-MIPS-BCM63XX-detect-flash-type-early-and-store-the-r.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski static struct mtd_partition mtd_partitions[] = { { .name = "cfe", -@@ -108,13 +110,15 @@ static int __init bcm63xx_detect_flash_t +@@ -109,13 +111,15 @@ static int __init bcm63xx_detect_flash_t } } diff --git a/target/linux/bcm63xx/patches-4.19/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch b/target/linux/bcm63xx/patches-5.4/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch similarity index 97% rename from target/linux/bcm63xx/patches-4.19/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch rename to target/linux/bcm63xx/patches-5.4/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch index 329a156fe1..91dae6e3d8 100644 --- a/target/linux/bcm63xx/patches-4.19/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch +++ b/target/linux/bcm63xx/patches-5.4/345-MIPS-BCM63XX-fixup-mapped-SPI-flash-access-on-boot.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski #include #include -@@ -110,9 +111,59 @@ static int __init bcm63xx_detect_flash_t +@@ -111,9 +112,59 @@ static int __init bcm63xx_detect_flash_t } } diff --git a/target/linux/bcm63xx/patches-4.19/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch b/target/linux/bcm63xx/patches-5.4/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch rename to target/linux/bcm63xx/patches-5.4/346-MIPS-BCM63XX-USB-ENETSW-6318-clocks.patch diff --git a/target/linux/bcm63xx/patches-4.19/347-MIPS-BCM6318-USB-support.patch b/target/linux/bcm63xx/patches-5.4/347-MIPS-BCM6318-USB-support.patch similarity index 99% rename from target/linux/bcm63xx/patches-4.19/347-MIPS-BCM6318-USB-support.patch rename to target/linux/bcm63xx/patches-5.4/347-MIPS-BCM6318-USB-support.patch index 92c37c130f..15d4679670 100644 --- a/target/linux/bcm63xx/patches-4.19/347-MIPS-BCM6318-USB-support.patch +++ b/target/linux/bcm63xx/patches-5.4/347-MIPS-BCM6318-USB-support.patch @@ -116,7 +116,7 @@ @@ -23,6 +23,8 @@ config BCM63XX_CPU_6318 bool "support 6318 CPU" select SYS_HAS_CPU_BMIPS32_3300 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI + select BCM63XX_EHCI diff --git a/target/linux/bcm63xx/patches-4.19/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch b/target/linux/bcm63xx/patches-5.4/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch rename to target/linux/bcm63xx/patches-5.4/348-MIPS-BCM63XX-fix-BCM63268-USB-clock.patch diff --git a/target/linux/bcm63xx/patches-4.19/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch b/target/linux/bcm63xx/patches-5.4/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch similarity index 99% rename from target/linux/bcm63xx/patches-4.19/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch rename to target/linux/bcm63xx/patches-5.4/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch index 41f48b93da..3f98ddfdc3 100644 --- a/target/linux/bcm63xx/patches-4.19/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch +++ b/target/linux/bcm63xx/patches-5.4/349-MIPS-BCM63XX-add-BCM63268-USB-support.patch @@ -26,7 +26,7 @@ @@ -73,6 +73,8 @@ config BCM63XX_CPU_63268 bool "support 63268 CPU" select SYS_HAS_CPU_BMIPS4350 - select HW_HAS_PCI + select HAVE_PCI + select BCM63XX_OHCI + select BCM63XX_EHCI endmenu diff --git a/target/linux/bcm63xx/patches-4.19/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch b/target/linux/bcm63xx/patches-5.4/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch rename to target/linux/bcm63xx/patches-5.4/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch diff --git a/target/linux/bcm63xx/patches-4.19/351-set-board-usbh-ports.patch b/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/351-set-board-usbh-ports.patch rename to target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch diff --git a/target/linux/bcm63xx/patches-4.19/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch similarity index 98% rename from target/linux/bcm63xx/patches-4.19/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch rename to target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch index deca2260f1..51908d99d2 100644 --- a/target/linux/bcm63xx/patches-4.19/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch +++ b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch @@ -27,7 +27,7 @@ Signed-off-by: Jonas Gorski - default BOARD_BCM963XX config BOARD_BCM963XX - bool "Generic Broadcom 963xx boards" + bool "Generic Broadcom 963xx boards" select SSB + default y diff --git a/target/linux/bcm63xx/patches-4.19/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch b/target/linux/bcm63xx/patches-5.4/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch similarity index 96% rename from target/linux/bcm63xx/patches-4.19/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch rename to target/linux/bcm63xx/patches-5.4/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch index 846f0b81df..bf1c4a2842 100644 --- a/target/linux/bcm63xx/patches-4.19/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch +++ b/target/linux/bcm63xx/patches-5.4/355-MIPS-BCM63XX-allow-board-implementations-to-force-fl.patch @@ -27,7 +27,7 @@ Signed-off-by: Jonas Gorski static int __init bcm63xx_detect_flash_type(void) { u32 val; -@@ -172,12 +178,15 @@ int __init bcm63xx_flash_register(void) +@@ -173,12 +179,15 @@ int __init bcm63xx_flash_register(void) switch (flash_type) { case BCM63XX_FLASH_TYPE_PARALLEL: diff --git a/target/linux/bcm63xx/patches-4.19/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch b/target/linux/bcm63xx/patches-5.4/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch rename to target/linux/bcm63xx/patches-5.4/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch diff --git a/target/linux/bcm63xx/patches-4.19/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch b/target/linux/bcm63xx/patches-5.4/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch rename to target/linux/bcm63xx/patches-5.4/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch diff --git a/target/linux/bcm63xx/patches-4.19/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch b/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch rename to target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch diff --git a/target/linux/bcm63xx/patches-4.19/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch b/target/linux/bcm63xx/patches-5.4/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch rename to target/linux/bcm63xx/patches-5.4/359-MIPS-BCM63XX-allow-different-types-of-sprom.patch diff --git a/target/linux/bcm63xx/patches-4.19/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch b/target/linux/bcm63xx/patches-5.4/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch rename to target/linux/bcm63xx/patches-5.4/360-MIPS-BCM63XX-add-support-for-raw-sproms.patch diff --git a/target/linux/bcm63xx/patches-4.19/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch b/target/linux/bcm63xx/patches-5.4/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch rename to target/linux/bcm63xx/patches-5.4/361-MIPS-BCM63XX-add-raw-fallback-sproms-for-most-common.patch diff --git a/target/linux/bcm63xx/patches-4.19/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch b/target/linux/bcm63xx/patches-5.4/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch similarity index 98% rename from target/linux/bcm63xx/patches-4.19/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch rename to target/linux/bcm63xx/patches-5.4/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch index 11153c1b19..24ae8c35c7 100644 --- a/target/linux/bcm63xx/patches-4.19/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch +++ b/target/linux/bcm63xx/patches-5.4/362-MIPS-BCM63XX-also-register-a-fallback-sprom-for-bcma.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski +++ b/arch/mips/bcm63xx/boards/Kconfig @@ -5,6 +5,7 @@ menu "Board support" config BOARD_BCM963XX - bool "Generic Broadcom 963xx boards" + bool "Generic Broadcom 963xx boards" select SSB + select BCMA default y diff --git a/target/linux/bcm63xx/patches-4.19/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch b/target/linux/bcm63xx/patches-5.4/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch rename to target/linux/bcm63xx/patches-5.4/363-MIPS-BCM63XX-add-BCMA-based-sprom-templates.patch diff --git a/target/linux/bcm63xx/patches-4.19/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch b/target/linux/bcm63xx/patches-5.4/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch rename to target/linux/bcm63xx/patches-5.4/364-MIPS-BCM63XX-allow-board-files-to-provide-sprom-fixu.patch diff --git a/target/linux/bcm63xx/patches-4.19/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch b/target/linux/bcm63xx/patches-5.4/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch rename to target/linux/bcm63xx/patches-5.4/365-MIPS-BCM63XX-allow-setting-a-pci-bus-device-for-fall.patch diff --git a/target/linux/bcm63xx/patches-4.19/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch b/target/linux/bcm63xx/patches-5.4/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch similarity index 97% rename from target/linux/bcm63xx/patches-4.19/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch rename to target/linux/bcm63xx/patches-5.4/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch index a49181640c..fee5f769b1 100644 --- a/target/linux/bcm63xx/patches-4.19/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch +++ b/target/linux/bcm63xx/patches-5.4/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch @@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski + select USE_OF + config BOARD_BCM963XX - bool "Generic Broadcom 963xx boards" + bool "Generic Broadcom 963xx boards" select SSB --- a/arch/mips/bcm63xx/boards/board_common.c +++ b/arch/mips/bcm63xx/boards/board_common.c @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski @@ -8,6 +8,7 @@ #include - #include + #include +#include #include #include diff --git a/target/linux/bcm63xx/patches-4.19/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch rename to target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch diff --git a/target/linux/bcm63xx/patches-4.19/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch b/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch rename to target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch diff --git a/target/linux/bcm63xx/patches-4.19/371_add_of_node_available_by_alias.patch b/target/linux/bcm63xx/patches-5.4/371_add_of_node_available_by_alias.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/371_add_of_node_available_by_alias.patch rename to target/linux/bcm63xx/patches-5.4/371_add_of_node_available_by_alias.patch diff --git a/target/linux/bcm63xx/patches-4.19/372_dont_register_pflash_when_available_in_dtb.patch b/target/linux/bcm63xx/patches-5.4/372_dont_register_pflash_when_available_in_dtb.patch similarity index 89% rename from target/linux/bcm63xx/patches-4.19/372_dont_register_pflash_when_available_in_dtb.patch rename to target/linux/bcm63xx/patches-5.4/372_dont_register_pflash_when_available_in_dtb.patch index 25384ebb68..af0800f5aa 100644 --- a/target/linux/bcm63xx/patches-4.19/372_dont_register_pflash_when_available_in_dtb.patch +++ b/target/linux/bcm63xx/patches-5.4/372_dont_register_pflash_when_available_in_dtb.patch @@ -9,7 +9,7 @@ static int flash_type; static struct mtd_partition mtd_partitions[] = { -@@ -178,6 +180,9 @@ int __init bcm63xx_flash_register(void) +@@ -179,6 +181,9 @@ int __init bcm63xx_flash_register(void) switch (flash_type) { case BCM63XX_FLASH_TYPE_PARALLEL: diff --git a/target/linux/bcm63xx/patches-4.19/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch b/target/linux/bcm63xx/patches-5.4/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch rename to target/linux/bcm63xx/patches-5.4/373-MIPS-BCM63XX-register-interrupt-controllers-through-.patch diff --git a/target/linux/bcm63xx/patches-4.19/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch b/target/linux/bcm63xx/patches-5.4/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch similarity index 91% rename from target/linux/bcm63xx/patches-4.19/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch rename to target/linux/bcm63xx/patches-5.4/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch index 6307d56407..56317410c1 100644 --- a/target/linux/bcm63xx/patches-4.19/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch +++ b/target/linux/bcm63xx/patches-5.4/374-gpio-add-a-simple-GPIO-driver-for-bcm63xx.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig -@@ -151,6 +151,13 @@ config GPIO_BCM_KONA +@@ -147,6 +147,13 @@ config GPIO_BCM_KONA help Turn on GPIO support for Broadcom "Kona" chips. @@ -30,14 +30,14 @@ Signed-off-by: Jonas Gorski default y if (ARCH_BRCMSTB || BMIPS_GENERIC) --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile -@@ -34,6 +34,7 @@ obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o - obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o - obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o - obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o -+obj-$(CONFIG_GPIO_BCM63XX) += gpio-bcm63xx.o - obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o - obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o - obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o +@@ -34,6 +34,7 @@ obj-$(CONFIG_GPIO_ARIZONA) += gpio-ariz + obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o + obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o + obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o ++obj-$(CONFIG_GPIO_BCM63XX) += gpio-bcm63xx.o + obj-$(CONFIG_GPIO_BD70528) += gpio-bd70528.o + obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o + obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o --- /dev/null +++ b/drivers/gpio/gpio-bcm63xx.c @@ -0,0 +1,135 @@ diff --git a/target/linux/bcm63xx/patches-4.19/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch b/target/linux/bcm63xx/patches-5.4/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch rename to target/linux/bcm63xx/patches-5.4/375-MIPS-BCM63XX-switch-to-new-gpio-driver.patch diff --git a/target/linux/bcm63xx/patches-4.19/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch b/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch rename to target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch diff --git a/target/linux/bcm63xx/patches-4.19/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch b/target/linux/bcm63xx/patches-5.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch rename to target/linux/bcm63xx/patches-5.4/378-MIPS-BCM63XX-do-not-register-gpio-controller-if-pres.patch diff --git a/target/linux/bcm63xx/patches-4.19/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch b/target/linux/bcm63xx/patches-5.4/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch rename to target/linux/bcm63xx/patches-5.4/379-MIPS-BCM63XX-provide-a-gpio-lookup-for-the-pcmcia-re.patch diff --git a/target/linux/bcm63xx/patches-4.19/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch b/target/linux/bcm63xx/patches-5.4/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch rename to target/linux/bcm63xx/patches-5.4/380-pcmcia-bcm63xx_pmcia-use-the-new-named-gpio.patch diff --git a/target/linux/bcm63xx/patches-4.19/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch b/target/linux/bcm63xx/patches-5.4/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch rename to target/linux/bcm63xx/patches-5.4/381-Documentation-add-BCM6318-pincontroller-binding-docu.patch diff --git a/target/linux/bcm63xx/patches-4.19/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch b/target/linux/bcm63xx/patches-5.4/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch rename to target/linux/bcm63xx/patches-5.4/382-pinctrl-add-a-pincontrol-driver-for-BCM6318.patch diff --git a/target/linux/bcm63xx/patches-4.19/383-bcm63xx_select_pinctrl.patch b/target/linux/bcm63xx/patches-5.4/383-bcm63xx_select_pinctrl.patch similarity index 90% rename from target/linux/bcm63xx/patches-4.19/383-bcm63xx_select_pinctrl.patch rename to target/linux/bcm63xx/patches-5.4/383-bcm63xx_select_pinctrl.patch index 67c8cee22c..cf655f55cc 100644 --- a/target/linux/bcm63xx/patches-4.19/383-bcm63xx_select_pinctrl.patch +++ b/target/linux/bcm63xx/patches-5.4/383-bcm63xx_select_pinctrl.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/Kconfig +++ b/arch/mips/bcm63xx/Kconfig @@ -25,6 +25,8 @@ config BCM63XX_CPU_6318 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -10,7 +10,7 @@ config BCM63XX_CPU_6328 bool "support 6328 CPU" @@ -32,6 +34,8 @@ config BCM63XX_CPU_6328 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -20,7 +20,7 @@ bool "support 6338 CPU" @@ -47,6 +51,8 @@ config BCM63XX_CPU_6348 select SYS_HAS_CPU_BMIPS32_3300 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI + select PINCTRL + select PINCTRL_BCM6348 @@ -28,7 +28,7 @@ config BCM63XX_CPU_6358 bool "support 6358 CPU" @@ -54,6 +60,8 @@ config BCM63XX_CPU_6358 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -37,7 +37,7 @@ config BCM63XX_CPU_6362 bool "support 6362 CPU" @@ -61,6 +69,8 @@ config BCM63XX_CPU_6362 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -46,7 +46,7 @@ config BCM63XX_CPU_6368 bool "support 6368 CPU" @@ -68,6 +78,8 @@ config BCM63XX_CPU_6368 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL @@ -55,7 +55,7 @@ config BCM63XX_CPU_63268 bool "support 63268 CPU" @@ -75,6 +87,8 @@ config BCM63XX_CPU_63268 - select HW_HAS_PCI + select HAVE_PCI select BCM63XX_OHCI select BCM63XX_EHCI + select PINCTRL diff --git a/target/linux/bcm63xx/patches-4.19/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch b/target/linux/bcm63xx/patches-5.4/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch rename to target/linux/bcm63xx/patches-5.4/389-MIPS-BCM63XX-add-clkdev-lookups-for-device-tree.patch diff --git a/target/linux/bcm63xx/patches-4.19/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch b/target/linux/bcm63xx/patches-5.4/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch rename to target/linux/bcm63xx/patches-5.4/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch diff --git a/target/linux/bcm63xx/patches-4.19/391-MIPS-BCM63XX-do-not-register-uart.patch b/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/391-MIPS-BCM63XX-do-not-register-uart.patch rename to target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch diff --git a/target/linux/bcm63xx/patches-4.19/392-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/392-MIPS-BCM63XX-remove-leds-and-buttons.patch rename to target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch diff --git a/target/linux/bcm63xx/patches-4.19/400-bcm963xx_flashmap.patch b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch similarity index 87% rename from target/linux/bcm63xx/patches-4.19/400-bcm963xx_flashmap.patch rename to target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch index c693ace363..b80f096413 100644 --- a/target/linux/bcm63xx/patches-4.19/400-bcm963xx_flashmap.patch +++ b/target/linux/bcm63xx/patches-5.4/400-bcm963xx_flashmap.patch @@ -21,9 +21,9 @@ Signed-off-by: Axel Gembe static struct physmap_flash_data flash_data = { .width = 2, ---- a/drivers/mtd/redboot.c -+++ b/drivers/mtd/redboot.c -@@ -72,6 +72,7 @@ static int parse_redboot_partitions(stru +--- a/drivers/mtd/parsers/redboot.c ++++ b/drivers/mtd/parsers/redboot.c +@@ -79,6 +79,7 @@ static int parse_redboot_partitions(stru int nulllen = 0; int numslots; unsigned long offset; @@ -31,7 +31,7 @@ Signed-off-by: Axel Gembe #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED static char nullstring[] = "unallocated"; #endif -@@ -176,6 +177,16 @@ static int parse_redboot_partitions(stru +@@ -185,6 +186,16 @@ static int parse_redboot_partitions(stru goto out; } @@ -48,7 +48,7 @@ Signed-off-by: Axel Gembe for (i = 0; i < numslots; i++) { struct fis_list *new_fl, **prev; -@@ -196,10 +207,10 @@ static int parse_redboot_partitions(stru +@@ -205,10 +216,10 @@ static int parse_redboot_partitions(stru goto out; } new_fl->img = &buf[i]; diff --git a/target/linux/bcm63xx/patches-4.19/401-bcm963xx_real_rootfs_length.patch b/target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch similarity index 92% rename from target/linux/bcm63xx/patches-4.19/401-bcm963xx_real_rootfs_length.patch rename to target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch index efefba41b5..e92ec2d94c 100644 --- a/target/linux/bcm63xx/patches-4.19/401-bcm963xx_real_rootfs_length.patch +++ b/target/linux/bcm63xx/patches-5.4/401-bcm963xx_real_rootfs_length.patch @@ -15,7 +15,7 @@ /* 240-255: Unused at present */ --- a/drivers/mtd/parsers/parser_imagetag.c +++ b/drivers/mtd/parsers/parser_imagetag.c -@@ -137,7 +137,8 @@ static int bcm963xx_parse_imagetag_parti +@@ -132,7 +132,8 @@ static int bcm963xx_parse_imagetag_parti } else { /* OpenWrt layout */ rootfsaddr = kerneladdr + kernellen; diff --git a/target/linux/bcm63xx/patches-4.19/402_bcm63xx_enet_vlan_incoming_fixed.patch b/target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch similarity index 82% rename from target/linux/bcm63xx/patches-4.19/402_bcm63xx_enet_vlan_incoming_fixed.patch rename to target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch index c3b5778e0a..389e3f71bb 100644 --- a/target/linux/bcm63xx/patches-4.19/402_bcm63xx_enet_vlan_incoming_fixed.patch +++ b/target/linux/bcm63xx/patches-5.4/402_bcm63xx_enet_vlan_incoming_fixed.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -1634,7 +1634,7 @@ static int bcm_enet_change_mtu(struct ne +@@ -1612,7 +1612,7 @@ static int bcm_enet_change_mtu(struct ne return -EBUSY; /* add ethernet header + vlan tag size */ diff --git a/target/linux/bcm63xx/patches-4.19/403-6358-enet1-external-mii-clk.patch b/target/linux/bcm63xx/patches-5.4/403-6358-enet1-external-mii-clk.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/403-6358-enet1-external-mii-clk.patch rename to target/linux/bcm63xx/patches-5.4/403-6358-enet1-external-mii-clk.patch diff --git a/target/linux/bcm63xx/patches-4.19/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch b/target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch similarity index 78% rename from target/linux/bcm63xx/patches-4.19/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch rename to target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch index e30bd5b107..11059b3bb0 100644 --- a/target/linux/bcm63xx/patches-4.19/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch +++ b/target/linux/bcm63xx/patches-5.4/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch @@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -867,10 +867,8 @@ static int bcm_enet_open(struct net_devi +@@ -854,10 +854,8 @@ static int bcm_enet_open(struct net_devi struct bcm_enet_priv *priv; struct sockaddr addr; struct device *kdev; @@ -26,7 +26,7 @@ Signed-off-by: Jonas Gorski void *p; u32 val; -@@ -878,40 +876,10 @@ static int bcm_enet_open(struct net_devi +@@ -865,31 +863,10 @@ static int bcm_enet_open(struct net_devi kdev = &priv->pdev->dev; if (priv->has_phy) { @@ -43,19 +43,10 @@ Signed-off-by: Jonas Gorski - } - - /* mask with MAC supported features */ -- phydev->supported &= (SUPPORTED_10baseT_Half | -- SUPPORTED_10baseT_Full | -- SUPPORTED_100baseT_Half | -- SUPPORTED_100baseT_Full | -- SUPPORTED_Autoneg | -- SUPPORTED_Pause | -- SUPPORTED_MII); -- phydev->advertising = phydev->supported; -- -- if (priv->pause_auto && priv->pause_rx && priv->pause_tx) -- phydev->advertising |= SUPPORTED_Pause; -- else -- phydev->advertising &= ~SUPPORTED_Pause; +- phy_support_sym_pause(phydev); +- phy_set_max_speed(phydev, SPEED_100); +- phy_set_sym_pause(phydev, priv->pause_rx, priv->pause_rx, +- priv->pause_auto); - - phy_attached_info(phydev); - @@ -68,7 +59,7 @@ Signed-off-by: Jonas Gorski } /* mask all interrupts and request them */ -@@ -921,7 +889,7 @@ static int bcm_enet_open(struct net_devi +@@ -899,7 +876,7 @@ static int bcm_enet_open(struct net_devi ret = request_irq(dev->irq, bcm_enet_isr_mac, 0, dev->name, dev); if (ret) @@ -77,7 +68,7 @@ Signed-off-by: Jonas Gorski ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, 0, dev->name, dev); -@@ -1083,8 +1051,8 @@ static int bcm_enet_open(struct net_devi +@@ -1061,8 +1038,8 @@ static int bcm_enet_open(struct net_devi enet_dmac_writel(priv, priv->dma_chan_int_mask, ENETDMAC_IRMASK, priv->tx_chan); @@ -88,7 +79,7 @@ Signed-off-by: Jonas Gorski else bcm_enet_adjust_link(dev); -@@ -1125,10 +1093,6 @@ out_freeirq_rx: +@@ -1103,10 +1080,6 @@ out_freeirq_rx: out_freeirq: free_irq(dev->irq, dev); @@ -99,7 +90,7 @@ Signed-off-by: Jonas Gorski return ret; } -@@ -1233,10 +1197,6 @@ static int bcm_enet_stop(struct net_devi +@@ -1211,10 +1184,6 @@ static int bcm_enet_stop(struct net_devi free_irq(priv->irq_rx, dev); free_irq(dev->irq, dev); @@ -110,7 +101,7 @@ Signed-off-by: Jonas Gorski return 0; } -@@ -1802,14 +1762,47 @@ static int bcm_enet_probe(struct platfor +@@ -1779,14 +1748,47 @@ static int bcm_enet_probe(struct platfor /* do minimal hardware init to be able to probe mii bus */ bcm_enet_hw_preinit(priv); @@ -159,7 +150,7 @@ Signed-off-by: Jonas Gorski } bus = priv->mii_bus; -@@ -1833,6 +1826,35 @@ static int bcm_enet_probe(struct platfor +@@ -1810,6 +1812,26 @@ static int bcm_enet_probe(struct platfor dev_err(&pdev->dev, "unable to register mdio bus\n"); goto out_free_mdio; } @@ -177,25 +168,16 @@ Signed-off-by: Jonas Gorski + } + + /* mask with MAC supported features */ -+ phydev->supported &= (SUPPORTED_10baseT_Half | -+ SUPPORTED_10baseT_Full | -+ SUPPORTED_100baseT_Half | -+ SUPPORTED_100baseT_Full | -+ SUPPORTED_Autoneg | -+ SUPPORTED_Pause | -+ SUPPORTED_MII); -+ phydev->advertising = phydev->supported; -+ -+ if (priv->pause_auto && priv->pause_rx && priv->pause_tx) -+ phydev->advertising |= SUPPORTED_Pause; -+ else -+ phydev->advertising &= ~SUPPORTED_Pause; ++ phy_support_sym_pause(phydev); ++ phy_set_max_speed(phydev, SPEED_100); ++ phy_set_sym_pause(phydev, priv->pause_rx, priv->pause_rx, ++ priv->pause_auto); + + phy_attached_info(phydev); } else { /* run platform code to initialize PHY device */ -@@ -1840,45 +1862,16 @@ static int bcm_enet_probe(struct platfor +@@ -1817,45 +1839,16 @@ static int bcm_enet_probe(struct platfor pd->mii_config(dev, 1, bcm_enet_mdio_read_mii, bcm_enet_mdio_write_mii)) { dev_err(&pdev->dev, "unable to configure mdio bus\n"); @@ -245,7 +227,7 @@ Signed-off-by: Jonas Gorski if (priv->mii_bus) mdiobus_unregister(priv->mii_bus); -@@ -1886,6 +1879,9 @@ out_free_mdio: +@@ -1863,6 +1856,9 @@ out_free_mdio: if (priv->mii_bus) mdiobus_free(priv->mii_bus); @@ -255,7 +237,7 @@ Signed-off-by: Jonas Gorski out_uninit_hw: /* turn off mdc clock */ enet_writel(priv, 0, ENET_MIISC_REG); -@@ -1916,6 +1912,7 @@ static int bcm_enet_remove(struct platfo +@@ -1893,6 +1889,7 @@ static int bcm_enet_remove(struct platfo enet_writel(priv, 0, ENET_MIISC_REG); if (priv->has_phy) { diff --git a/target/linux/bcm63xx/patches-4.19/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch b/target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch similarity index 96% rename from target/linux/bcm63xx/patches-4.19/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch rename to target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch index 86940ae14d..703b83a897 100644 --- a/target/linux/bcm63xx/patches-4.19/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch +++ b/target/linux/bcm63xx/patches-5.4/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch @@ -32,7 +32,7 @@ Subject: [PATCH 54/81] bcm63xx_enet: enable rgmii clock on external ports #define ENETSW_MDIOC_EXT_MASK (1 << 16) --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2185,6 +2185,18 @@ static int bcm_enetsw_open(struct net_de +@@ -2162,6 +2162,18 @@ static int bcm_enetsw_open(struct net_de priv->sw_port_link[i] = 0; } diff --git a/target/linux/bcm63xx/patches-4.19/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch similarity index 94% rename from target/linux/bcm63xx/patches-4.19/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch rename to target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch index a91494db41..7912c26696 100644 --- a/target/linux/bcm63xx/patches-4.19/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch +++ b/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch @@ -79,7 +79,7 @@ Signed-off-by: Jonas Gorski if (val & STRAPBUS_6328_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else -@@ -94,12 +138,20 @@ static int __init bcm63xx_detect_flash_t +@@ -94,18 +138,31 @@ static int __init bcm63xx_detect_flash_t return BCM63XX_FLASH_TYPE_SERIAL; case BCM6362_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_6362_REG); @@ -92,16 +92,6 @@ Signed-off-by: Jonas Gorski return BCM63XX_FLASH_TYPE_SERIAL; else return BCM63XX_FLASH_TYPE_NAND; - case BCM6368_CPU_ID: - val = bcm_gpio_readl(GPIO_STRAPBUS_REG); -+ if (val & STRAPBUS_6368_SPI_CLK_FAST) -+ bcm63xx_spi_flash_info[0].max_speed_hz = 20000000; -+ - switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { - case STRAPBUS_6368_BOOT_SEL_NAND: - return BCM63XX_FLASH_TYPE_NAND; -@@ -110,6 +162,11 @@ static int __init bcm63xx_detect_flash_t - } case BCM63268_CPU_ID: val = bcm_misc_readl(MISC_STRAPBUS_63268_REG); + if (val & STRAPBUS_63268_HSSPI_CLK_FAST) @@ -112,7 +102,16 @@ Signed-off-by: Jonas Gorski if (val & STRAPBUS_63268_BOOT_SEL_SERIAL) return BCM63XX_FLASH_TYPE_SERIAL; else -@@ -176,6 +233,7 @@ void __init bcm63xx_flash_detect(void) + return BCM63XX_FLASH_TYPE_NAND; + case BCM6368_CPU_ID: + val = bcm_gpio_readl(GPIO_STRAPBUS_REG); ++ if (val & STRAPBUS_6368_SPI_CLK_FAST) ++ bcm63xx_spi_flash_info[0].max_speed_hz = 20000000; ++ + switch (val & STRAPBUS_6368_BOOT_SEL_MASK) { + case STRAPBUS_6368_BOOT_SEL_NAND: + return BCM63XX_FLASH_TYPE_NAND; +@@ -177,6 +234,7 @@ void __init bcm63xx_flash_detect(void) int __init bcm63xx_flash_register(void) { @@ -120,7 +119,7 @@ Signed-off-by: Jonas Gorski u32 val; switch (flash_type) { -@@ -195,8 +253,14 @@ int __init bcm63xx_flash_register(void) +@@ -196,8 +254,14 @@ int __init bcm63xx_flash_register(void) return platform_device_register(&mtd_dev); case BCM63XX_FLASH_TYPE_SERIAL: diff --git a/target/linux/bcm63xx/patches-4.19/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/bcm63xx/patches-5.4/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch rename to target/linux/bcm63xx/patches-5.4/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch diff --git a/target/linux/bcm63xx/patches-4.19/415-MIPS-BCM63XX-export-the-attached-flash-type.patch b/target/linux/bcm63xx/patches-5.4/415-MIPS-BCM63XX-export-the-attached-flash-type.patch similarity index 93% rename from target/linux/bcm63xx/patches-4.19/415-MIPS-BCM63XX-export-the-attached-flash-type.patch rename to target/linux/bcm63xx/patches-5.4/415-MIPS-BCM63XX-export-the-attached-flash-type.patch index 9fbfae4a06..729430325a 100644 --- a/target/linux/bcm63xx/patches-4.19/415-MIPS-BCM63XX-export-the-attached-flash-type.patch +++ b/target/linux/bcm63xx/patches-5.4/415-MIPS-BCM63XX-export-the-attached-flash-type.patch @@ -11,7 +11,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/dev-flash.c +++ b/arch/mips/bcm63xx/dev-flash.c -@@ -270,3 +270,8 @@ int __init bcm63xx_flash_register(void) +@@ -271,3 +271,8 @@ int __init bcm63xx_flash_register(void) return -ENODEV; } } diff --git a/target/linux/bcm63xx/patches-4.19/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch b/target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch similarity index 99% rename from target/linux/bcm63xx/patches-4.19/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch rename to target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch index c9d2ee1791..d83d2cec7b 100644 --- a/target/linux/bcm63xx/patches-4.19/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch +++ b/target/linux/bcm63xx/patches-5.4/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch @@ -24,7 +24,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices obj-y += boards/ --- /dev/null +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c -@@ -0,0 +1,200 @@ +@@ -0,0 +1,201 @@ +/* + * Broadcom BCM63XX Ath9k EEPROM fixup helper. + * @@ -108,6 +108,7 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices + return eeprom; + } + /* can't do anything here without talking to the SPI controller. */ ++ /* Fall through */ + case BCM63XX_FLASH_TYPE_NAND: + default: + return NULL; diff --git a/target/linux/bcm63xx/patches-4.19/420-BCM63XX-add-endian-check-for-ath9k.patch b/target/linux/bcm63xx/patches-5.4/420-BCM63XX-add-endian-check-for-ath9k.patch similarity index 96% rename from target/linux/bcm63xx/patches-4.19/420-BCM63XX-add-endian-check-for-ath9k.patch rename to target/linux/bcm63xx/patches-5.4/420-BCM63XX-add-endian-check-for-ath9k.patch index 2076879ed6..332b2394e1 100644 --- a/target/linux/bcm63xx/patches-4.19/420-BCM63XX-add-endian-check-for-ath9k.patch +++ b/target/linux/bcm63xx/patches-5.4/420-BCM63XX-add-endian-check-for-ath9k.patch @@ -21,7 +21,7 @@ /* --- a/arch/mips/bcm63xx/pci-ath9k-fixup.c +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c -@@ -182,12 +182,14 @@ static void ath9k_pci_fixup(struct pci_d +@@ -183,12 +183,14 @@ static void ath9k_pci_fixup(struct pci_d } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup); diff --git a/target/linux/bcm63xx/patches-4.19/421-BCM63XX-add-led-pin-for-ath9k.patch b/target/linux/bcm63xx/patches-5.4/421-BCM63XX-add-led-pin-for-ath9k.patch similarity index 96% rename from target/linux/bcm63xx/patches-4.19/421-BCM63XX-add-led-pin-for-ath9k.patch rename to target/linux/bcm63xx/patches-5.4/421-BCM63XX-add-led-pin-for-ath9k.patch index bb111dc9de..1f28198c4a 100644 --- a/target/linux/bcm63xx/patches-4.19/421-BCM63XX-add-led-pin-for-ath9k.patch +++ b/target/linux/bcm63xx/patches-5.4/421-BCM63XX-add-led-pin-for-ath9k.patch @@ -11,7 +11,7 @@ } --- a/arch/mips/bcm63xx/pci-ath9k-fixup.c +++ b/arch/mips/bcm63xx/pci-ath9k-fixup.c -@@ -183,13 +183,15 @@ static void ath9k_pci_fixup(struct pci_d +@@ -184,13 +184,15 @@ static void ath9k_pci_fixup(struct pci_d DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ath9k_pci_fixup); void __init pci_enable_ath9k_fixup(unsigned slot, u32 offset, diff --git a/target/linux/bcm63xx/patches-4.19/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch b/target/linux/bcm63xx/patches-5.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch rename to target/linux/bcm63xx/patches-5.4/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch diff --git a/target/linux/bcm63xx/patches-4.19/423-bcm63xx_enet_add_b53_support.patch b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch similarity index 91% rename from target/linux/bcm63xx/patches-4.19/423-bcm63xx_enet_add_b53_support.patch rename to target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch index 3f093cf65c..490b59c3f8 100644 --- a/target/linux/bcm63xx/patches-4.19/423-bcm63xx_enet_add_b53_support.patch +++ b/target/linux/bcm63xx/patches-5.4/423-bcm63xx_enet_add_b53_support.patch @@ -12,7 +12,7 @@ spinlock_t enetsw_mdio_lock; --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -30,6 +30,7 @@ +@@ -17,6 +17,7 @@ #include #include #include @@ -20,7 +20,7 @@ #include #include "bcm63xx_enet.h" -@@ -1932,7 +1933,8 @@ static int bcm_enet_remove(struct platfo +@@ -1909,7 +1910,8 @@ static int bcm_enet_remove(struct platfo return 0; } @@ -30,7 +30,7 @@ .probe = bcm_enet_probe, .remove = bcm_enet_remove, .driver = { -@@ -1941,6 +1943,42 @@ struct platform_driver bcm63xx_enet_driv +@@ -1918,6 +1920,42 @@ struct platform_driver bcm63xx_enet_driv }, }; @@ -73,7 +73,7 @@ /* * switch mii access callbacks */ -@@ -2197,29 +2235,6 @@ static int bcm_enetsw_open(struct net_de +@@ -2174,29 +2212,6 @@ static int bcm_enetsw_open(struct net_de enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i)); } @@ -103,7 +103,7 @@ /* initialize flow control buffer allocation */ enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0, ENETDMA_BUFALLOC_REG(priv->rx_chan)); -@@ -2675,6 +2690,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2652,6 +2667,9 @@ static int bcm_enetsw_probe(struct platf struct bcm63xx_enetsw_platform_data *pd; struct resource *res_mem; int ret, irq_rx, irq_tx; @@ -113,7 +113,7 @@ if (!bcm_enet_shared_base[0]) return -EPROBE_DEFER; -@@ -2755,6 +2773,43 @@ static int bcm_enetsw_probe(struct platf +@@ -2731,6 +2749,43 @@ static int bcm_enetsw_probe(struct platf priv->pdev = pdev; priv->net_dev = dev; @@ -157,7 +157,7 @@ return 0; out_disable_clk: -@@ -2776,6 +2831,9 @@ static int bcm_enetsw_remove(struct plat +@@ -2752,6 +2807,9 @@ static int bcm_enetsw_remove(struct plat priv = netdev_priv(dev); unregister_netdev(dev); diff --git a/target/linux/bcm63xx/patches-4.19/424-bcm63xx_enet_no_request_mem_region.patch b/target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch similarity index 86% rename from target/linux/bcm63xx/patches-4.19/424-bcm63xx_enet_no_request_mem_region.patch rename to target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch index e956deac1a..240525083c 100644 --- a/target/linux/bcm63xx/patches-4.19/424-bcm63xx_enet_no_request_mem_region.patch +++ b/target/linux/bcm63xx/patches-5.4/424-bcm63xx_enet_no_request_mem_region.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2734,9 +2734,9 @@ static int bcm_enetsw_probe(struct platf +@@ -2710,9 +2710,9 @@ static int bcm_enetsw_probe(struct platf if (ret) goto out; diff --git a/target/linux/bcm63xx/patches-4.19/427-boards_probe_switch.patch b/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/427-boards_probe_switch.patch rename to target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch diff --git a/target/linux/bcm63xx/patches-4.19/499-allow_better_context_for_board_patches.patch b/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/499-allow_better_context_for_board_patches.patch rename to target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch diff --git a/target/linux/bcm63xx/patches-4.19/500-board-D4PW.patch b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/500-board-D4PW.patch rename to target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch diff --git a/target/linux/bcm63xx/patches-4.19/501-board-NB4.patch b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/501-board-NB4.patch rename to target/linux/bcm63xx/patches-5.4/501-board-NB4.patch diff --git a/target/linux/bcm63xx/patches-4.19/502-board-96338W2_E7T.patch b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/502-board-96338W2_E7T.patch rename to target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch diff --git a/target/linux/bcm63xx/patches-4.19/503-board-CPVA642.patch b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/503-board-CPVA642.patch rename to target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch diff --git a/target/linux/bcm63xx/patches-4.19/504-board_dsl_274xb_rev_c.patch b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/504-board_dsl_274xb_rev_c.patch rename to target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch diff --git a/target/linux/bcm63xx/patches-4.19/505-board_spw500v.patch b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/505-board_spw500v.patch rename to target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch diff --git a/target/linux/bcm63xx/patches-4.19/506-board_gw6200_gw6000.patch b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/506-board_gw6200_gw6000.patch rename to target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch diff --git a/target/linux/bcm63xx/patches-4.19/507-board-MAGIC.patch b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/507-board-MAGIC.patch rename to target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch diff --git a/target/linux/bcm63xx/patches-4.19/508-board_hw553.patch b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/508-board_hw553.patch rename to target/linux/bcm63xx/patches-5.4/508-board_hw553.patch diff --git a/target/linux/bcm63xx/patches-4.19/509-board_rta1320_16m.patch b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/509-board_rta1320_16m.patch rename to target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch diff --git a/target/linux/bcm63xx/patches-4.19/510-board_spw303v.patch b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/510-board_spw303v.patch rename to target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch diff --git a/target/linux/bcm63xx/patches-4.19/511-board_V2500V.patch b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch similarity index 98% rename from target/linux/bcm63xx/patches-4.19/511-board_V2500V.patch rename to target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch index c77eb00bff..e2a10846e0 100644 --- a/target/linux/bcm63xx/patches-4.19/511-board_V2500V.patch +++ b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch @@ -76,7 +76,7 @@ #include #include #include -@@ -247,6 +248,13 @@ int __init bcm63xx_flash_register(void) +@@ -248,6 +249,13 @@ int __init bcm63xx_flash_register(void) val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val &= MPI_CSBASE_BASE_MASK; diff --git a/target/linux/bcm63xx/patches-4.19/512-board_BTV2110.patch b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/512-board_BTV2110.patch rename to target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch diff --git a/target/linux/bcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch b/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch similarity index 98% rename from target/linux/bcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch rename to target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch index 53ea56b496..24815782d1 100644 --- a/target/linux/bcm63xx/patches-4.19/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch +++ b/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch @@ -27,7 +27,8 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support endmenu --- a/arch/mips/bcm63xx/boards/Makefile +++ b/arch/mips/bcm63xx/boards/Makefile -@@ -1,2 +1,3 @@ +@@ -1,3 +1,4 @@ + # SPDX-License-Identifier: GPL-2.0-only obj-y += board_common.o obj-$(CONFIG_BOARD_BCM963XX) += board_bcm963xx.o +obj-$(CONFIG_BOARD_LIVEBOX) += board_livebox.o diff --git a/target/linux/bcm63xx/patches-4.19/514-board_ct536_ct5621.patch b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/514-board_ct536_ct5621.patch rename to target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch diff --git a/target/linux/bcm63xx/patches-4.19/515-board_DWV-S0_fixes.patch b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/515-board_DWV-S0_fixes.patch rename to target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch diff --git a/target/linux/bcm63xx/patches-4.19/516-board_96348A-122.patch b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/516-board_96348A-122.patch rename to target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch diff --git a/target/linux/bcm63xx/patches-4.19/519_board_CPVA502plus.patch b/target/linux/bcm63xx/patches-5.4/519_board_CPVA502plus.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/519_board_CPVA502plus.patch rename to target/linux/bcm63xx/patches-5.4/519_board_CPVA502plus.patch diff --git a/target/linux/bcm63xx/patches-4.19/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/bcm63xx/patches-5.4/520-bcm63xx-add-support-for-96368MVWG-board.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/520-bcm63xx-add-support-for-96368MVWG-board.patch rename to target/linux/bcm63xx/patches-5.4/520-bcm63xx-add-support-for-96368MVWG-board.patch diff --git a/target/linux/bcm63xx/patches-4.19/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/bcm63xx/patches-5.4/521-bcm63xx-add-support-for-96368MVNgr-board.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/521-bcm63xx-add-support-for-96368MVNgr-board.patch rename to target/linux/bcm63xx/patches-5.4/521-bcm63xx-add-support-for-96368MVNgr-board.patch diff --git a/target/linux/bcm63xx/patches-4.19/522-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/bcm63xx/patches-5.4/522-MIPS-BCM63XX-add-96328avng-reference-board.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/522-MIPS-BCM63XX-add-96328avng-reference-board.patch rename to target/linux/bcm63xx/patches-5.4/522-MIPS-BCM63XX-add-96328avng-reference-board.patch diff --git a/target/linux/bcm63xx/patches-4.19/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/bcm63xx/patches-5.4/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch rename to target/linux/bcm63xx/patches-5.4/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch diff --git a/target/linux/bcm63xx/patches-4.19/524-board_dsl_274xb_rev_f.patch b/target/linux/bcm63xx/patches-5.4/524-board_dsl_274xb_rev_f.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/524-board_dsl_274xb_rev_f.patch rename to target/linux/bcm63xx/patches-5.4/524-board_dsl_274xb_rev_f.patch diff --git a/target/linux/bcm63xx/patches-4.19/525-board_96348w3.patch b/target/linux/bcm63xx/patches-5.4/525-board_96348w3.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/525-board_96348w3.patch rename to target/linux/bcm63xx/patches-5.4/525-board_96348w3.patch diff --git a/target/linux/bcm63xx/patches-4.19/526-board_CT6373-1.patch b/target/linux/bcm63xx/patches-5.4/526-board_CT6373-1.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/526-board_CT6373-1.patch rename to target/linux/bcm63xx/patches-5.4/526-board_CT6373-1.patch diff --git a/target/linux/bcm63xx/patches-4.19/527-board_dva-g3810bn-tl-1.patch b/target/linux/bcm63xx/patches-5.4/527-board_dva-g3810bn-tl-1.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/527-board_dva-g3810bn-tl-1.patch rename to target/linux/bcm63xx/patches-5.4/527-board_dva-g3810bn-tl-1.patch diff --git a/target/linux/bcm63xx/patches-4.19/528-board_nb6.patch b/target/linux/bcm63xx/patches-5.4/528-board_nb6.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/528-board_nb6.patch rename to target/linux/bcm63xx/patches-5.4/528-board_nb6.patch diff --git a/target/linux/bcm63xx/patches-4.19/529-board_fast2604.patch b/target/linux/bcm63xx/patches-5.4/529-board_fast2604.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/529-board_fast2604.patch rename to target/linux/bcm63xx/patches-5.4/529-board_fast2604.patch diff --git a/target/linux/bcm63xx/patches-4.19/530-board_A4001N1.patch b/target/linux/bcm63xx/patches-5.4/530-board_A4001N1.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/530-board_A4001N1.patch rename to target/linux/bcm63xx/patches-5.4/530-board_A4001N1.patch diff --git a/target/linux/bcm63xx/patches-4.19/531-board_AR-5387un.patch b/target/linux/bcm63xx/patches-5.4/531-board_AR-5387un.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/531-board_AR-5387un.patch rename to target/linux/bcm63xx/patches-5.4/531-board_AR-5387un.patch diff --git a/target/linux/bcm63xx/patches-4.19/532-board_AR-5381u.patch b/target/linux/bcm63xx/patches-5.4/532-board_AR-5381u.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/532-board_AR-5381u.patch rename to target/linux/bcm63xx/patches-5.4/532-board_AR-5381u.patch diff --git a/target/linux/bcm63xx/patches-4.19/533-board_rta770bw.patch b/target/linux/bcm63xx/patches-5.4/533-board_rta770bw.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/533-board_rta770bw.patch rename to target/linux/bcm63xx/patches-5.4/533-board_rta770bw.patch diff --git a/target/linux/bcm63xx/patches-4.19/534-board_hw556.patch b/target/linux/bcm63xx/patches-5.4/534-board_hw556.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/534-board_hw556.patch rename to target/linux/bcm63xx/patches-5.4/534-board_hw556.patch diff --git a/target/linux/bcm63xx/patches-4.19/535-board_rta770w.patch b/target/linux/bcm63xx/patches-5.4/535-board_rta770w.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/535-board_rta770w.patch rename to target/linux/bcm63xx/patches-5.4/535-board_rta770w.patch diff --git a/target/linux/bcm63xx/patches-4.19/536-board_fast2704.patch b/target/linux/bcm63xx/patches-5.4/536-board_fast2704.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/536-board_fast2704.patch rename to target/linux/bcm63xx/patches-5.4/536-board_fast2704.patch diff --git a/target/linux/bcm63xx/patches-4.19/537-board_fast2504n.patch b/target/linux/bcm63xx/patches-5.4/537-board_fast2504n.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/537-board_fast2504n.patch rename to target/linux/bcm63xx/patches-5.4/537-board_fast2504n.patch diff --git a/target/linux/bcm63xx/patches-4.19/555-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/555-board_96318ref.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/555-board_96318ref.patch rename to target/linux/bcm63xx/patches-5.4/555-board_96318ref.patch diff --git a/target/linux/bcm63xx/patches-4.19/556-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/556-board_96318ref_p300.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/556-board_96318ref_p300.patch rename to target/linux/bcm63xx/patches-5.4/556-board_96318ref_p300.patch diff --git a/target/linux/bcm63xx/patches-4.19/557-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/557-board_bcm963269bhr.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/557-board_bcm963269bhr.patch rename to target/linux/bcm63xx/patches-5.4/557-board_bcm963269bhr.patch diff --git a/target/linux/bcm63xx/patches-4.19/558-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/558-board_AR1004G.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/558-board_AR1004G.patch rename to target/linux/bcm63xx/patches-5.4/558-board_AR1004G.patch diff --git a/target/linux/bcm63xx/patches-4.19/559-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/559-board_vw6339gu.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/559-board_vw6339gu.patch rename to target/linux/bcm63xx/patches-5.4/559-board_vw6339gu.patch diff --git a/target/linux/bcm63xx/patches-4.19/560-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/560-board_963268gu_p300.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/560-board_963268gu_p300.patch rename to target/linux/bcm63xx/patches-5.4/560-board_963268gu_p300.patch diff --git a/target/linux/bcm63xx/patches-4.19/561-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/561-board_WAP-5813n.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/561-board_WAP-5813n.patch rename to target/linux/bcm63xx/patches-5.4/561-board_WAP-5813n.patch diff --git a/target/linux/bcm63xx/patches-4.19/562-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/562-board_VR-3025u.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/562-board_VR-3025u.patch rename to target/linux/bcm63xx/patches-5.4/562-board_VR-3025u.patch diff --git a/target/linux/bcm63xx/patches-4.19/563-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/563-board_VR-3025un.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/563-board_VR-3025un.patch rename to target/linux/bcm63xx/patches-5.4/563-board_VR-3025un.patch diff --git a/target/linux/bcm63xx/patches-4.19/564-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/564-board_P870HW-51a_v2.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/564-board_P870HW-51a_v2.patch rename to target/linux/bcm63xx/patches-5.4/564-board_P870HW-51a_v2.patch diff --git a/target/linux/bcm63xx/patches-4.19/565-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/565-board_hw520.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/565-board_hw520.patch rename to target/linux/bcm63xx/patches-5.4/565-board_hw520.patch diff --git a/target/linux/bcm63xx/patches-4.19/566-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/566-board_A4001N.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/566-board_A4001N.patch rename to target/linux/bcm63xx/patches-5.4/566-board_A4001N.patch diff --git a/target/linux/bcm63xx/patches-4.19/567-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/567-board_dsl-2751b_e1.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/567-board_dsl-2751b_e1.patch rename to target/linux/bcm63xx/patches-5.4/567-board_dsl-2751b_e1.patch diff --git a/target/linux/bcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/568-board_DGND3700v1_3800B.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/568-board_DGND3700v1_3800B.patch rename to target/linux/bcm63xx/patches-5.4/568-board_DGND3700v1_3800B.patch diff --git a/target/linux/bcm63xx/patches-4.19/569-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/569-board_homehub2a.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/569-board_homehub2a.patch rename to target/linux/bcm63xx/patches-5.4/569-board_homehub2a.patch diff --git a/target/linux/bcm63xx/patches-4.19/570-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/570-board_HG655b.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/570-board_HG655b.patch rename to target/linux/bcm63xx/patches-5.4/570-board_HG655b.patch diff --git a/target/linux/bcm63xx/patches-4.19/571-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/571-board_fast2704n.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/571-board_fast2704n.patch rename to target/linux/bcm63xx/patches-5.4/571-board_fast2704n.patch diff --git a/target/linux/bcm63xx/patches-4.19/572-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/572-board_VR-3026e.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/572-board_VR-3026e.patch rename to target/linux/bcm63xx/patches-5.4/572-board_VR-3026e.patch diff --git a/target/linux/bcm63xx/patches-4.19/573-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/573-board_R5010UNv2.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/573-board_R5010UNv2.patch rename to target/linux/bcm63xx/patches-5.4/573-board_R5010UNv2.patch diff --git a/target/linux/bcm63xx/patches-4.19/574-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/574-board_HG622.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/574-board_HG622.patch rename to target/linux/bcm63xx/patches-5.4/574-board_HG622.patch diff --git a/target/linux/bcm63xx/patches-4.19/575-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/575-board_EVG2000.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/575-board_EVG2000.patch rename to target/linux/bcm63xx/patches-5.4/575-board_EVG2000.patch diff --git a/target/linux/bcm63xx/patches-4.19/576-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/576-board_AV4202N.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/576-board_AV4202N.patch rename to target/linux/bcm63xx/patches-5.4/576-board_AV4202N.patch diff --git a/target/linux/bcm63xx/patches-4.19/577-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/577-board_VH4032N.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/577-board_VH4032N.patch rename to target/linux/bcm63xx/patches-5.4/577-board_VH4032N.patch diff --git a/target/linux/bcm63xx/patches-4.19/578-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/578-board_R1000H.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/578-board_R1000H.patch rename to target/linux/bcm63xx/patches-5.4/578-board_R1000H.patch diff --git a/target/linux/bcm63xx/patches-4.19/579-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/579-board_AR-5315u.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/579-board_AR-5315u.patch rename to target/linux/bcm63xx/patches-5.4/579-board_AR-5315u.patch diff --git a/target/linux/bcm63xx/patches-4.19/580-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/580-board_AD1018.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/580-board_AD1018.patch rename to target/linux/bcm63xx/patches-5.4/580-board_AD1018.patch diff --git a/target/linux/bcm63xx/patches-4.19/598-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/598-board_sr102.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/598-board_sr102.patch rename to target/linux/bcm63xx/patches-5.4/598-board_sr102.patch diff --git a/target/linux/bcm63xx/patches-4.19/800-wl_exports.patch b/target/linux/bcm63xx/patches-5.4/800-wl_exports.patch similarity index 75% rename from target/linux/bcm63xx/patches-4.19/800-wl_exports.patch rename to target/linux/bcm63xx/patches-5.4/800-wl_exports.patch index a2f1f26464..7600a70c84 100644 --- a/target/linux/bcm63xx/patches-4.19/800-wl_exports.patch +++ b/target/linux/bcm63xx/patches-5.4/800-wl_exports.patch @@ -15,11 +15,13 @@ u32 crc, expected_crc; --- a/arch/mips/mm/cache.c +++ b/arch/mips/mm/cache.c -@@ -64,6 +64,7 @@ void (*_dma_cache_wback)(unsigned long s +@@ -62,6 +62,9 @@ void (*_dma_cache_wback_inv)(unsigned lo + void (*_dma_cache_wback)(unsigned long start, unsigned long size); void (*_dma_cache_inv)(unsigned long start, unsigned long size); - EXPORT_SYMBOL(_dma_cache_wback_inv); ++EXPORT_SYMBOL(_dma_cache_wback_inv); +EXPORT_SYMBOL(_dma_cache_inv); - ++ #endif /* CONFIG_DMA_NONCOHERENT */ + /* diff --git a/target/linux/bcm63xx/patches-4.19/801-ssb_export_fallback_sprom.patch b/target/linux/bcm63xx/patches-5.4/801-ssb_export_fallback_sprom.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/801-ssb_export_fallback_sprom.patch rename to target/linux/bcm63xx/patches-5.4/801-ssb_export_fallback_sprom.patch diff --git a/target/linux/bcm63xx/patches-4.19/802-rtl8367r_fix_RGMII_support.patch b/target/linux/bcm63xx/patches-5.4/802-rtl8367r_fix_RGMII_support.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/802-rtl8367r_fix_RGMII_support.patch rename to target/linux/bcm63xx/patches-5.4/802-rtl8367r_fix_RGMII_support.patch diff --git a/target/linux/bcm63xx/patches-4.19/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch b/target/linux/bcm63xx/patches-5.4/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch similarity index 100% rename from target/linux/bcm63xx/patches-4.19/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch rename to target/linux/bcm63xx/patches-5.4/803-jffs2-work-around-unaligned-accesses-failing-on-bcm6.patch diff --git a/target/linux/bcm63xx/patches-4.19/804-bcm63xx_enet_63268_rgmii_ports.patch b/target/linux/bcm63xx/patches-5.4/804-bcm63xx_enet_63268_rgmii_ports.patch similarity index 86% rename from target/linux/bcm63xx/patches-4.19/804-bcm63xx_enet_63268_rgmii_ports.patch rename to target/linux/bcm63xx/patches-5.4/804-bcm63xx_enet_63268_rgmii_ports.patch index 683221d76e..c271436b3c 100644 --- a/target/linux/bcm63xx/patches-4.19/804-bcm63xx_enet_63268_rgmii_ports.patch +++ b/target/linux/bcm63xx/patches-5.4/804-bcm63xx_enet_63268_rgmii_ports.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c -@@ -2232,6 +2232,10 @@ static int bcm_enetsw_open(struct net_de +@@ -2209,6 +2209,10 @@ static int bcm_enetsw_open(struct net_de rgmii_ctrl = enetsw_readb(priv, ENETSW_RGMII_CTRL_REG(i)); rgmii_ctrl |= ENETSW_RGMII_CTRL_GMII_CLK_EN; diff --git a/target/linux/cns3xxx/config-4.14 b/target/linux/cns3xxx/config-4.14 deleted file mode 100644 index 54f7576ea5..0000000000 --- a/target/linux/cns3xxx/config-4.14 +++ /dev/null @@ -1,380 +0,0 @@ -# CONFIG_AIO is not set -CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_CNS3XXX=y -CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y -CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAS_TICK_BROADCAST=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_MULTI_CPU_AUTO is not set -CONFIG_ARCH_MULTI_V6=y -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y -# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set -# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -# CONFIG_ARM_CPU_SUSPEND is not set -CONFIG_ARM_GIC=y -CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_ARM_HEAVY_MB=y -CONFIG_ARM_L1_CACHE_SHIFT=5 -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARM_THUMB=y -CONFIG_ATA=y -CONFIG_ATAGS=y -# CONFIG_ATA_SFF is not set -CONFIG_ATA_VERBOSE_ERROR=y -CONFIG_AUTO_ZRELADDR=y -CONFIG_BCM_NET_PHYLIB=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_MQ_PCI=y -CONFIG_BLK_SCSI_REQUEST=y -CONFIG_BROADCOM_PHY=y -CONFIG_CACHE_L2X0=y -CONFIG_CC_STACKPROTECTOR=y -# CONFIG_CC_STACKPROTECTOR_NONE is not set -CONFIG_CC_STACKPROTECTOR_REGULAR=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CMDLINE="console=ttyS0,115200" -CONFIG_CMDLINE_FORCE=y -CONFIG_CNS3XXX_ETH=y -CONFIG_COMMON_CLK=y -CONFIG_COREDUMP=y -CONFIG_CPU_32v6=y -CONFIG_CPU_32v6K=y -CONFIG_CPU_ABRT_EV6=y -# CONFIG_CPU_BPREDICT_DISABLE is not set -CONFIG_CPU_CACHE_V6=y -CONFIG_CPU_CACHE_VIPT=y -CONFIG_CPU_COPY_V6=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -CONFIG_CPU_HAS_ASID=y -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_PABRT_V6=y -CONFIG_CPU_RMAP=y -CONFIG_CPU_THUMB_CAPABLE=y -CONFIG_CPU_TLB_V6=y -CONFIG_CPU_V6K=y -CONFIG_CRASH_DUMP=y -CONFIG_CRC_CCITT=m -CONFIG_CRYPTO_AEAD=y -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_DEBUG_ALIGN_RODATA=y -CONFIG_DEBUG_BUGVERBOSE=y -CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -# CONFIG_DEBUG_UART_8250 is not set -# CONFIG_DEBUG_USER is not set -CONFIG_DMA_CACHE_FIQ_BROADCAST=y -CONFIG_DTC=y -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -CONFIG_EEPROM_AT24=y -CONFIG_ELF_CORE=y -CONFIG_FIQ=y -CONFIG_FIXED_PHY=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FRAME_POINTER=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_EARLY_IOREMAP=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GLOB=y -CONFIG_GPIOLIB=y -CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_PCA953X=y -CONFIG_GPIO_PCA953X_IRQ=y -CONFIG_GPIO_SYSFS=y -# CONFIG_GRO_CELLS is not set -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -# CONFIG_HAVE_ARCH_BITREVERSE is not set -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_ARM_SCU=y -CONFIG_HAVE_ARM_TWD=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_EBPF_JIT=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IDE=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SMP=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HWMON=y -CONFIG_HZ_FIXED=0 -CONFIG_HZ_PERIODIC=y -CONFIG_I2C=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_CNS3XXX=y -# CONFIG_INITRAMFS_FORCE is not set -CONFIG_INITRAMFS_SOURCE="" -CONFIG_IOMMU_HELPER=y -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IPV6=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MULTIPLE_TABLES=y -# CONFIG_IPV6_PIMSM_V2 is not set -CONFIG_IPV6_SUBTREES=y -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IRQCHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_HIERARCHY=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_UNCOMPRESSED=y -CONFIG_LEDS_GPIO=y -# CONFIG_LEDS_TRIGGER_NETDEV is not set -CONFIG_LIBFDT=y -CONFIG_LOCK_SPIN_ON_OWNER=y -# CONFIG_MACH_CNS3420VB is not set -CONFIG_MACH_GW2388=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_DEVICE=y -CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_MIGHT_HAVE_PCI=y -CONFIG_MIGRATION=y -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_CNS3XXX=y -# CONFIG_MMC_SDHCI_PCI is not set -CONFIG_MMC_SDHCI_PLTFM=y -# CONFIG_MMC_TIFM_SD is not set -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MPCORE_WATCHDOG=y -CONFIG_MTD_M25P80=y -# CONFIG_MTD_OF_PARTS is not set -CONFIG_MTD_PHYSMAP=y -# CONFIG_MTD_PHYSMAP_OF is not set -CONFIG_MTD_SPI_NOR=y -CONFIG_MTD_SPLIT_FIRMWARE=y -CONFIG_MTD_SPLIT_UIMAGE_FW=y -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NETFILTER=y -CONFIG_NETFILTER_ADVANCED=y -CONFIG_NETFILTER_XTABLES=m -CONFIG_NETFILTER_XT_MARK=m -CONFIG_NETFILTER_XT_MATCH_COMMENT=m -CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m -CONFIG_NETFILTER_XT_MATCH_LIMIT=m -CONFIG_NETFILTER_XT_MATCH_MAC=m -CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m -CONFIG_NETFILTER_XT_MATCH_STATE=m -CONFIG_NETFILTER_XT_MATCH_TIME=m -CONFIG_NETFILTER_XT_NAT=m -CONFIG_NETFILTER_XT_TARGET_LOG=m -CONFIG_NETFILTER_XT_TARGET_REDIRECT=m -CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NET_FLOW_LIMIT=y -CONFIG_NF_CONNTRACK=m -CONFIG_NF_CONNTRACK_IPV4=m -CONFIG_NF_CONNTRACK_IPV6=m -CONFIG_NF_CONNTRACK_RTCACHE=m -CONFIG_NF_DEFRAG_IPV4=m -CONFIG_NF_DEFRAG_IPV6=m -CONFIG_NF_LOG_COMMON=m -CONFIG_NF_LOG_IPV4=m -CONFIG_NF_LOG_IPV6=m -CONFIG_NF_NAT=m -CONFIG_NF_NAT_IPV4=m -CONFIG_NF_NAT_MASQUERADE_IPV4=m -CONFIG_NF_NAT_NEEDED=y -CONFIG_NF_NAT_REDIRECT=m -CONFIG_NF_REJECT_IPV4=m -CONFIG_NF_REJECT_IPV6=m -CONFIG_NLS=y -CONFIG_NO_BOOTMEM=y -CONFIG_NR_CPUS=2 -CONFIG_NTP_PPS=y -CONFIG_NVMEM=y -CONFIG_OF=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_ADDRESS_PCI=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_GPIO=y -CONFIG_OF_IRQ=y -CONFIG_OF_MDIO=y -CONFIG_OF_NET=y -CONFIG_OF_PCI=y -CONFIG_OF_PCI_IRQ=y -CONFIG_OF_RESERVED_MEM=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OUTER_CACHE=y -CONFIG_OUTER_CACHE_SYNC=y -CONFIG_PADATA=y -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_PCI=y -CONFIG_PCI_DISABLE_COMMON_QUIRKS=y -CONFIG_PCI_DOMAINS=y -CONFIG_PCI_DOMAINS_GENERIC=y -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_PHYLIB=y -CONFIG_PL310_ERRATA_588369=y -CONFIG_PL310_ERRATA_727915=y -CONFIG_PL310_ERRATA_753970=y -CONFIG_PL310_ERRATA_769419=y -CONFIG_PPP=m -CONFIG_PPPOE=m -CONFIG_PPP_ASYNC=m -CONFIG_PPS=y -CONFIG_PPS_CLIENT_GPIO=y -CONFIG_PRINTK_TIME=y -CONFIG_PROC_VMCORE=y -CONFIG_RAID_ATTRS=y -CONFIG_RATIONAL=y -CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_SPI=y -CONFIG_RELAY=y -CONFIG_RFS_ACCEL=y -CONFIG_RPS=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_DS1672=y -CONFIG_RTC_I2C_AND_SPI=y -CONFIG_RTC_MC146818_LIB=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_SATA_AHCI=y -CONFIG_SATA_AHCI_PLATFORM=y -# CONFIG_SCHED_INFO is not set -CONFIG_SCSI=y -CONFIG_SENSORS_AD7418=y -CONFIG_SERIAL_8250_FSL=y -CONFIG_SERIAL_8250_NR_UARTS=3 -CONFIG_SERIAL_8250_RUNTIME_UARTS=3 -CONFIG_SG_POOL=y -CONFIG_SLHC=m -CONFIG_SMP=y -CONFIG_SMP_ON_UP=y -CONFIG_SPARSE_IRQ=y -CONFIG_SPI=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_CNS3XXX=y -CONFIG_SPI_MASTER=y -CONFIG_SRCU=y -# CONFIG_STAGING is not set -CONFIG_SWIOTLB=y -CONFIG_SWPHY=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_TIMER_OF=y -CONFIG_TIMER_PROBE=y -CONFIG_TREE_RCU=y -CONFIG_TREE_SRCU=y -CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_USB=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -CONFIG_USB_CNS3XXX_EHCI=y -CONFIG_USB_CNS3XXX_OHCI=y -CONFIG_USB_COMMON=y -CONFIG_USB_DWC2=y -CONFIG_USB_DWC2_HOST=y -# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -CONFIG_USB_GADGET=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_SUPPORT=y -CONFIG_USE_OF=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_VFP=y -CONFIG_WATCHDOG_CORE=y -CONFIG_WATCHDOG_NOWAYOUT=y -CONFIG_XPS=y -CONFIG_XZ_DEC_ARM=y -CONFIG_XZ_DEC_BCJ=y -CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_ZBOOT_ROM_TEXT=0 diff --git a/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch b/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch deleted file mode 100644 index 3ae759021a..0000000000 --- a/target/linux/cns3xxx/patches-4.14/000-cns3xxx_arch_include.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/Makefile -+++ b/arch/arm/mach-cns3xxx/Makefile -@@ -1,4 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 -+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include -+ - obj-$(CONFIG_ARCH_CNS3XXX) += cns3xxx.o - cns3xxx-y += core.o pm.o - cns3xxx-$(CONFIG_ATAGS) += devices.o diff --git a/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch b/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch deleted file mode 100644 index 17a83ea7af..0000000000 --- a/target/linux/cns3xxx/patches-4.14/001-arm_openwrt_machtypes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/arm/tools/mach-types -+++ b/arch/arm/tools/mach-types -@@ -448,6 +448,7 @@ gplugd MACH_GPLUGD GPLUGD 2625 - qsd8x50a_st1_5 MACH_QSD8X50A_ST1_5 QSD8X50A_ST1_5 2627 - mx23evk MACH_MX23EVK MX23EVK 2629 - ap4evb MACH_AP4EVB AP4EVB 2630 -+gw2388 MACH_GW2388 GW2388 2635 - mityomapl138 MACH_MITYOMAPL138 MITYOMAPL138 2650 - guruplug MACH_GURUPLUG GURUPLUG 2659 - spear310 MACH_SPEAR310 SPEAR310 2660 diff --git a/target/linux/cns3xxx/patches-4.14/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/cns3xxx/patches-4.14/010-arm_introduce-dma-fiq-irq-broadcast.patch deleted file mode 100644 index 3841ca032b..0000000000 --- a/target/linux/cns3xxx/patches-4.14/010-arm_introduce-dma-fiq-irq-broadcast.patch +++ /dev/null @@ -1,80 +0,0 @@ ---- a/arch/arm/include/asm/glue-cache.h -+++ b/arch/arm/include/asm/glue-cache.h -@@ -152,9 +152,15 @@ static inline void nop_dma_unmap_area(co - #define __cpuc_flush_user_range __glue(_CACHE,_flush_user_cache_range) - #define __cpuc_coherent_kern_range __glue(_CACHE,_coherent_kern_range) - #define __cpuc_coherent_user_range __glue(_CACHE,_coherent_user_range) --#define __cpuc_flush_dcache_area __glue(_CACHE,_flush_kern_dcache_area) - --#define dmac_flush_range __glue(_CACHE,_dma_flush_range) -+#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST -+# define __cpuc_flush_dcache_area __glue(_CACHE,_flush_kern_dcache_area) -+# define dmac_flush_range __glue(_CACHE,_dma_flush_range) -+#else -+# define __cpuc_flush_dcache_area __glue(fiq,_flush_kern_dcache_area) -+# define dmac_flush_range __glue(fiq,_dma_flush_range) -+#endif -+ - #endif - - #endif ---- a/arch/arm/mm/Kconfig -+++ b/arch/arm/mm/Kconfig -@@ -922,6 +922,17 @@ config DMA_CACHE_RWFO - in hardware, other workarounds are needed (e.g. cache - maintenance broadcasting in software via FIQ). - -+config DMA_CACHE_FIQ_BROADCAST -+ bool "Enable fiq broadcast DMA cache maintenance" -+ depends on CPU_V6K && SMP -+ select FIQ -+ help -+ The Snoop Control Unit on ARM11MPCore does not detect the -+ cache maintenance operations and the dma_{map,unmap}_area() -+ functions may leave stale cache entries on other CPUs. By -+ enabling this option, fiq broadcast in the ARMv6 -+ DMA cache maintenance functions is performed. -+ - config OUTER_CACHE - bool - ---- a/arch/arm/mm/flush.c -+++ b/arch/arm/mm/flush.c -@@ -319,6 +319,7 @@ void __sync_icache_dcache(pte_t pteval) - void flush_dcache_page(struct page *page) - { - struct address_space *mapping; -+ bool skip_broadcast = true; - - /* - * The zero page is never written to, so never has any dirty -@@ -335,7 +336,10 @@ void flush_dcache_page(struct page *page - - mapping = page_mapping(page); - -- if (!cache_ops_need_broadcast() && -+#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST -+ skip_broadcast = !cache_ops_need_broadcast(); -+#endif -+ if (skip_broadcast && - mapping && !page_mapcount(page)) - clear_bit(PG_dcache_clean, &page->flags); - else { ---- a/arch/arm/mm/dma.h -+++ b/arch/arm/mm/dma.h -@@ -5,8 +5,13 @@ - #include - - #ifndef MULTI_CACHE --#define dmac_map_area __glue(_CACHE,_dma_map_area) --#define dmac_unmap_area __glue(_CACHE,_dma_unmap_area) -+#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST -+# define dmac_map_area __glue(_CACHE,_dma_map_area) -+# define dmac_unmap_area __glue(_CACHE,_dma_unmap_area) -+#else -+# define dmac_map_area __glue(fiq,_dma_map_area) -+# define dmac_unmap_area __glue(fiq,_dma_unmap_area) -+#endif - - /* - * These are private to the dma-mapping API. Do not use directly. diff --git a/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch b/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch deleted file mode 100644 index df413c9040..0000000000 --- a/target/linux/cns3xxx/patches-4.14/020-watchdog_support.patch +++ /dev/null @@ -1,184 +0,0 @@ -Add a watchdog driver for ARM MPcore processors. - -Signed-off-by: Felix Fietkau ---- a/drivers/watchdog/Kconfig -+++ b/drivers/watchdog/Kconfig -@@ -355,6 +355,13 @@ config KS8695_WATCHDOG - Watchdog timer embedded into KS8695 processor. This will reboot your - system when the timeout is reached. - -+config MPCORE_WATCHDOG -+ tristate "MPcore watchdog" -+ depends on HAVE_ARM_TWD -+ select WATCHDOG_CORE -+ help -+ Watchdog timer embedded into the MPcore system -+ - config HAVE_S3C2410_WATCHDOG - bool - help ---- a/drivers/watchdog/Makefile -+++ b/drivers/watchdog/Makefile -@@ -49,6 +49,7 @@ obj-$(CONFIG_977_WATCHDOG) += wdt977.o - obj-$(CONFIG_GEMINI_WATCHDOG) += gemini_wdt.o - obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o - obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o -+obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o - obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o - obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o - obj-$(CONFIG_SAMA5D4_WATCHDOG) += sama5d4_wdt.o ---- /dev/null -+++ b/drivers/watchdog/mpcore_wdt.c -@@ -0,0 +1,118 @@ -+/* -+ * Watchdog driver for ARM MPcore -+ * -+ * Copyright (C) 2017 Felix Fietkau -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+static void __iomem *wdt_base; -+static int wdt_timeout = 60; -+ -+static int mpcore_wdt_keepalive(struct watchdog_device *wdd) -+{ -+ static int perturb; -+ u32 count; -+ -+ count = (twd_timer_get_rate() / 256) * wdt_timeout; -+ -+ /* Reload register needs a different value on each refresh */ -+ count += perturb; -+ perturb = !perturb; -+ -+ iowrite32(count, wdt_base + TWD_WDOG_LOAD); -+ -+ return 0; -+} -+ -+static int mpcore_wdt_start(struct watchdog_device *wdd) -+{ -+ mpcore_wdt_keepalive(wdd); -+ -+ /* prescale = 256, mode = 1, enable = 1 */ -+ iowrite32(0x0000FF09, wdt_base + TWD_WDOG_CONTROL); -+ -+ return 0; -+} -+ -+static int mpcore_wdt_stop(struct watchdog_device *wdd) -+{ -+ iowrite32(0x12345678, wdt_base + TWD_WDOG_DISABLE); -+ iowrite32(0x87654321, wdt_base + TWD_WDOG_DISABLE); -+ iowrite32(0x0, wdt_base + TWD_WDOG_CONTROL); -+ -+ return 0; -+} -+ -+static int mpcore_wdt_set_timeout(struct watchdog_device *wdd, -+ unsigned int timeout) -+{ -+ mpcore_wdt_stop(wdd); -+ wdt_timeout = timeout; -+ mpcore_wdt_start(wdd); -+ -+ return 0; -+} -+ -+static const struct watchdog_info mpcore_wdt_info = { -+ .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, -+ .identity = "MPcore Watchdog", -+}; -+ -+static const struct watchdog_ops mpcore_wdt_ops = { -+ .owner = THIS_MODULE, -+ .start = mpcore_wdt_start, -+ .stop = mpcore_wdt_stop, -+ .ping = mpcore_wdt_keepalive, -+ .set_timeout = mpcore_wdt_set_timeout, -+}; -+ -+static struct watchdog_device mpcore_wdt = { -+ .info = &mpcore_wdt_info, -+ .ops = &mpcore_wdt_ops, -+ .min_timeout = 1, -+ .max_timeout = 65535, -+}; -+ -+static int mpcore_wdt_probe(struct platform_device *pdev) -+{ -+ struct resource *res; -+ unsigned long rate = twd_timer_get_rate(); -+ -+ pr_info("MPCore WD init. clockrate: %lu prescaler: %u countrate: %lu timeout: %us\n", rate, 256, rate / 256, wdt_timeout); -+ -+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -+ if (!res) -+ return -ENODEV; -+ -+ wdt_base = devm_ioremap_resource(&pdev->dev, res); -+ if (IS_ERR(wdt_base)) -+ return PTR_ERR(wdt_base); -+ -+ watchdog_register_device(&mpcore_wdt); -+ return 0; -+} -+ -+static int mpcore_wdt_remove(struct platform_device *dev) -+{ -+ watchdog_unregister_device(&mpcore_wdt); -+ return 0; -+} -+ -+static struct platform_driver mpcore_wdt_driver = { -+ .probe = mpcore_wdt_probe, -+ .remove = mpcore_wdt_remove, -+ .driver = { -+ .name = "mpcore_wdt", -+ }, -+}; -+ -+module_platform_driver(mpcore_wdt_driver); -+MODULE_AUTHOR("Felix Fietkau "); -+MODULE_LICENSE("GPL"); ---- a/arch/arm/include/asm/smp_twd.h -+++ b/arch/arm/include/asm/smp_twd.h -@@ -34,5 +34,6 @@ struct twd_local_timer name __initdata = - }; - - int twd_local_timer_register(struct twd_local_timer *); -+unsigned long twd_timer_get_rate(void); - - #endif ---- a/arch/arm/kernel/smp_twd.c -+++ b/arch/arm/kernel/smp_twd.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -380,6 +381,14 @@ int __init twd_local_timer_register(stru - return twd_local_timer_common_register(NULL); - } - -+/* Needed by mpcore_wdt */ -+unsigned long twd_timer_get_rate(void) -+{ -+ return twd_timer_rate; -+} -+EXPORT_SYMBOL_GPL(twd_timer_get_rate); -+ -+ - #ifdef CONFIG_OF - static int __init twd_local_timer_of_register(struct device_node *np) - { diff --git a/target/linux/cns3xxx/patches-4.14/025-smp_support.patch b/target/linux/cns3xxx/patches-4.14/025-smp_support.patch deleted file mode 100644 index dc8e4b03c2..0000000000 --- a/target/linux/cns3xxx/patches-4.14/025-smp_support.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/Makefile -+++ b/arch/arm/mach-cns3xxx/Makefile -@@ -6,3 +6,5 @@ cns3xxx-y += core.o pm.o - cns3xxx-$(CONFIG_ATAGS) += devices.o - cns3xxx-$(CONFIG_PCI) += pcie.o - cns3xxx-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o -+cns3xxx-$(CONFIG_SMP) += platsmp.o headsmp.o -+cns3xxx-$(CONFIG_HOTPLUG_CPU) += hotplug.o ---- a/arch/arm/mach-cns3xxx/Kconfig -+++ b/arch/arm/mach-cns3xxx/Kconfig -@@ -3,6 +3,9 @@ menuconfig ARCH_CNS3XXX - bool "Cavium Networks CNS3XXX family" - depends on ARCH_MULTI_V6 - select ARM_GIC -+ select HAVE_ARM_SCU if SMP -+ select HAVE_ARM_TWD -+ select HAVE_SMP - help - Support for Cavium Networks CNS3XXX platform. - ---- a/arch/arm/mach-cns3xxx/core.h -+++ b/arch/arm/mach-cns3xxx/core.h -@@ -13,6 +13,7 @@ - - #include - -+extern struct smp_operations cns3xxx_smp_ops; - extern void cns3xxx_timer_init(void); - - #ifdef CONFIG_CACHE_L2X0 diff --git a/target/linux/cns3xxx/patches-4.14/030-pcie_clock.patch b/target/linux/cns3xxx/patches-4.14/030-pcie_clock.patch deleted file mode 100644 index 66c3a99ae1..0000000000 --- a/target/linux/cns3xxx/patches-4.14/030-pcie_clock.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/pcie.c -+++ b/arch/arm/mach-cns3xxx/pcie.c -@@ -281,8 +281,6 @@ void __init cns3xxx_pcie_init_late(void) - "imprecise external abort"); - - for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) { -- cns3xxx_pwr_clk_en(0x1 << PM_CLK_GATE_REG_OFFSET_PCIE(i)); -- cns3xxx_pwr_soft_rst(0x1 << PM_SOFT_RST_REG_OFFST_PCIE(i)); - cns3xxx_pcie_check_link(&cns3xxx_pcie[i]); - cns3xxx_pcie_hw_init(&cns3xxx_pcie[i]); - private_data = &cns3xxx_pcie[i]; diff --git a/target/linux/cns3xxx/patches-4.14/040-fiq_support.patch b/target/linux/cns3xxx/patches-4.14/040-fiq_support.patch deleted file mode 100644 index 5a62eb38ac..0000000000 --- a/target/linux/cns3xxx/patches-4.14/040-fiq_support.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/Kconfig -+++ b/arch/arm/mach-cns3xxx/Kconfig -@@ -6,6 +6,7 @@ menuconfig ARCH_CNS3XXX - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD - select HAVE_SMP -+ select FIQ - help - Support for Cavium Networks CNS3XXX platform. - ---- a/arch/arm/mach-cns3xxx/Makefile -+++ b/arch/arm/mach-cns3xxx/Makefile -@@ -6,5 +6,5 @@ cns3xxx-y += core.o pm.o - cns3xxx-$(CONFIG_ATAGS) += devices.o - cns3xxx-$(CONFIG_PCI) += pcie.o - cns3xxx-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o --cns3xxx-$(CONFIG_SMP) += platsmp.o headsmp.o -+cns3xxx-$(CONFIG_SMP) += platsmp.o headsmp.o cns3xxx_fiq.o - cns3xxx-$(CONFIG_HOTPLUG_CPU) += hotplug.o ---- a/arch/arm/mach-cns3xxx/cns3xxx.h -+++ b/arch/arm/mach-cns3xxx/cns3xxx.h -@@ -261,6 +261,7 @@ - #define MISC_PCIE_INT_MASK(x) MISC_MEM_MAP(0x978 + (x) * 0x100) - #define MISC_PCIE_INT_STATUS(x) MISC_MEM_MAP(0x97C + (x) * 0x100) - -+#define MISC_FIQ_CPU(x) MISC_MEM_MAP(0xA58 - (x) * 0x4) - /* - * Power management and clock control - */ ---- a/arch/arm/mm/Kconfig -+++ b/arch/arm/mm/Kconfig -@@ -905,7 +905,7 @@ config VDSO - - config DMA_CACHE_RWFO - bool "Enable read/write for ownership DMA cache maintenance" -- depends on CPU_V6K && SMP -+ depends on CPU_V6K && SMP && !ARCH_CNS3XXX - default y - help - The Snoop Control Unit on ARM11MPCore does not detect the diff --git a/target/linux/cns3xxx/patches-4.14/045-twd_base.patch b/target/linux/cns3xxx/patches-4.14/045-twd_base.patch deleted file mode 100644 index e722b01bbc..0000000000 --- a/target/linux/cns3xxx/patches-4.14/045-twd_base.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/core.c -+++ b/arch/arm/mach-cns3xxx/core.c -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -26,6 +27,8 @@ - #include "core.h" - #include "pm.h" - -+#define IRQ_LOCALTIMER 29 -+ - static struct map_desc cns3xxx_io_desc[] __initdata = { - { - .virtual = CNS3XXX_TC11MP_SCU_BASE_VIRT, -@@ -198,6 +201,15 @@ static struct irqaction cns3xxx_timer_ir - .handler = cns3xxx_timer_interrupt, - }; - -+static void __init cns3xxx_init_twd(void) -+{ -+ static DEFINE_TWD_LOCAL_TIMER(cns3xx_twd_local_timer, -+ CNS3XXX_TC11MP_TWD_BASE, -+ IRQ_LOCALTIMER); -+ -+ twd_local_timer_register(&cns3xx_twd_local_timer); -+} -+ - /* - * Set up the clock source and clock events devices - */ -@@ -251,6 +263,7 @@ static void __init __cns3xxx_timer_init( - setup_irq(timer_irq, &cns3xxx_timer_irq); - - cns3xxx_clockevents_init(timer_irq); -+ cns3xxx_init_twd(); - } - - void __init cns3xxx_timer_init(void) diff --git a/target/linux/cns3xxx/patches-4.14/055-pcie_io.patch b/target/linux/cns3xxx/patches-4.14/055-pcie_io.patch deleted file mode 100644 index 4680853e6e..0000000000 --- a/target/linux/cns3xxx/patches-4.14/055-pcie_io.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/core.c -+++ b/arch/arm/mach-cns3xxx/core.c -@@ -81,6 +81,16 @@ static struct map_desc cns3xxx_io_desc[] - .pfn = __phys_to_pfn(CNS3XXX_PCIE1_CFG1_BASE), - .length = SZ_16M, - .type = MT_DEVICE, -+ }, { -+ .virtual = CNS3XXX_PCIE0_IO_BASE_VIRT, -+ .pfn = __phys_to_pfn(CNS3XXX_PCIE0_IO_BASE), -+ .length = SZ_16M, -+ .type = MT_DEVICE, -+ }, { -+ .virtual = CNS3XXX_PCIE1_IO_BASE_VIRT, -+ .pfn = __phys_to_pfn(CNS3XXX_PCIE1_IO_BASE), -+ .length = SZ_16M, -+ .type = MT_DEVICE, - #endif - }, - }; diff --git a/target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch b/target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch deleted file mode 100644 index 87b1526c3a..0000000000 --- a/target/linux/cns3xxx/patches-4.14/060-pcie_abort.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/pcie.c -+++ b/arch/arm/mach-cns3xxx/pcie.c -@@ -86,6 +86,79 @@ static void __iomem *cns3xxx_pci_map_bus - return base + where + (devfn << 12); - } - -+static inline int check_master_abort(struct pci_bus *bus, unsigned int devfn, int where) -+{ -+ struct cns3xxx_pcie *cnspci = pbus_to_cnspci(bus); -+ -+ /* check PCI-compatible status register after access */ -+ if (cnspci->linked) { -+ void __iomem *host_base; -+ u32 sreg, ereg; -+ -+ host_base = (void __iomem *) cnspci->cfg_bases[CNS3XXX_HOST_TYPE].virtual; -+ sreg = __raw_readw(host_base + 0x6) & 0xF900; -+ ereg = __raw_readl(host_base + 0x104); // Uncorrectable Error Status Reg -+ -+ if (sreg | ereg) { -+ /* SREG: -+ * BIT15 - Detected Parity Error -+ * BIT14 - Signaled System Error -+ * BIT13 - Received Master Abort -+ * BIT12 - Received Target Abort -+ * BIT11 - Signaled Target Abort -+ * BIT08 - Master Data Parity Error -+ * -+ * EREG: -+ * BIT20 - Unsupported Request -+ * BIT19 - ECRC -+ * BIT18 - Malformed TLP -+ * BIT17 - Receiver Overflow -+ * BIT16 - Unexpected Completion -+ * BIT15 - Completer Abort -+ * BIT14 - Completion Timeout -+ * BIT13 - Flow Control Protocol Error -+ * BIT12 - Poisoned TLP -+ * BIT04 - Data Link Protocol Error -+ * -+ * TODO: see Documentation/pci-error-recovery.txt -+ * implement error_detected handler -+ */ -+/* -+ printk("pci error: %04d:%02x:%02x.%02x sreg=0x%04x ereg=0x%08x", pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), sreg, ereg); -+ if (sreg & BIT(15)) printk(" SERR"); -+ if (sreg & BIT(13)) printk(" TABRT"); -+ if (sreg & BIT( 8)) printk(" MPERR"); -+ -+ if (ereg & BIT(20)) printk(" Unsup"); -+ if (ereg & BIT(19)) printk(" ECRC"); -+ if (ereg & BIT(18)) printk(" MTLP"); -+ if (ereg & BIT(17)) printk(" OFLOW"); -+ if (ereg & BIT(16)) printk(" Unex"); -+ if (ereg & BIT(15)) printk(" ABRT"); -+ if (ereg & BIT(14)) printk(" COMPTO"); -+ if (ereg & BIT(13)) printk(" FLOW"); -+ if (ereg & BIT(12)) printk(" PTLP"); -+ if (ereg & BIT( 4)) printk(" DLINK"); -+ printk("\n"); -+*/ -+ pr_debug("%s failed port%d sreg=0x%04x\n", __func__, -+ pci_domain_nr(bus), sreg); -+ -+ /* make sure the status bits are reset */ -+ __raw_writew(sreg, host_base + 6); -+ __raw_writel(ereg, host_base + 0x104); -+ return 1; -+ } -+ } -+ else -+ return 1; -+ -+ return 0; -+} -+ - static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn, - int where, int size, u32 *val) - { -@@ -95,6 +168,11 @@ static int cns3xxx_pci_read_config(struc - - ret = pci_generic_config_read(bus, devfn, where, size, val); - -+ if (check_master_abort(bus, devfn, where)) { -+ printk(KERN_ERR "pci error: %04d:%02x:%02x.%02x %02x(%d)= master_abort on read\n", pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn), where, size); -+ return PCIBIOS_DEVICE_NOT_FOUND; -+ } -+ - if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn && - (where & 0xffc) == PCI_CLASS_REVISION) - /* -@@ -257,8 +335,14 @@ static void __init cns3xxx_pcie_hw_init( - static int cns3xxx_pcie_abort_handler(unsigned long addr, unsigned int fsr, - struct pt_regs *regs) - { -+#if 0 -+/* R14_ABORT = PC+4 for XSCALE but not ARM11MPCORE -+ * ignore imprecise aborts and use PCI-compatible Status register to -+ * determine errors instead -+ */ - if (fsr & (1 << 10)) - regs->ARM_pc += 4; -+#endif - return 0; - } - diff --git a/target/linux/cns3xxx/patches-4.14/065-pcie_skip_inactive.patch b/target/linux/cns3xxx/patches-4.14/065-pcie_skip_inactive.patch deleted file mode 100644 index b8b5f273a1..0000000000 --- a/target/linux/cns3xxx/patches-4.14/065-pcie_skip_inactive.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/pcie.c -+++ b/arch/arm/mach-cns3xxx/pcie.c -@@ -366,6 +366,8 @@ void __init cns3xxx_pcie_init_late(void) - - for (i = 0; i < ARRAY_SIZE(cns3xxx_pcie); i++) { - cns3xxx_pcie_check_link(&cns3xxx_pcie[i]); -+ if (!cns3xxx_pcie[i].linked) -+ continue; - cns3xxx_pcie_hw_init(&cns3xxx_pcie[i]); - private_data = &cns3xxx_pcie[i]; - pci_common_init(&hw_pci); diff --git a/target/linux/cns3xxx/patches-4.14/070-i2c_support.patch b/target/linux/cns3xxx/patches-4.14/070-i2c_support.patch deleted file mode 100644 index 53a6f7ff5e..0000000000 --- a/target/linux/cns3xxx/patches-4.14/070-i2c_support.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- a/drivers/i2c/busses/Kconfig -+++ b/drivers/i2c/busses/Kconfig -@@ -474,6 +474,18 @@ config I2C_CBUS_GPIO - This driver can also be built as a module. If so, the module - will be called i2c-cbus-gpio. - -+config I2C_CNS3XXX -+ tristate "Cavium CNS3xxx I2C driver" -+ depends on ARCH_CNS3XXX -+ help -+ Support for Cavium CNS3xxx I2C controller driver. -+ -+ This driver can also be built as a module. If so, the module -+ will be called i2c-cns3xxx. -+ -+ Please note that this driver might be needed to bring up other -+ devices such as Cavium CNS3xxx Ethernet. -+ - config I2C_CPM - tristate "Freescale CPM1 or CPM2 (MPC8xx/826x)" - depends on CPM1 || CPM2 ---- a/drivers/i2c/busses/Makefile -+++ b/drivers/i2c/busses/Makefile -@@ -128,6 +128,7 @@ obj-$(CONFIG_I2C_VIPERBOARD) += i2c-vipe - obj-$(CONFIG_I2C_ACORN) += i2c-acorn.o - obj-$(CONFIG_I2C_BCM_KONA) += i2c-bcm-kona.o - obj-$(CONFIG_I2C_BRCMSTB) += i2c-brcmstb.o -+obj-$(CONFIG_I2C_CNS3XXX) += i2c-cns3xxx.o - obj-$(CONFIG_I2C_CROS_EC_TUNNEL) += i2c-cros-ec-tunnel.o - obj-$(CONFIG_I2C_ELEKTOR) += i2c-elektor.o - obj-$(CONFIG_I2C_MLXCPLD) += i2c-mlxcpld.o diff --git a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch b/target/linux/cns3xxx/patches-4.14/075-spi_support.patch deleted file mode 100644 index 401ec876e9..0000000000 --- a/target/linux/cns3xxx/patches-4.14/075-spi_support.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/drivers/spi/Kconfig -+++ b/drivers/spi/Kconfig -@@ -206,6 +206,13 @@ config SPI_CLPS711X - This enables dedicated general purpose SPI/Microwire1-compatible - master mode interface (SSI1) for CLPS711X-based CPUs. - -+config SPI_CNS3XXX -+ tristate "CNS3XXX SPI controller" -+ depends on ARCH_CNS3XXX && SPI_MASTER -+ select SPI_BITBANG -+ help -+ This enables using the CNS3XXX SPI controller in master mode. -+ - config SPI_COLDFIRE_QSPI - tristate "Freescale Coldfire QSPI controller" - depends on (M520x || M523x || M5249 || M525x || M527x || M528x || M532x) ---- a/drivers/spi/Makefile -+++ b/drivers/spi/Makefile -@@ -31,6 +31,7 @@ obj-$(CONFIG_SPI_BITBANG) += spi-bitban - obj-$(CONFIG_SPI_BUTTERFLY) += spi-butterfly.o - obj-$(CONFIG_SPI_CADENCE) += spi-cadence.o - obj-$(CONFIG_SPI_CLPS711X) += spi-clps711x.o -+obj-$(CONFIG_SPI_CNS3XXX) += spi-cns3xxx.o - obj-$(CONFIG_SPI_COLDFIRE_QSPI) += spi-coldfire-qspi.o - obj-$(CONFIG_SPI_DAVINCI) += spi-davinci.o - obj-$(CONFIG_SPI_DLN2) += spi-dln2.o ---- a/include/linux/spi/spi.h -+++ b/include/linux/spi/spi.h -@@ -799,6 +799,10 @@ struct spi_transfer { - u32 speed_hz; - - struct list_head transfer_list; -+ -+#ifdef CONFIG_ARCH_CNS3XXX -+ unsigned last_in_message_list; -+#endif - }; - - /** ---- a/drivers/spi/spi.c -+++ b/drivers/spi/spi.c -@@ -1029,6 +1029,9 @@ static int spi_transfer_one_message(stru - list_for_each_entry(xfer, &msg->transfers, transfer_list) { - trace_spi_transfer_start(msg, xfer); - -+ xfer->last_in_message_list = -+ list_is_last(&xfer->transfer_list, &msg->transfers); -+ - spi_statistics_add_transfer_stats(statm, xfer, ctlr); - spi_statistics_add_transfer_stats(stats, xfer, ctlr); - diff --git a/target/linux/cns3xxx/patches-4.14/080-sata_support.patch b/target/linux/cns3xxx/patches-4.14/080-sata_support.patch deleted file mode 100644 index 479a9b634e..0000000000 --- a/target/linux/cns3xxx/patches-4.14/080-sata_support.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/drivers/ata/ahci_platform.c -+++ b/drivers/ata/ahci_platform.c -@@ -37,12 +37,23 @@ static struct scsi_host_template ahci_pl - AHCI_SHT(DRV_NAME), - }; - -+static const struct ata_port_info cns3xxx_port_info = { -+ .flags = AHCI_FLAG_COMMON, -+ .pio_mask = ATA_PIO4, -+ .udma_mask = ATA_UDMA6, -+ .port_ops = &ahci_pmp_retry_srst_ops, -+}; -+ - static int ahci_probe(struct platform_device *pdev) - { - struct device *dev = &pdev->dev; - struct ahci_host_priv *hpriv; -+ const struct ata_port_info *info = &ahci_port_info; - int rc; - -+ if (IS_ENABLED(CONFIG_ARCH_CNS3XXX)) -+ info = &cns3xxx_port_info; -+ - hpriv = ahci_platform_get_resources(pdev); - if (IS_ERR(hpriv)) - return PTR_ERR(hpriv); diff --git a/target/linux/cns3xxx/patches-4.14/090-timers.patch b/target/linux/cns3xxx/patches-4.14/090-timers.patch deleted file mode 100644 index b3810f8c9b..0000000000 --- a/target/linux/cns3xxx/patches-4.14/090-timers.patch +++ /dev/null @@ -1,105 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/core.c -+++ b/arch/arm/mach-cns3xxx/core.c -@@ -138,6 +138,7 @@ static int cns3xxx_set_oneshot(struct cl - - /* period set, and timer enabled in 'next_event' hook */ - ctrl |= (1 << 2) | (1 << 9); -+ writel(0, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET); - writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); - return 0; - } -@@ -148,7 +149,7 @@ static int cns3xxx_set_periodic(struct c - int pclk = cns3xxx_cpu_clock() / 8; - int reload; - -- reload = pclk * 20 / (3 * HZ) * 0x25000; -+ reload = pclk * 1000000 / HZ; - writel(reload, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET); - ctrl |= (1 << 0) | (1 << 2) | (1 << 9); - writel(ctrl, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); -@@ -175,8 +176,8 @@ static struct clock_event_device cns3xxx - .set_state_oneshot = cns3xxx_set_oneshot, - .tick_resume = cns3xxx_shutdown, - .set_next_event = cns3xxx_timer_set_next_event, -- .rating = 350, -- .cpumask = cpu_all_mask, -+ .rating = 300, -+ .cpumask = cpu_possible_mask, - }; - - static void __init cns3xxx_clockevents_init(unsigned int timer_irq) -@@ -220,6 +221,32 @@ static void __init cns3xxx_init_twd(void - twd_local_timer_register(&cns3xx_twd_local_timer); - } - -+static u64 cns3xxx_get_cycles(struct clocksource *cs) -+{ -+ u64 val; -+ -+ val = readl(cns3xxx_tmr1 + TIMER_FREERUN_CONTROL_OFFSET); -+ val &= 0xffff; -+ -+ return ((val << 32) | readl(cns3xxx_tmr1 + TIMER_FREERUN_OFFSET)); -+} -+ -+static struct clocksource clocksource_cns3xxx = { -+ .name = "freerun", -+ .rating = 200, -+ .read = cns3xxx_get_cycles, -+ .mask = CLOCKSOURCE_MASK(48), -+ .flags = CLOCK_SOURCE_IS_CONTINUOUS, -+}; -+ -+static void __init cns3xxx_clocksource_init(void) -+{ -+ /* Reset the FreeRunning counter */ -+ writel((1 << 16), cns3xxx_tmr1 + TIMER_FREERUN_CONTROL_OFFSET); -+ -+ clocksource_register_khz(&clocksource_cns3xxx, 100); -+} -+ - /* - * Set up the clock source and clock events devices - */ -@@ -237,13 +264,12 @@ static void __init __cns3xxx_timer_init( - /* stop free running timer3 */ - writel(0, cns3xxx_tmr1 + TIMER_FREERUN_CONTROL_OFFSET); - -- /* timer1 */ -- writel(0x5C800, cns3xxx_tmr1 + TIMER1_COUNTER_OFFSET); -- writel(0x5C800, cns3xxx_tmr1 + TIMER1_AUTO_RELOAD_OFFSET); -- - writel(0, cns3xxx_tmr1 + TIMER1_MATCH_V1_OFFSET); - writel(0, cns3xxx_tmr1 + TIMER1_MATCH_V2_OFFSET); - -+ val = (cns3xxx_cpu_clock() >> 3) * 1000000 / HZ; -+ writel(val, cns3xxx_tmr1 + TIMER1_COUNTER_OFFSET); -+ - /* mask irq, non-mask timer1 overflow */ - irq_mask = readl(cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET); - irq_mask &= ~(1 << 2); -@@ -255,23 +281,9 @@ static void __init __cns3xxx_timer_init( - val |= (1 << 9); - writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); - -- /* timer2 */ -- writel(0, cns3xxx_tmr1 + TIMER2_MATCH_V1_OFFSET); -- writel(0, cns3xxx_tmr1 + TIMER2_MATCH_V2_OFFSET); -- -- /* mask irq */ -- irq_mask = readl(cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET); -- irq_mask |= ((1 << 3) | (1 << 4) | (1 << 5)); -- writel(irq_mask, cns3xxx_tmr1 + TIMER1_2_INTERRUPT_MASK_OFFSET); -- -- /* down counter */ -- val = readl(cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); -- val |= (1 << 10); -- writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); -- -- /* Make irqs happen for the system timer */ - setup_irq(timer_irq, &cns3xxx_timer_irq); - -+ cns3xxx_clocksource_init(); - cns3xxx_clockevents_init(timer_irq); - cns3xxx_init_twd(); - } diff --git a/target/linux/cns3xxx/patches-4.14/093-add-virt-pci-io-mapping.patch b/target/linux/cns3xxx/patches-4.14/093-add-virt-pci-io-mapping.patch deleted file mode 100644 index 0fa7ed483f..0000000000 --- a/target/linux/cns3xxx/patches-4.14/093-add-virt-pci-io-mapping.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/cns3xxx.h -+++ b/arch/arm/mach-cns3xxx/cns3xxx.h -@@ -162,11 +162,13 @@ - #define CNS3XXX_L2C_BASE 0x92000000 /* L2 Cache Control */ - - #define CNS3XXX_PCIE0_MEM_BASE 0xA0000000 /* PCIe Port 0 IO/Memory Space */ -+#define CNS3XXX_PCIE0_MEM_BASE_VIRT 0xE0000000 - - #define CNS3XXX_PCIE0_HOST_BASE 0xAB000000 /* PCIe Port 0 RC Base */ - #define CNS3XXX_PCIE0_HOST_BASE_VIRT 0xE1000000 - - #define CNS3XXX_PCIE0_IO_BASE 0xAC000000 /* PCIe Port 0 */ -+#define CNS3XXX_PCIE0_IO_BASE_VIRT 0xE2000000 - - #define CNS3XXX_PCIE0_CFG0_BASE 0xAD000000 /* PCIe Port 0 CFG Type 0 */ - #define CNS3XXX_PCIE0_CFG0_BASE_VIRT 0xE3000000 -@@ -175,13 +177,16 @@ - #define CNS3XXX_PCIE0_CFG1_BASE_VIRT 0xE4000000 - - #define CNS3XXX_PCIE0_MSG_BASE 0xAF000000 /* PCIe Port 0 Message Space */ -+#define CNS3XXX_PCIE0_MSG_BASE_VIRT 0xE5000000 - - #define CNS3XXX_PCIE1_MEM_BASE 0xB0000000 /* PCIe Port 1 IO/Memory Space */ -+#define CNS3XXX_PCIE1_MEM_BASE_VIRT 0xE8000000 - - #define CNS3XXX_PCIE1_HOST_BASE 0xBB000000 /* PCIe Port 1 RC Base */ - #define CNS3XXX_PCIE1_HOST_BASE_VIRT 0xE9000000 - - #define CNS3XXX_PCIE1_IO_BASE 0xBC000000 /* PCIe Port 1 */ -+#define CNS3XXX_PCIE1_IO_BASE_VIRT 0xEA000000 - - #define CNS3XXX_PCIE1_CFG0_BASE 0xBD000000 /* PCIe Port 1 CFG Type 0 */ - #define CNS3XXX_PCIE1_CFG0_BASE_VIRT 0xEB000000 -@@ -190,6 +195,7 @@ - #define CNS3XXX_PCIE1_CFG1_BASE_VIRT 0xEC000000 - - #define CNS3XXX_PCIE1_MSG_BASE 0xBF000000 /* PCIe Port 1 Message Space */ -+#define CNS3XXX_PCIE1_MSG_BASE_VIRT 0xED000000 - - /* - * Testchip peripheral and fpga gic regions diff --git a/target/linux/cns3xxx/patches-4.14/095-gpio_support.patch b/target/linux/cns3xxx/patches-4.14/095-gpio_support.patch deleted file mode 100644 index 8345f2f144..0000000000 --- a/target/linux/cns3xxx/patches-4.14/095-gpio_support.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/cns3420vb.c -+++ b/arch/arm/mach-cns3xxx/cns3420vb.c -@@ -223,6 +223,10 @@ static void __init cns3420_init(void) - - cns3xxx_ahci_init(); - cns3xxx_sdhci_init(); -+ cns3xxx_gpio_init( 0, 32, CNS3XXX_GPIOA_BASE_VIRT, IRQ_CNS3XXX_GPIOA, -+ NR_IRQS_CNS3XXX); -+ cns3xxx_gpio_init(32, 32, CNS3XXX_GPIOB_BASE_VIRT, IRQ_CNS3XXX_GPIOB, -+ NR_IRQS_CNS3XXX + 32); - - pm_power_off = cns3xxx_power_off; - } ---- a/arch/arm/mach-cns3xxx/Kconfig -+++ b/arch/arm/mach-cns3xxx/Kconfig -@@ -3,6 +3,8 @@ menuconfig ARCH_CNS3XXX - bool "Cavium Networks CNS3XXX family" - depends on ARCH_MULTI_V6 - select ARM_GIC -+ select ARCH_REQUIRE_GPIOLIB -+ select GENERIC_IRQ_CHIP - select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD - select HAVE_SMP ---- a/arch/arm/mach-cns3xxx/Makefile -+++ b/arch/arm/mach-cns3xxx/Makefile -@@ -2,7 +2,7 @@ - ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include - - obj-$(CONFIG_ARCH_CNS3XXX) += cns3xxx.o --cns3xxx-y += core.o pm.o -+cns3xxx-y += core.o pm.o gpio.o - cns3xxx-$(CONFIG_ATAGS) += devices.o - cns3xxx-$(CONFIG_PCI) += pcie.o - cns3xxx-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o ---- a/arch/arm/mach-cns3xxx/cns3xxx.h -+++ b/arch/arm/mach-cns3xxx/cns3xxx.h -@@ -68,8 +68,10 @@ - #define SMC_PCELL_ID_3_OFFSET 0xFFC - - #define CNS3XXX_GPIOA_BASE 0x74000000 /* GPIO port A */ -+#define CNS3XXX_GPIOA_BASE_VIRT 0xFB006000 - - #define CNS3XXX_GPIOB_BASE 0x74800000 /* GPIO port B */ -+#define CNS3XXX_GPIOB_BASE_VIRT 0xFB007000 - - #define CNS3XXX_RTC_BASE 0x75000000 /* Real Time Clock */ - ---- a/arch/arm/mach-cns3xxx/core.c -+++ b/arch/arm/mach-cns3xxx/core.c -@@ -50,6 +50,16 @@ static struct map_desc cns3xxx_io_desc[] - .pfn = __phys_to_pfn(CNS3XXX_PM_BASE), - .length = SZ_4K, - .type = MT_DEVICE, -+ }, { -+ .virtual = CNS3XXX_GPIOA_BASE_VIRT, -+ .pfn = __phys_to_pfn(CNS3XXX_GPIOA_BASE), -+ .length = SZ_4K, -+ .type = MT_DEVICE, -+ }, { -+ .virtual = CNS3XXX_GPIOB_BASE_VIRT, -+ .pfn = __phys_to_pfn(CNS3XXX_GPIOB_BASE), -+ .length = SZ_4K, -+ .type = MT_DEVICE, - #ifdef CONFIG_PCI - }, { - .virtual = CNS3XXX_PCIE0_HOST_BASE_VIRT, diff --git a/target/linux/cns3xxx/patches-4.14/097-l2x0_cmdline_disable.patch b/target/linux/cns3xxx/patches-4.14/097-l2x0_cmdline_disable.patch deleted file mode 100644 index b4720b11de..0000000000 --- a/target/linux/cns3xxx/patches-4.14/097-l2x0_cmdline_disable.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/core.c -+++ b/arch/arm/mach-cns3xxx/core.c -@@ -307,13 +307,26 @@ void __init cns3xxx_timer_init(void) - - #ifdef CONFIG_CACHE_L2X0 - --void __init cns3xxx_l2x0_init(void) -+static int cns3xxx_l2x0_enable = 1; -+ -+static int __init cns3xxx_l2x0_disable(char *s) -+{ -+ cns3xxx_l2x0_enable = 0; -+ return 1; -+} -+__setup("nol2x0", cns3xxx_l2x0_disable); -+ -+static int __init cns3xxx_l2x0_init(void) - { -- void __iomem *base = ioremap(CNS3XXX_L2C_BASE, SZ_4K); -+ void __iomem *base; - u32 val; - -+ if (!cns3xxx_l2x0_enable) -+ return 0; -+ -+ base = ioremap(CNS3XXX_L2C_BASE, SZ_4K); - if (WARN_ON(!base)) -- return; -+ return 0; - - /* - * Tag RAM Control register -@@ -343,7 +356,10 @@ void __init cns3xxx_l2x0_init(void) - - /* 32 KiB, 8-way, parity disable */ - l2x0_init(base, 0x00500000, 0xfe0f0fff); -+ -+ return 0; - } -+arch_initcall(cns3xxx_l2x0_init); - - #endif /* CONFIG_CACHE_L2X0 */ - ---- a/arch/arm/mach-cns3xxx/cns3420vb.c -+++ b/arch/arm/mach-cns3xxx/cns3420vb.c -@@ -217,8 +217,6 @@ static struct platform_device *cns3420_p - - static void __init cns3420_init(void) - { -- cns3xxx_l2x0_init(); -- - platform_add_devices(cns3420_pdevs, ARRAY_SIZE(cns3420_pdevs)); - - cns3xxx_ahci_init(); ---- a/arch/arm/mach-cns3xxx/core.h -+++ b/arch/arm/mach-cns3xxx/core.h -@@ -16,12 +16,6 @@ - extern struct smp_operations cns3xxx_smp_ops; - extern void cns3xxx_timer_init(void); - --#ifdef CONFIG_CACHE_L2X0 --void __init cns3xxx_l2x0_init(void); --#else --static inline void cns3xxx_l2x0_init(void) {} --#endif /* CONFIG_CACHE_L2X0 */ -- - #ifdef CONFIG_PCI - extern void __init cns3xxx_pcie_init_late(void); - #else diff --git a/target/linux/cns3xxx/patches-4.14/100-laguna_support.patch b/target/linux/cns3xxx/patches-4.14/100-laguna_support.patch deleted file mode 100644 index c0160d8f12..0000000000 --- a/target/linux/cns3xxx/patches-4.14/100-laguna_support.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/Kconfig -+++ b/arch/arm/mach-cns3xxx/Kconfig -@@ -23,4 +23,12 @@ config MACH_CNS3420VB - This is a platform with an on-board ARM11 MPCore and has support - for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, etc. - -+config MACH_GW2388 -+ bool "Support for Gateworks Laguna Platform" -+ help -+ Include support for the Gateworks Laguna Platform -+ -+ This is a platform with an on-board ARM11 MPCore and has support -+ for USB, USB-OTG, MMC/SD/SDIO, SATA, PCI-E, I2C, GIG, etc. -+ - endif ---- a/arch/arm/mach-cns3xxx/Makefile -+++ b/arch/arm/mach-cns3xxx/Makefile -@@ -8,3 +8,5 @@ cns3xxx-$(CONFIG_PCI) += pcie.o - cns3xxx-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o - cns3xxx-$(CONFIG_SMP) += platsmp.o headsmp.o cns3xxx_fiq.o - cns3xxx-$(CONFIG_HOTPLUG_CPU) += hotplug.o -+cns3xxx-$(CONFIG_MACH_GW2388) += laguna.o -+ ---- a/arch/arm/mach-cns3xxx/devices.c -+++ b/arch/arm/mach-cns3xxx/devices.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include "cns3xxx.h" - #include "pm.h" - #include "core.h" -@@ -101,7 +102,11 @@ void __init cns3xxx_sdhci_init(void) - u32 gpioa_pins = __raw_readl(gpioa); - - /* MMC/SD pins share with GPIOA */ -- gpioa_pins |= 0x1fff0004; -+ if (machine_is_gw2388()) { -+ gpioa_pins |= 0x1fff0000; -+ } else { -+ gpioa_pins |= 0x1fff0004; -+ } - __raw_writel(gpioa_pins, gpioa); - - cns3xxx_pwr_clk_en(CNS3XXX_PWR_CLK_EN(SDIO)); diff --git a/target/linux/cns3xxx/patches-4.14/101-laguna_sdhci_card_detect.patch b/target/linux/cns3xxx/patches-4.14/101-laguna_sdhci_card_detect.patch deleted file mode 100644 index 72648a5f9f..0000000000 --- a/target/linux/cns3xxx/patches-4.14/101-laguna_sdhci_card_detect.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/drivers/mmc/host/sdhci-cns3xxx.c -+++ b/drivers/mmc/host/sdhci-cns3xxx.c -@@ -88,9 +88,9 @@ static const struct sdhci_pltfm_data sdh - .ops = &sdhci_cns3xxx_ops, - .quirks = SDHCI_QUIRK_BROKEN_DMA | - SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK | -- SDHCI_QUIRK_INVERTED_WRITE_PROTECT | - SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN | -- SDHCI_QUIRK_BROKEN_TIMEOUT_VAL, -+ SDHCI_QUIRK_BROKEN_TIMEOUT_VAL | -+ SDHCI_QUIRK_BROKEN_CARD_DETECTION, - }; - - static int sdhci_cns3xxx_probe(struct platform_device *pdev) diff --git a/target/linux/cns3xxx/patches-4.14/110-pci_isolated_interrupts.patch b/target/linux/cns3xxx/patches-4.14/110-pci_isolated_interrupts.patch deleted file mode 100644 index 800be813b8..0000000000 --- a/target/linux/cns3xxx/patches-4.14/110-pci_isolated_interrupts.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- a/arch/arm/mach-cns3xxx/pcie.c -+++ b/arch/arm/mach-cns3xxx/pcie.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include "cns3xxx.h" -@@ -27,7 +28,7 @@ struct cns3xxx_pcie { - void __iomem *host_regs; /* PCI config registers for host bridge */ - void __iomem *cfg0_regs; /* PCI Type 0 config registers */ - void __iomem *cfg1_regs; /* PCI Type 1 config registers */ -- unsigned int irqs[2]; -+ unsigned int irqs[5]; - struct resource res_io; - struct resource res_mem; - int port; -@@ -95,7 +96,7 @@ static inline int check_master_abort(str - void __iomem *host_base; - u32 sreg, ereg; - -- host_base = (void __iomem *) cnspci->cfg_bases[CNS3XXX_HOST_TYPE].virtual; -+ host_base = (void __iomem *) cnspci->host_regs; - sreg = __raw_readw(host_base + 0x6) & 0xF900; - ereg = __raw_readl(host_base + 0x104); // Uncorrectable Error Status Reg - -@@ -209,7 +210,7 @@ static struct pci_ops cns3xxx_pcie_ops = - static int cns3xxx_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) - { - struct cns3xxx_pcie *cnspci = pdev_to_cnspci(dev); -- int irq = cnspci->irqs[!!dev->bus->number]; -+ int irq = cnspci->irqs[!!dev->bus->number + pin - 1]; - - pr_info("PCIe map irq: %04d:%02x:%02x.%02x slot %d, pin %d, irq: %d\n", - pci_domain_nr(dev->bus), dev->bus->number, PCI_SLOT(dev->devfn), -@@ -235,7 +236,13 @@ static struct cns3xxx_pcie cns3xxx_pcie[ - .end = CNS3XXX_PCIE0_HOST_BASE - 1, /* 176 MiB */ - .flags = IORESOURCE_MEM, - }, -- .irqs = { IRQ_CNS3XXX_PCIE0_RC, IRQ_CNS3XXX_PCIE0_DEVICE, }, -+ .irqs = { -+ IRQ_CNS3XXX_PCIE0_RC, -+ IRQ_CNS3XXX_PCIE0_DEVICE, -+ IRQ_CNS3XXX_PCIE0_DEVICE, -+ IRQ_CNS3XXX_PCIE0_DEVICE, -+ IRQ_CNS3XXX_PCIE0_DEVICE, -+ }, - .port = 0, - }, - [1] = { -@@ -254,7 +261,13 @@ static struct cns3xxx_pcie cns3xxx_pcie[ - .end = CNS3XXX_PCIE1_HOST_BASE - 1, /* 176 MiB */ - .flags = IORESOURCE_MEM, - }, -- .irqs = { IRQ_CNS3XXX_PCIE1_RC, IRQ_CNS3XXX_PCIE1_DEVICE, }, -+ .irqs = { -+ IRQ_CNS3XXX_PCIE1_RC, -+ IRQ_CNS3XXX_PCIE1_DEVICE, -+ IRQ_CNS3XXX_PCIE1_DEVICE, -+ IRQ_CNS3XXX_PCIE1_DEVICE, -+ IRQ_CNS3XXX_PCIE1_DEVICE, -+ }, - .port = 1, - }, - }; -@@ -346,6 +359,14 @@ static int cns3xxx_pcie_abort_handler(un - return 0; - } - -+void __init cns3xxx_pcie_set_irqs(int bus, int *irqs) -+{ -+ int i; -+ -+ for (i = 0; i < 4; i++) -+ cns3xxx_pcie[bus].irqs[i + 1] = irqs[i]; -+} -+ - void __init cns3xxx_pcie_init_late(void) - { - int i; ---- a/arch/arm/mach-cns3xxx/core.h -+++ b/arch/arm/mach-cns3xxx/core.h -@@ -18,8 +18,10 @@ extern void cns3xxx_timer_init(void); - - #ifdef CONFIG_PCI - extern void __init cns3xxx_pcie_init_late(void); -+extern void __init cns3xxx_pcie_set_irqs(int bus, int *irqs); - #else - static inline void __init cns3xxx_pcie_init_late(void) {} -+static inline void cns3xxx_pcie_set_irqs(int bus, int *irqs) {} - #endif - - void __init cns3xxx_map_io(void); diff --git a/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch b/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch deleted file mode 100644 index ef7da9fe23..0000000000 --- a/target/linux/cns3xxx/patches-4.14/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/drivers/pci/probe.c -+++ b/drivers/pci/probe.c -@@ -2309,7 +2309,8 @@ static void pcie_write_mrrs(struct pci_d - /* In the "safe" case, do not configure the MRRS. There appear to be - * issues with setting MRRS to 0 on a number of devices. - */ -- if (pcie_bus_config != PCIE_BUS_PERFORMANCE) -+ if (pcie_bus_config != PCIE_BUS_PERFORMANCE && -+ pcie_bus_config != PCIE_BUS_PEER2PEER) - return; - - /* For Max performance, the MRRS must be set to the largest supported ---- a/include/linux/pci.h -+++ b/include/linux/pci.h -@@ -847,7 +847,7 @@ enum pcie_bus_config_types { - PCIE_BUS_DEFAULT, /* ensure MPS matches upstream bridge */ - PCIE_BUS_SAFE, /* use largest MPS boot-time devices support */ - PCIE_BUS_PERFORMANCE, /* use MPS and MRRS for best performance */ -- PCIE_BUS_PEER2PEER, /* set MPS = 128 for all devices */ -+ PCIE_BUS_PEER2PEER, /* set MPS and MRSS to 128 for all devices */ - }; - - extern enum pcie_bus_config_types pcie_bus_config; diff --git a/target/linux/cns3xxx/patches-4.14/200-broadcom_phy_reinit.patch b/target/linux/cns3xxx/patches-4.14/200-broadcom_phy_reinit.patch deleted file mode 100644 index 6880533a05..0000000000 --- a/target/linux/cns3xxx/patches-4.14/200-broadcom_phy_reinit.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/drivers/net/phy/broadcom.c -+++ b/drivers/net/phy/broadcom.c -@@ -417,7 +417,11 @@ static int bcm5481_config_aneg(struct ph - ret = genphy_config_aneg(phydev); - - /* Then we can set up the delay. */ -- bcm5481x_config(phydev); -+ //bcm5481x_config(phydev); -+ -+ phy_write(phydev, 0x18, 0xf1e7); -+ phy_write(phydev, 0x1c, 0x8e00); -+ phy_write(phydev, 0x1c, 0xa41f); - - if (of_property_read_bool(np, "enet-phy-lane-swap")) { - /* Lane Swap - Undocumented register...magic! */ diff --git a/target/linux/cns3xxx/patches-4.14/210-dwc2_defaults.patch b/target/linux/cns3xxx/patches-4.14/210-dwc2_defaults.patch deleted file mode 100644 index 67f152f43d..0000000000 --- a/target/linux/cns3xxx/patches-4.14/210-dwc2_defaults.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/drivers/usb/dwc2/params.c -+++ b/drivers/usb/dwc2/params.c -@@ -136,6 +136,36 @@ static void dwc2_set_stm32f4x9_fsotg_par - p->activate_stm_fs_transceiver = true; - } - -+static void dwc2_set_cns3xxx_params(struct dwc2_hsotg *hsotg) -+{ -+ struct dwc2_core_params *p = &hsotg->params; -+ -+ p->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE; /* non-HNP/non-SRP capable */ -+ p->host_dma = 1; -+ p->dma_desc_enable = 0; -+ p->speed = DWC2_SPEED_PARAM_HIGH; /* High Speed */ -+ p->enable_dynamic_fifo = 1; -+ p->en_multiple_tx_fifo = 1; -+ p->host_rx_fifo_size = 658; /* 774 DWORDs */ -+ p->host_nperio_tx_fifo_size = 128; /* 256 DWORDs */ -+ p->host_perio_tx_fifo_size = 658; /* 512 DWORDs */ -+ p->max_transfer_size = 65535, -+ p->max_packet_count = 511; -+ p->host_channels = 16; -+ p->phy_type = DWC2_PHY_TYPE_PARAM_UTMI; /* UTMI */ -+ p->phy_utmi_width = 16; /* 8 bits */ -+ p->phy_ulpi_ddr = 0; /* Single */ -+ p->phy_ulpi_ext_vbus = 0; -+ p->i2c_enable = 0; -+ p->ulpi_fs_ls = 0; -+ p->host_support_fs_ls_low_power = 0; -+ p->host_ls_low_power_phy_clk = 0; /* 48 MHz */ -+ p->ts_dline = 0; -+ p->reload_ctl = 0; -+ p->ahbcfg = 0x10; -+ p->uframe_sched = false; -+} -+ - const struct of_device_id dwc2_of_match_table[] = { - { .compatible = "brcm,bcm2835-usb", .data = dwc2_set_bcm_params }, - { .compatible = "hisilicon,hi6220-usb", .data = dwc2_set_his_params }, -@@ -710,17 +740,23 @@ int dwc2_get_hwparams(struct dwc2_hsotg - - int dwc2_init_params(struct dwc2_hsotg *hsotg) - { -+ /* - const struct of_device_id *match; - void (*set_params)(void *data); -+ */ - - dwc2_set_default_params(hsotg); - dwc2_get_device_properties(hsotg); - -+ /* - match = of_match_device(dwc2_of_match_table, hsotg->dev); - if (match && match->data) { - set_params = match->data; - set_params(hsotg); - } -+ */ -+ -+ dwc2_set_cns3xxx_params(hsotg); - - dwc2_check_params(hsotg); - diff --git a/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts b/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts new file mode 100644 index 0000000000..39f72e375a --- /dev/null +++ b/target/linux/ramips/dts/mt7621_iodata_wn-ax2033gr.dts @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "mt7621_iodata_wn-xx-xr.dtsi" + +/ { + compatible = "iodata,wn-ax2033gr", "mediatek,mt7621-soc"; + model = "I-O DATA WN-AX2033GR"; +}; + +&partitions { + partition@6b00000 { + label = "Backup"; + reg = <0x6b00000 0x1480000>; + read-only; + }; +}; + +&pcie0 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + + mediatek,mtd-eeprom = <&factory 0x0>; + ieee80211-freq-limit = <2400000 2483000>; + }; +}; + +&pcie1 { + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + + mediatek,mtd-eeprom = <&factory 0x8000>; + ieee80211-freq-limit = <5000000 5710000>; + }; +}; diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts deleted file mode 100644 index b4deb490ed..0000000000 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx-sfp.dts +++ /dev/null @@ -1,17 +0,0 @@ -/dts-v1/; - -#include "mt7621_ubiquiti_edgerouterx.dtsi" - -/ { - model = "UBNT-ERX-SFP"; - compatible = "ubiquiti,edgerouterx-sfp", "mediatek,mt7621-soc"; -}; - -&i2c { - status = "okay"; - - pca9555@25 { - compatible = "nxp,pca9555"; - reg = <0x25>; - }; -}; diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts b/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts deleted file mode 100644 index 5c1d9ec887..0000000000 --- a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dts +++ /dev/null @@ -1,8 +0,0 @@ -/dts-v1/; - -#include "mt7621_ubiquiti_edgerouterx.dtsi" - -/ { - model = "UBNT-ERX"; - compatible = "ubiquiti,edgerouterx", "mediatek,mt7621-soc"; -}; diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts new file mode 100644 index 0000000000..9515f1d8b5 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x-sfp.dts @@ -0,0 +1,17 @@ +/dts-v1/; + +#include "mt7621_ubnt_edgerouter-x.dtsi" + +/ { + model = "Ubiquiti EdgeRouter X SFP"; + compatible = "ubnt,edgerouter-x-sfp", "mediatek,mt7621-soc"; +}; + +&i2c { + status = "okay"; + + pca9555@25 { + compatible = "nxp,pca9555"; + reg = <0x25>; + }; +}; diff --git a/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts new file mode 100644 index 0000000000..260baf9cf9 --- /dev/null +++ b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dts @@ -0,0 +1,8 @@ +/dts-v1/; + +#include "mt7621_ubnt_edgerouter-x.dtsi" + +/ { + model = "Ubiquiti EdgeRouter X"; + compatible = "ubnt,edgerouter-x", "mediatek,mt7621-soc"; +}; diff --git a/target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi b/target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi similarity index 100% rename from target/linux/ramips/dts/mt7621_ubiquiti_edgerouterx.dtsi rename to target/linux/ramips/dts/mt7621_ubnt_edgerouter-x.dtsi diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 5b177ce08a..731bf1ba65 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -381,6 +381,22 @@ define Device/iodata_wn-ax1167gr2 endef TARGET_DEVICES += iodata_wn-ax1167gr2 +define Device/iodata_wn-ax2033gr + BLOCKSIZE := 128k + PAGESIZE := 2048 + UBINIZE_OPTS := -E 5 + UIMAGE_MAGIC := 0x434f4d42 + KERNEL_SIZE := 4096k + IMAGE_SIZE := 51200k + DEVICE_VENDOR := I-O DATA + DEVICE_MODEL := WN-AX2033GR + KERNEL_INITRAMFS := $(KERNEL_DTB) | custom-initramfs-uimage 3.10(VST.1)C10 | \ + iodata-mstc-header + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata + DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e wpad-basic +endef +TARGET_DEVICES += iodata_wn-ax2033gr + define Device/iodata_wn-dx1167r BLOCKSIZE := 128k PAGESIZE := 2048 @@ -776,27 +792,30 @@ define Device/tplink_re650-v1 endef TARGET_DEVICES += tplink_re650-v1 -define Device/ubiquiti_edgerouterx +define Device/ubnt_edgerouter_common + DEVICE_VENDOR := Ubiquiti IMAGE_SIZE := 256768k FILESYSTEMS := squashfs KERNEL_SIZE := 3145728 KERNEL_INITRAMFS := $$(KERNEL) | \ ubnt-erx-factory-image $(KDIR)/tmp/$$(KERNEL_INITRAMFS_PREFIX)-factory.tar IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata - DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := EdgeRouter X - SUPPORTED_DEVICES += ubnt-erx endef -TARGET_DEVICES += ubiquiti_edgerouterx -define Device/ubiquiti_edgerouterx-sfp - $(Device/ubiquiti_edgerouterx) - DEVICE_VENDOR := Ubiquiti - DEVICE_MODEL := EdgeRouter X-SFP - DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x - SUPPORTED_DEVICES += ubnt-erx-sfp +define Device/ubnt_edgerouter-x + $(Device/ubnt_edgerouter_common) + DEVICE_MODEL := EdgeRouter X + SUPPORTED_DEVICES += ubnt-erx ubiquiti,edgerouterx endef -TARGET_DEVICES += ubiquiti_edgerouterx-sfp +TARGET_DEVICES += ubnt_edgerouter-x + +define Device/ubnt_edgerouter-x-sfp + $(Device/ubnt_edgerouter_common) + DEVICE_MODEL := EdgeRouter X SFP + DEVICE_PACKAGES += kmod-i2c-algo-pca kmod-gpio-pca953x + SUPPORTED_DEVICES += ubnt-erx-sfp ubiquiti,edgerouterx-sfp +endef +TARGET_DEVICES += ubnt_edgerouter-x-sfp define Device/ubnt_unifi-nanohd DEVICE_VENDOR := Ubiquiti diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index f573a049ce..252f9f1dda 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -42,8 +42,8 @@ ramips_setup_interfaces() mikrotik,routerboard-750gr3) ucidef_set_interfaces_lan_wan "lan2 lan3 lan4 lan5" "wan" ;; - ubiquiti,edgerouterx|\ - ubiquiti,edgerouterx-sfp) + ubnt,edgerouter-x|\ + ubnt,edgerouter-x-sfp) ucidef_set_interface_lan "eth0 eth1 eth2 eth3 eth4" ;; *) diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches index 511d9deed8..91a9459d8c 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches @@ -13,10 +13,10 @@ mikrotik,routerboard-750gr3) telco-electronics,x1) ucidef_add_gpio_switch "modem_reset" "Modem Reset" "16" ;; -ubiquiti,edgerouterx) +ubnt,edgerouter-x) ucidef_add_gpio_switch "poe_passthrough" "PoE Passthrough" "0" ;; -ubiquiti,edgerouterx-sfp) +ubnt,edgerouter-x-sfp) ucidef_add_gpio_switch "poe_power_port0" "PoE Power Port0" "496" ucidef_add_gpio_switch "poe_power_port1" "PoE Power Port1" "497" ucidef_add_gpio_switch "poe_power_port2" "PoE Power Port2" "498" diff --git a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master b/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master index 7a11252168..b8ebcc3f41 100644 --- a/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master +++ b/target/linux/ramips/mt7621/base-files/lib/preinit/07_mt7621_bringup_dsa_master @@ -7,8 +7,8 @@ mt7621_bringup_dsa_master() { local masterif case "$board" in - ubiquiti,edgerouterx|\ - ubiquiti,edgerouterx-sfp) + ubnt,edgerouter-x|\ + ubnt,edgerouter-x-sfp) masterif="dsa" ;; *) diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh index afb3a52a82..864c59c8e5 100755 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh @@ -57,12 +57,13 @@ platform_do_upgrade() { nand_do_upgrade "$1" ;; iodata,wn-ax1167gr2|\ + iodata,wn-ax2033gr|\ iodata,wn-dx1167r) iodata_mstc_upgrade_prepare nand_do_upgrade "$1" ;; - ubiquiti,edgerouterx|\ - ubiquiti,edgerouterx-sfp) + ubnt,edgerouter-x|\ + ubnt,edgerouter-x-sfp) platform_upgrade_ubnt_erx "$1" ;; *)