[LEDE-DEV,9/9] cns3xxx: remove linux 4.9 support

Message ID 1515683081-31607-10-git-send-email-koen.vandeputte@ncentric.com
State Changes Requested
Delegated to: John Crispin
Headers show
Series
  • cns3xxx, update to kernel 4.14
Related show

Commit Message

Koen Vandeputte Jan. 11, 2018, 3:04 p.m.
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
---
 target/linux/cns3xxx/config-4.9                    | 300 ---------------------
 .../patches-4.9/000-cns3xxx_arch_include.patch     |   8 -
 .../patches-4.9/001-arm_openwrt_machtypes.patch    |   7 -
 .../010-arm_introduce-dma-fiq-irq-broadcast.patch  |  80 ------
 .../cns3xxx/patches-4.9/020-watchdog_support.patch | 185 -------------
 .../cns3xxx/patches-4.9/025-smp_support.patch      |  30 ---
 .../linux/cns3xxx/patches-4.9/030-pcie_clock.patch |  11 -
 .../cns3xxx/patches-4.9/040-fiq_support.patch      |  40 ---
 .../linux/cns3xxx/patches-4.9/045-twd_base.patch   |  43 ---
 target/linux/cns3xxx/patches-4.9/055-pcie_io.patch |  19 --
 .../linux/cns3xxx/patches-4.9/060-pcie_abort.patch | 109 --------
 .../patches-4.9/065-pcie_skip_inactive.patch       |  11 -
 .../cns3xxx/patches-4.9/070-i2c_support.patch      |  31 ---
 .../cns3xxx/patches-4.9/075-spi_support.patch      |  51 ----
 .../cns3xxx/patches-4.9/080-sata_support.patch     |  26 --
 target/linux/cns3xxx/patches-4.9/090-timers.patch  | 103 -------
 .../patches-4.9/093-add-virt-pci-io-mapping.patch  |  41 ---
 .../cns3xxx/patches-4.9/095-gpio_support.patch     |  67 -----
 .../patches-4.9/097-l2x0_cmdline_disable.patch     |  69 -----
 .../cns3xxx/patches-4.9/100-laguna_support.patch   |  46 ----
 .../patches-4.9/101-laguna_sdhci_card_detect.patch |  14 -
 .../patches-4.9/110-pci_isolated_interrupts.patch  |  95 -------
 ...ER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch |  23 --
 .../patches-4.9/200-broadcom_phy_reinit.patch      |  14 -
 .../cns3xxx/patches-4.9/210-dwc2_defaults.patch    |  47 ----
 25 files changed, 1470 deletions(-)
 delete mode 100644 target/linux/cns3xxx/config-4.9
 delete mode 100644 target/linux/cns3xxx/patches-4.9/000-cns3xxx_arch_include.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/001-arm_openwrt_machtypes.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/010-arm_introduce-dma-fiq-irq-broadcast.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/020-watchdog_support.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/025-smp_support.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/030-pcie_clock.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/040-fiq_support.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/045-twd_base.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/055-pcie_io.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/060-pcie_abort.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/065-pcie_skip_inactive.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/070-i2c_support.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/075-spi_support.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/080-sata_support.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/090-timers.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/093-add-virt-pci-io-mapping.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/095-gpio_support.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/097-l2x0_cmdline_disable.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/100-laguna_support.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/101-laguna_sdhci_card_detect.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/110-pci_isolated_interrupts.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/200-broadcom_phy_reinit.patch
 delete mode 100644 target/linux/cns3xxx/patches-4.9/210-dwc2_defaults.patch

Comments

John Crispin Jan. 17, 2018, 9:21 a.m. | #1
Hi

merged the first 8 patches, please rework this to additionally fold the 
irq imbalance patch into the files/... dir

     John


On 11/01/18 16:04, Koen Vandeputte wrote:
> Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
> ---
>   target/linux/cns3xxx/config-4.9                    | 300 ---------------------
>   .../patches-4.9/000-cns3xxx_arch_include.patch     |   8 -
>   .../patches-4.9/001-arm_openwrt_machtypes.patch    |   7 -
>   .../010-arm_introduce-dma-fiq-irq-broadcast.patch  |  80 ------
>   .../cns3xxx/patches-4.9/020-watchdog_support.patch | 185 -------------
>   .../cns3xxx/patches-4.9/025-smp_support.patch      |  30 ---
>   .../linux/cns3xxx/patches-4.9/030-pcie_clock.patch |  11 -
>   .../cns3xxx/patches-4.9/040-fiq_support.patch      |  40 ---
>   .../linux/cns3xxx/patches-4.9/045-twd_base.patch   |  43 ---
>   target/linux/cns3xxx/patches-4.9/055-pcie_io.patch |  19 --
>   .../linux/cns3xxx/patches-4.9/060-pcie_abort.patch | 109 --------
>   .../patches-4.9/065-pcie_skip_inactive.patch       |  11 -
>   .../cns3xxx/patches-4.9/070-i2c_support.patch      |  31 ---
>   .../cns3xxx/patches-4.9/075-spi_support.patch      |  51 ----
>   .../cns3xxx/patches-4.9/080-sata_support.patch     |  26 --
>   target/linux/cns3xxx/patches-4.9/090-timers.patch  | 103 -------
>   .../patches-4.9/093-add-virt-pci-io-mapping.patch  |  41 ---
>   .../cns3xxx/patches-4.9/095-gpio_support.patch     |  67 -----
>   .../patches-4.9/097-l2x0_cmdline_disable.patch     |  69 -----
>   .../cns3xxx/patches-4.9/100-laguna_support.patch   |  46 ----
>   .../patches-4.9/101-laguna_sdhci_card_detect.patch |  14 -
>   .../patches-4.9/110-pci_isolated_interrupts.patch  |  95 -------
>   ...ER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch |  23 --
>   .../patches-4.9/200-broadcom_phy_reinit.patch      |  14 -
>   .../cns3xxx/patches-4.9/210-dwc2_defaults.patch    |  47 ----
>   25 files changed, 1470 deletions(-)
>   delete mode 100644 target/linux/cns3xxx/config-4.9
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/000-cns3xxx_arch_include.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/001-arm_openwrt_machtypes.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/010-arm_introduce-dma-fiq-irq-broadcast.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/020-watchdog_support.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/025-smp_support.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/030-pcie_clock.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/040-fiq_support.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/045-twd_base.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/055-pcie_io.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/060-pcie_abort.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/065-pcie_skip_inactive.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/070-i2c_support.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/075-spi_support.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/080-sata_support.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/090-timers.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/093-add-virt-pci-io-mapping.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/095-gpio_support.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/097-l2x0_cmdline_disable.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/100-laguna_support.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/101-laguna_sdhci_card_detect.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/110-pci_isolated_interrupts.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/200-broadcom_phy_reinit.patch
>   delete mode 100644 target/linux/cns3xxx/patches-4.9/210-dwc2_defaults.patch
>
> diff --git a/target/linux/cns3xxx/config-4.9 b/target/linux/cns3xxx/config-4.9
> deleted file mode 100644
> index 36b4857c2352..000000000000
> --- a/target/linux/cns3xxx/config-4.9
> +++ /dev/null
> @@ -1,300 +0,0 @@
> -CONFIG_ALIGNMENT_TRAP=y
> -CONFIG_ARCH_CLOCKSOURCE_DATA=y
> -CONFIG_ARCH_CNS3XXX=y
> -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
> -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
> -CONFIG_ARCH_HAS_SG_CHAIN=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_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_BROADCOM_PHY=y
> -CONFIG_CACHE_L2X0=y
> -CONFIG_CLKDEV_LOOKUP=y
> -CONFIG_CLKSRC_OF=y
> -CONFIG_CLKSRC_PROBE=y
> -CONFIG_CLONE_BACKWARDS=y
> -CONFIG_CMDLINE="console=ttyS0,115200"
> -CONFIG_CMDLINE_FORCE=y
> -CONFIG_CNS3XXX_ETH=y
> -CONFIG_COMMON_CLK=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_SW_DOMAIN_PAN is not set
> -CONFIG_CPU_TLB_V6=y
> -CONFIG_CPU_V6K=y
> -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_BUGVERBOSE=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_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_EARLY_IOREMAP=y
> -CONFIG_GENERIC_IDLE_POLL_SETUP=y
> -CONFIG_GENERIC_IO=y
> -CONFIG_GENERIC_IRQ_CHIP=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_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_CBPF_JIT=y
> -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_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_SOURCE=""
> -CONFIG_IOMMU_HELPER=y
> -CONFIG_IRQCHIP=y
> -CONFIG_IRQ_DOMAIN=y
> -CONFIG_IRQ_DOMAIN_HIERARCHY=y
> -CONFIG_IRQ_FORCED_THREADING=y
> -CONFIG_IRQ_WORK=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_MDIO_BOARDINFO=y
> -CONFIG_MIGHT_HAVE_CACHE_L2X0=y
> -CONFIG_MIGHT_HAVE_PCI=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_NET_FLOW_LIMIT=y
> -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_PPS=y
> -CONFIG_PPS_CLIENT_GPIO=y
> -CONFIG_RAID_ATTRS=y
> -CONFIG_RATIONAL=y
> -CONFIG_RCU_STALL_COMMON=y
> -CONFIG_REGMAP=y
> -CONFIG_REGMAP_I2C=y
> -CONFIG_REGMAP_SPI=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_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_TREE_RCU=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_PCI is not set
> -# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
> -CONFIG_USB_EHCI_HCD=y
> -CONFIG_USB_EHCI_HCD_PLATFORM=y
> -CONFIG_USB_EHCI_PCI=y
> -CONFIG_USB_GADGET=y
> -CONFIG_USB_OHCI_HCD=y
> -CONFIG_USB_OHCI_HCD_PLATFORM=y
> -CONFIG_USB_SUPPORT=y
> -# CONFIG_USB_UHCI_HCD is not set
> -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.9/000-cns3xxx_arch_include.patch b/target/linux/cns3xxx/patches-4.9/000-cns3xxx_arch_include.patch
> deleted file mode 100644
> index f98fe0c2ba66..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/000-cns3xxx_arch_include.patch
> +++ /dev/null
> @@ -1,8 +0,0 @@
> ---- a/arch/arm/mach-cns3xxx/Makefile
> -+++ b/arch/arm/mach-cns3xxx/Makefile
> -@@ -1,3 +1,5 @@
> -+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.9/001-arm_openwrt_machtypes.patch b/target/linux/cns3xxx/patches-4.9/001-arm_openwrt_machtypes.patch
> deleted file mode 100644
> index 32f977fafc4b..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/001-arm_openwrt_machtypes.patch
> +++ /dev/null
> @@ -1,7 +0,0 @@
> ---- a/arch/arm/tools/mach-types
> -+++ b/arch/arm/tools/mach-types
> -@@ -1006,3 +1006,4 @@ eco5_bx2		MACH_ECO5_BX2		ECO5_BX2		4572
> - eukrea_cpuimx28sd	MACH_EUKREA_CPUIMX28SD	EUKREA_CPUIMX28SD	4573
> - domotab			MACH_DOMOTAB		DOMOTAB			4574
> - pfla03			MACH_PFLA03		PFLA03			4575
> -+gw2388			MACH_GW2388		GW2388			2635
> diff --git a/target/linux/cns3xxx/patches-4.9/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/cns3xxx/patches-4.9/010-arm_introduce-dma-fiq-irq-broadcast.patch
> deleted file mode 100644
> index b2b6f509dbe5..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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
> -@@ -873,6 +873,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
> -@@ -329,7 +330,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
> -@@ -4,8 +4,13 @@
> - #include <asm/glue-cache.h>
> -
> - #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.9/020-watchdog_support.patch b/target/linux/cns3xxx/patches-4.9/020-watchdog_support.patch
> deleted file mode 100644
> index 4f9f3e646522..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/020-watchdog_support.patch
> +++ /dev/null
> @@ -1,185 +0,0 @@
> -Add a watchdog driver for ARM MPcore processors.
> -
> -Signed-off-by: Felix Fietkau <nbd@nbd.name>
> ----
> ---- a/drivers/watchdog/Kconfig
> -+++ b/drivers/watchdog/Kconfig
> -@@ -324,6 +324,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
> -@@ -47,6 +47,7 @@ obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
> - obj-$(CONFIG_977_WATCHDOG) += wdt977.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 <nbd@nbd.name>
> -+ */
> -+
> -+#include <linux/export.h>
> -+#include <linux/module.h>
> -+#include <linux/kernel.h>
> -+#include <linux/watchdog.h>
> -+#include <linux/platform_device.h>
> -+#include <linux/io.h>
> -+#include <asm/smp_twd.h>
> -+
> -+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: %u prescaler: %u countrate: %u 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 <nbd@nbd.name>");
> -+MODULE_LICENSE("GPL");
> ---- a/arch/arm/include/asm/smp_twd.h
> -+++ b/arch/arm/include/asm/smp_twd.h
> -@@ -33,5 +33,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 <linux/delay.h>
> - #include <linux/device.h>
> - #include <linux/err.h>
> -+#include <linux/export.h>
> - #include <linux/smp.h>
> - #include <linux/jiffies.h>
> - #include <linux/clockchips.h>
> -@@ -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.9/025-smp_support.patch b/target/linux/cns3xxx/patches-4.9/025-smp_support.patch
> deleted file mode 100644
> index 7c2624a3a639..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/025-smp_support.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> ---- a/arch/arm/mach-cns3xxx/Makefile
> -+++ b/arch/arm/mach-cns3xxx/Makefile
> -@@ -5,3 +5,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
> -@@ -2,6 +2,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 <linux/reboot.h>
> -
> -+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.9/030-pcie_clock.patch b/target/linux/cns3xxx/patches-4.9/030-pcie_clock.patch
> deleted file mode 100644
> index 66c3a99ae10b..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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.9/040-fiq_support.patch b/target/linux/cns3xxx/patches-4.9/040-fiq_support.patch
> deleted file mode 100644
> index b391eb92d0f4..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/040-fiq_support.patch
> +++ /dev/null
> @@ -1,40 +0,0 @@
> ---- a/arch/arm/mach-cns3xxx/Kconfig
> -+++ b/arch/arm/mach-cns3xxx/Kconfig
> -@@ -5,6 +5,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
> -@@ -5,5 +5,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
> -@@ -856,7 +856,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.9/045-twd_base.patch b/target/linux/cns3xxx/patches-4.9/045-twd_base.patch
> deleted file mode 100644
> index e722b01bbce0..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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 <linux/platform_device.h>
> - #include <linux/usb/ehci_pdriver.h>
> - #include <linux/usb/ohci_pdriver.h>
> -+#include <asm/smp_twd.h>
> - #include <asm/mach/arch.h>
> - #include <asm/mach/map.h>
> - #include <asm/mach/time.h>
> -@@ -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.9/055-pcie_io.patch b/target/linux/cns3xxx/patches-4.9/055-pcie_io.patch
> deleted file mode 100644
> index 4680853e6e1b..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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.9/060-pcie_abort.patch b/target/linux/cns3xxx/patches-4.9/060-pcie_abort.patch
> deleted file mode 100644
> index 7a3a8e4c250c..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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 & 0xffc) + (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(" <PERR");
> -+			if (sreg & BIT(14)) printk(" >SERR");
> -+			if (sreg & BIT(13)) printk(" <MABRT");
> -+			if (sreg & BIT(12)) printk(" <TABRT");
> -+			if (sreg & BIT(11)) 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_read32(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.9/065-pcie_skip_inactive.patch b/target/linux/cns3xxx/patches-4.9/065-pcie_skip_inactive.patch
> deleted file mode 100644
> index b8b5f273a18d..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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.9/070-i2c_support.patch b/target/linux/cns3xxx/patches-4.9/070-i2c_support.patch
> deleted file mode 100644
> index dc64da1e07f8..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/070-i2c_support.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> ---- a/drivers/i2c/busses/Kconfig
> -+++ b/drivers/i2c/busses/Kconfig
> -@@ -441,6 +441,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
> -@@ -114,6 +114,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_OPAL)		+= i2c-opal.o
> diff --git a/target/linux/cns3xxx/patches-4.9/075-spi_support.patch b/target/linux/cns3xxx/patches-4.9/075-spi_support.patch
> deleted file mode 100644
> index aeda7a326915..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/075-spi_support.patch
> +++ /dev/null
> @@ -1,51 +0,0 @@
> ---- a/drivers/spi/Kconfig
> -+++ b/drivers/spi/Kconfig
> -@@ -199,6 +199,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
> -@@ -29,6 +29,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
> -@@ -763,6 +763,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
> -@@ -985,6 +985,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, master);
> - 		spi_statistics_add_transfer_stats(stats, xfer, master);
> -
> diff --git a/target/linux/cns3xxx/patches-4.9/080-sata_support.patch b/target/linux/cns3xxx/patches-4.9/080-sata_support.patch
> deleted file mode 100644
> index 479a9b634ec0..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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.9/090-timers.patch b/target/linux/cns3xxx/patches-4.9/090-timers.patch
> deleted file mode 100644
> index 6f7713f209e8..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/090-timers.patch
> +++ /dev/null
> @@ -1,103 +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,7 +176,7 @@ 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,
> -+	.rating			= 300,
> - 	.cpumask		= cpu_all_mask,
> - };
> -
> -@@ -220,6 +221,32 @@ static void __init cns3xxx_init_twd(void
> - 	twd_local_timer_register(&cns3xx_twd_local_timer);
> - }
> -
> -+static cycle_t 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.9/093-add-virt-pci-io-mapping.patch b/target/linux/cns3xxx/patches-4.9/093-add-virt-pci-io-mapping.patch
> deleted file mode 100644
> index 0fa7ed483f6d..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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.9/095-gpio_support.patch b/target/linux/cns3xxx/patches-4.9/095-gpio_support.patch
> deleted file mode 100644
> index 76eb7f64c255..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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
> -@@ -2,6 +2,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
> -@@ -1,7 +1,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.9/097-l2x0_cmdline_disable.patch b/target/linux/cns3xxx/patches-4.9/097-l2x0_cmdline_disable.patch
> deleted file mode 100644
> index b4720b11de76..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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.9/100-laguna_support.patch b/target/linux/cns3xxx/patches-4.9/100-laguna_support.patch
> deleted file mode 100644
> index 3c0bba4316e7..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/100-laguna_support.patch
> +++ /dev/null
> @@ -1,46 +0,0 @@
> ---- a/arch/arm/mach-cns3xxx/Kconfig
> -+++ b/arch/arm/mach-cns3xxx/Kconfig
> -@@ -22,4 +22,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
> -@@ -7,3 +7,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 <linux/compiler.h>
> - #include <linux/dma-mapping.h>
> - #include <linux/platform_device.h>
> -+#include <asm/mach-types.h>
> - #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.9/101-laguna_sdhci_card_detect.patch b/target/linux/cns3xxx/patches-4.9/101-laguna_sdhci_card_detect.patch
> deleted file mode 100644
> index 72648a5f9f92..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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.9/110-pci_isolated_interrupts.patch b/target/linux/cns3xxx/patches-4.9/110-pci_isolated_interrupts.patch
> deleted file mode 100644
> index 800be813b82a..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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 <linux/io.h>
> - #include <linux/ioport.h>
> - #include <linux/interrupt.h>
> -+#include <linux/irq.h>
> - #include <linux/ptrace.h>
> - #include <asm/mach/map.h>
> - #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.9/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch b/target/linux/cns3xxx/patches-4.9/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch
> deleted file mode 100644
> index 2e30fe500692..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/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
> -@@ -2015,7 +2015,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
> -@@ -783,7 +783,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.9/200-broadcom_phy_reinit.patch b/target/linux/cns3xxx/patches-4.9/200-broadcom_phy_reinit.patch
> deleted file mode 100644
> index 0352a89f9ee7..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/200-broadcom_phy_reinit.patch
> +++ /dev/null
> @@ -1,14 +0,0 @@
> ---- a/drivers/net/phy/broadcom.c
> -+++ b/drivers/net/phy/broadcom.c
> -@@ -420,6 +420,11 @@ static int bcm5481_config_aneg(struct ph
> - 		/* Write bits 14:0. */
> - 		reg |= (1 << 15);
> - 		phy_write(phydev, 0x18, reg);
> -+	} else {
> -+		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")) {
> diff --git a/target/linux/cns3xxx/patches-4.9/210-dwc2_defaults.patch b/target/linux/cns3xxx/patches-4.9/210-dwc2_defaults.patch
> deleted file mode 100644
> index 9cd05eac6a76..000000000000
> --- a/target/linux/cns3xxx/patches-4.9/210-dwc2_defaults.patch
> +++ /dev/null
> @@ -1,47 +0,0 @@
> ---- a/drivers/usb/dwc2/platform.c
> -+++ b/drivers/usb/dwc2/platform.c
> -@@ -308,6 +308,34 @@ static int __dwc2_lowlevel_hw_enable(str
> - 	return ret;
> - }
> -
> -+static const struct dwc2_core_params params_cns3xxx = {
> -+	.otg_cap			= 2,	/* non-HNP/non-SRP capable */
> -+	.otg_ver			= 0,	/* 1.3 */
> -+	.dma_enable			= 1,
> -+	.dma_desc_enable		= 0,
> -+	.speed				= 0,	/* High Speed */
> -+	.enable_dynamic_fifo		= 1,
> -+	.en_multiple_tx_fifo		= 1,
> -+	.host_rx_fifo_size		= 658,	/* 774 DWORDs */
> -+	.host_nperio_tx_fifo_size	= 128,	/* 256 DWORDs */
> -+	.host_perio_tx_fifo_size	= 658,	/* 512 DWORDs */
> -+	.max_transfer_size		= 65535,
> -+	.max_packet_count		= 511,
> -+	.host_channels			= 16,
> -+	.phy_type			= 1,	/* UTMI */
> -+	.phy_utmi_width			= 16,	/* 8 bits */
> -+	.phy_ulpi_ddr			= 0,	/* Single */
> -+	.phy_ulpi_ext_vbus		= 0,
> -+	.i2c_enable			= 0,
> -+	.ulpi_fs_ls			= 0,
> -+	.host_support_fs_ls_low_power	= 0,
> -+	.host_ls_low_power_phy_clk	= 0,	/* 48 MHz */
> -+	.ts_dline			= 0,
> -+	.reload_ctl			= 0,
> -+	.ahbcfg				= 0x10,
> -+	.uframe_sched			= 0,
> -+};
> -+
> - /**
> -  * dwc2_lowlevel_hw_enable - enable platform lowlevel hw resources
> -  * @hsotg: The driver state
> -@@ -552,6 +580,9 @@ static int dwc2_driver_probe(struct plat
> - 		/* Default all params to autodetect */
> - 		dwc2_set_all_params(&defparams, -1);
> - 		params = &defparams;
> -+#ifdef CONFIG_ARCH_CNS3XXX
> -+		params = &params_cns3xxx;
> -+#endif
> -
> - 		/*
> - 		 * Disable descriptor dma mode by default as the HW can support

Patch

diff --git a/target/linux/cns3xxx/config-4.9 b/target/linux/cns3xxx/config-4.9
deleted file mode 100644
index 36b4857c2352..000000000000
--- a/target/linux/cns3xxx/config-4.9
+++ /dev/null
@@ -1,300 +0,0 @@ 
-CONFIG_ALIGNMENT_TRAP=y
-CONFIG_ARCH_CLOCKSOURCE_DATA=y
-CONFIG_ARCH_CNS3XXX=y
-CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
-CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
-CONFIG_ARCH_HAS_SG_CHAIN=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_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_BROADCOM_PHY=y
-CONFIG_CACHE_L2X0=y
-CONFIG_CLKDEV_LOOKUP=y
-CONFIG_CLKSRC_OF=y
-CONFIG_CLKSRC_PROBE=y
-CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMDLINE="console=ttyS0,115200"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_CNS3XXX_ETH=y
-CONFIG_COMMON_CLK=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_SW_DOMAIN_PAN is not set
-CONFIG_CPU_TLB_V6=y
-CONFIG_CPU_V6K=y
-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_BUGVERBOSE=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_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_EARLY_IOREMAP=y
-CONFIG_GENERIC_IDLE_POLL_SETUP=y
-CONFIG_GENERIC_IO=y
-CONFIG_GENERIC_IRQ_CHIP=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_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_CBPF_JIT=y
-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_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_SOURCE=""
-CONFIG_IOMMU_HELPER=y
-CONFIG_IRQCHIP=y
-CONFIG_IRQ_DOMAIN=y
-CONFIG_IRQ_DOMAIN_HIERARCHY=y
-CONFIG_IRQ_FORCED_THREADING=y
-CONFIG_IRQ_WORK=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_MDIO_BOARDINFO=y
-CONFIG_MIGHT_HAVE_CACHE_L2X0=y
-CONFIG_MIGHT_HAVE_PCI=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_NET_FLOW_LIMIT=y
-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_PPS=y
-CONFIG_PPS_CLIENT_GPIO=y
-CONFIG_RAID_ATTRS=y
-CONFIG_RATIONAL=y
-CONFIG_RCU_STALL_COMMON=y
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=y
-CONFIG_REGMAP_SPI=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_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_TREE_RCU=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_PCI is not set
-# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
-CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_EHCI_PCI=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
-CONFIG_USB_SUPPORT=y
-# CONFIG_USB_UHCI_HCD is not set
-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.9/000-cns3xxx_arch_include.patch b/target/linux/cns3xxx/patches-4.9/000-cns3xxx_arch_include.patch
deleted file mode 100644
index f98fe0c2ba66..000000000000
--- a/target/linux/cns3xxx/patches-4.9/000-cns3xxx_arch_include.patch
+++ /dev/null
@@ -1,8 +0,0 @@ 
---- a/arch/arm/mach-cns3xxx/Makefile
-+++ b/arch/arm/mach-cns3xxx/Makefile
-@@ -1,3 +1,5 @@
-+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.9/001-arm_openwrt_machtypes.patch b/target/linux/cns3xxx/patches-4.9/001-arm_openwrt_machtypes.patch
deleted file mode 100644
index 32f977fafc4b..000000000000
--- a/target/linux/cns3xxx/patches-4.9/001-arm_openwrt_machtypes.patch
+++ /dev/null
@@ -1,7 +0,0 @@ 
---- a/arch/arm/tools/mach-types
-+++ b/arch/arm/tools/mach-types
-@@ -1006,3 +1006,4 @@ eco5_bx2		MACH_ECO5_BX2		ECO5_BX2		4572
- eukrea_cpuimx28sd	MACH_EUKREA_CPUIMX28SD	EUKREA_CPUIMX28SD	4573
- domotab			MACH_DOMOTAB		DOMOTAB			4574
- pfla03			MACH_PFLA03		PFLA03			4575
-+gw2388			MACH_GW2388		GW2388			2635
diff --git a/target/linux/cns3xxx/patches-4.9/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/cns3xxx/patches-4.9/010-arm_introduce-dma-fiq-irq-broadcast.patch
deleted file mode 100644
index b2b6f509dbe5..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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
-@@ -873,6 +873,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
-@@ -329,7 +330,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
-@@ -4,8 +4,13 @@
- #include <asm/glue-cache.h>
- 
- #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.9/020-watchdog_support.patch b/target/linux/cns3xxx/patches-4.9/020-watchdog_support.patch
deleted file mode 100644
index 4f9f3e646522..000000000000
--- a/target/linux/cns3xxx/patches-4.9/020-watchdog_support.patch
+++ /dev/null
@@ -1,185 +0,0 @@ 
-Add a watchdog driver for ARM MPcore processors.
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
----
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -324,6 +324,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
-@@ -47,6 +47,7 @@ obj-$(CONFIG_21285_WATCHDOG) += wdt285.o
- obj-$(CONFIG_977_WATCHDOG) += wdt977.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 <nbd@nbd.name>
-+ */
-+
-+#include <linux/export.h>
-+#include <linux/module.h>
-+#include <linux/kernel.h>
-+#include <linux/watchdog.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <asm/smp_twd.h>
-+
-+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: %u prescaler: %u countrate: %u 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 <nbd@nbd.name>");
-+MODULE_LICENSE("GPL");
---- a/arch/arm/include/asm/smp_twd.h
-+++ b/arch/arm/include/asm/smp_twd.h
-@@ -33,5 +33,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 <linux/delay.h>
- #include <linux/device.h>
- #include <linux/err.h>
-+#include <linux/export.h>
- #include <linux/smp.h>
- #include <linux/jiffies.h>
- #include <linux/clockchips.h>
-@@ -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.9/025-smp_support.patch b/target/linux/cns3xxx/patches-4.9/025-smp_support.patch
deleted file mode 100644
index 7c2624a3a639..000000000000
--- a/target/linux/cns3xxx/patches-4.9/025-smp_support.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
---- a/arch/arm/mach-cns3xxx/Makefile
-+++ b/arch/arm/mach-cns3xxx/Makefile
-@@ -5,3 +5,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
-@@ -2,6 +2,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 <linux/reboot.h>
- 
-+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.9/030-pcie_clock.patch b/target/linux/cns3xxx/patches-4.9/030-pcie_clock.patch
deleted file mode 100644
index 66c3a99ae10b..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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.9/040-fiq_support.patch b/target/linux/cns3xxx/patches-4.9/040-fiq_support.patch
deleted file mode 100644
index b391eb92d0f4..000000000000
--- a/target/linux/cns3xxx/patches-4.9/040-fiq_support.patch
+++ /dev/null
@@ -1,40 +0,0 @@ 
---- a/arch/arm/mach-cns3xxx/Kconfig
-+++ b/arch/arm/mach-cns3xxx/Kconfig
-@@ -5,6 +5,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
-@@ -5,5 +5,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
-@@ -856,7 +856,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.9/045-twd_base.patch b/target/linux/cns3xxx/patches-4.9/045-twd_base.patch
deleted file mode 100644
index e722b01bbce0..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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 <linux/platform_device.h>
- #include <linux/usb/ehci_pdriver.h>
- #include <linux/usb/ohci_pdriver.h>
-+#include <asm/smp_twd.h>
- #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
- #include <asm/mach/time.h>
-@@ -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.9/055-pcie_io.patch b/target/linux/cns3xxx/patches-4.9/055-pcie_io.patch
deleted file mode 100644
index 4680853e6e1b..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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.9/060-pcie_abort.patch b/target/linux/cns3xxx/patches-4.9/060-pcie_abort.patch
deleted file mode 100644
index 7a3a8e4c250c..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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 & 0xffc) + (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(" <PERR");
-+			if (sreg & BIT(14)) printk(" >SERR");
-+			if (sreg & BIT(13)) printk(" <MABRT");
-+			if (sreg & BIT(12)) printk(" <TABRT");
-+			if (sreg & BIT(11)) 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_read32(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.9/065-pcie_skip_inactive.patch b/target/linux/cns3xxx/patches-4.9/065-pcie_skip_inactive.patch
deleted file mode 100644
index b8b5f273a18d..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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.9/070-i2c_support.patch b/target/linux/cns3xxx/patches-4.9/070-i2c_support.patch
deleted file mode 100644
index dc64da1e07f8..000000000000
--- a/target/linux/cns3xxx/patches-4.9/070-i2c_support.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -441,6 +441,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
-@@ -114,6 +114,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_OPAL)		+= i2c-opal.o
diff --git a/target/linux/cns3xxx/patches-4.9/075-spi_support.patch b/target/linux/cns3xxx/patches-4.9/075-spi_support.patch
deleted file mode 100644
index aeda7a326915..000000000000
--- a/target/linux/cns3xxx/patches-4.9/075-spi_support.patch
+++ /dev/null
@@ -1,51 +0,0 @@ 
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -199,6 +199,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
-@@ -29,6 +29,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
-@@ -763,6 +763,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
-@@ -985,6 +985,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, master);
- 		spi_statistics_add_transfer_stats(stats, xfer, master);
- 
diff --git a/target/linux/cns3xxx/patches-4.9/080-sata_support.patch b/target/linux/cns3xxx/patches-4.9/080-sata_support.patch
deleted file mode 100644
index 479a9b634ec0..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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.9/090-timers.patch b/target/linux/cns3xxx/patches-4.9/090-timers.patch
deleted file mode 100644
index 6f7713f209e8..000000000000
--- a/target/linux/cns3xxx/patches-4.9/090-timers.patch
+++ /dev/null
@@ -1,103 +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,7 +176,7 @@ 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,
-+	.rating			= 300,
- 	.cpumask		= cpu_all_mask,
- };
- 
-@@ -220,6 +221,32 @@ static void __init cns3xxx_init_twd(void
- 	twd_local_timer_register(&cns3xx_twd_local_timer);
- }
- 
-+static cycle_t 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.9/093-add-virt-pci-io-mapping.patch b/target/linux/cns3xxx/patches-4.9/093-add-virt-pci-io-mapping.patch
deleted file mode 100644
index 0fa7ed483f6d..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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.9/095-gpio_support.patch b/target/linux/cns3xxx/patches-4.9/095-gpio_support.patch
deleted file mode 100644
index 76eb7f64c255..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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
-@@ -2,6 +2,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
-@@ -1,7 +1,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.9/097-l2x0_cmdline_disable.patch b/target/linux/cns3xxx/patches-4.9/097-l2x0_cmdline_disable.patch
deleted file mode 100644
index b4720b11de76..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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.9/100-laguna_support.patch b/target/linux/cns3xxx/patches-4.9/100-laguna_support.patch
deleted file mode 100644
index 3c0bba4316e7..000000000000
--- a/target/linux/cns3xxx/patches-4.9/100-laguna_support.patch
+++ /dev/null
@@ -1,46 +0,0 @@ 
---- a/arch/arm/mach-cns3xxx/Kconfig
-+++ b/arch/arm/mach-cns3xxx/Kconfig
-@@ -22,4 +22,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
-@@ -7,3 +7,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 <linux/compiler.h>
- #include <linux/dma-mapping.h>
- #include <linux/platform_device.h>
-+#include <asm/mach-types.h>
- #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.9/101-laguna_sdhci_card_detect.patch b/target/linux/cns3xxx/patches-4.9/101-laguna_sdhci_card_detect.patch
deleted file mode 100644
index 72648a5f9f92..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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.9/110-pci_isolated_interrupts.patch b/target/linux/cns3xxx/patches-4.9/110-pci_isolated_interrupts.patch
deleted file mode 100644
index 800be813b82a..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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 <linux/io.h>
- #include <linux/ioport.h>
- #include <linux/interrupt.h>
-+#include <linux/irq.h>
- #include <linux/ptrace.h>
- #include <asm/mach/map.h>
- #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.9/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch b/target/linux/cns3xxx/patches-4.9/130-Extend-PCIE_BUS_PEER2PEER-to-set-MRSS-128-to-fix-CNS3xxx-BM-DMA..patch
deleted file mode 100644
index 2e30fe500692..000000000000
--- a/target/linux/cns3xxx/patches-4.9/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
-@@ -2015,7 +2015,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
-@@ -783,7 +783,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.9/200-broadcom_phy_reinit.patch b/target/linux/cns3xxx/patches-4.9/200-broadcom_phy_reinit.patch
deleted file mode 100644
index 0352a89f9ee7..000000000000
--- a/target/linux/cns3xxx/patches-4.9/200-broadcom_phy_reinit.patch
+++ /dev/null
@@ -1,14 +0,0 @@ 
---- a/drivers/net/phy/broadcom.c
-+++ b/drivers/net/phy/broadcom.c
-@@ -420,6 +420,11 @@ static int bcm5481_config_aneg(struct ph
- 		/* Write bits 14:0. */
- 		reg |= (1 << 15);
- 		phy_write(phydev, 0x18, reg);
-+	} else {
-+		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")) {
diff --git a/target/linux/cns3xxx/patches-4.9/210-dwc2_defaults.patch b/target/linux/cns3xxx/patches-4.9/210-dwc2_defaults.patch
deleted file mode 100644
index 9cd05eac6a76..000000000000
--- a/target/linux/cns3xxx/patches-4.9/210-dwc2_defaults.patch
+++ /dev/null
@@ -1,47 +0,0 @@ 
---- a/drivers/usb/dwc2/platform.c
-+++ b/drivers/usb/dwc2/platform.c
-@@ -308,6 +308,34 @@ static int __dwc2_lowlevel_hw_enable(str
- 	return ret;
- }
- 
-+static const struct dwc2_core_params params_cns3xxx = {
-+	.otg_cap			= 2,	/* non-HNP/non-SRP capable */
-+	.otg_ver			= 0,	/* 1.3 */
-+	.dma_enable			= 1,
-+	.dma_desc_enable		= 0,
-+	.speed				= 0,	/* High Speed */
-+	.enable_dynamic_fifo		= 1,
-+	.en_multiple_tx_fifo		= 1,
-+	.host_rx_fifo_size		= 658,	/* 774 DWORDs */
-+	.host_nperio_tx_fifo_size	= 128,	/* 256 DWORDs */
-+	.host_perio_tx_fifo_size	= 658,	/* 512 DWORDs */
-+	.max_transfer_size		= 65535,
-+	.max_packet_count		= 511,
-+	.host_channels			= 16,
-+	.phy_type			= 1,	/* UTMI */
-+	.phy_utmi_width			= 16,	/* 8 bits */
-+	.phy_ulpi_ddr			= 0,	/* Single */
-+	.phy_ulpi_ext_vbus		= 0,
-+	.i2c_enable			= 0,
-+	.ulpi_fs_ls			= 0,
-+	.host_support_fs_ls_low_power	= 0,
-+	.host_ls_low_power_phy_clk	= 0,	/* 48 MHz */
-+	.ts_dline			= 0,
-+	.reload_ctl			= 0,
-+	.ahbcfg				= 0x10,
-+	.uframe_sched			= 0,
-+};
-+
- /**
-  * dwc2_lowlevel_hw_enable - enable platform lowlevel hw resources
-  * @hsotg: The driver state
-@@ -552,6 +580,9 @@ static int dwc2_driver_probe(struct plat
- 		/* Default all params to autodetect */
- 		dwc2_set_all_params(&defparams, -1);
- 		params = &defparams;
-+#ifdef CONFIG_ARCH_CNS3XXX
-+		params = &params_cns3xxx;
-+#endif
- 
- 		/*
- 		 * Disable descriptor dma mode by default as the HW can support