oxnas: drop 3.14 support
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 44819
This commit is contained in:
		
							parent
							
								
									fe33c185bd
								
							
						
					
					
						commit
						a992489e4b
					
				@ -1,341 +0,0 @@
 | 
			
		||||
CONFIG_ALIGNMENT_TRAP=y
 | 
			
		||||
# CONFIG_APM_EMULATION is not set
 | 
			
		||||
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 | 
			
		||||
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 | 
			
		||||
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
 | 
			
		||||
CONFIG_ARCH_HAS_TICK_BROADCAST=y
 | 
			
		||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
 | 
			
		||||
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 | 
			
		||||
CONFIG_ARCH_NR_GPIO=0
 | 
			
		||||
CONFIG_ARCH_OXNAS=y
 | 
			
		||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
 | 
			
		||||
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
 | 
			
		||||
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 | 
			
		||||
CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=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_ARCH_WANT_LIBATA_LEDS=y
 | 
			
		||||
CONFIG_ARM=y
 | 
			
		||||
# CONFIG_ARM_CPU_SUSPEND is not set
 | 
			
		||||
CONFIG_ARM_GIC=y
 | 
			
		||||
CONFIG_ARM_L1_CACHE_SHIFT=5
 | 
			
		||||
CONFIG_ARM_NR_BANKS=8
 | 
			
		||||
CONFIG_ARM_PATCH_PHYS_VIRT=y
 | 
			
		||||
CONFIG_ARM_THUMB=y
 | 
			
		||||
CONFIG_ARM_UNWIND=y
 | 
			
		||||
CONFIG_ATA_LEDS=y
 | 
			
		||||
CONFIG_AUTO_ZRELADDR=y
 | 
			
		||||
# CONFIG_BLK_DEV_INITRD is not set
 | 
			
		||||
CONFIG_BLK_DEV_SD=y
 | 
			
		||||
CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
 | 
			
		||||
CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=1
 | 
			
		||||
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
 | 
			
		||||
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=1
 | 
			
		||||
# CONFIG_CACHE_L2X0 is not set
 | 
			
		||||
CONFIG_CLKDEV_LOOKUP=y
 | 
			
		||||
CONFIG_CLKSRC_MMIO=y
 | 
			
		||||
CONFIG_CLKSRC_OF=y
 | 
			
		||||
CONFIG_CLKSRC_RPS_TIMER=y
 | 
			
		||||
CONFIG_CLONE_BACKWARDS=y
 | 
			
		||||
CONFIG_CMDLINE="console=ttyS0,115200n8 earlyprintk=serial"
 | 
			
		||||
CONFIG_COMMON_CLK=y
 | 
			
		||||
CONFIG_COMPACTION=y
 | 
			
		||||
CONFIG_CONSOLE_POLL=y
 | 
			
		||||
CONFIG_COREDUMP=y
 | 
			
		||||
CONFIG_CPU_32v6=y
 | 
			
		||||
CONFIG_CPU_32v6K=y
 | 
			
		||||
CONFIG_CPU_ABRT_EV6=y
 | 
			
		||||
# CONFIG_CPU_BPREDICT_DISABLE is not set
 | 
			
		||||
CONFIG_CPU_CACHE_V6=y
 | 
			
		||||
CONFIG_CPU_CACHE_VIPT=y
 | 
			
		||||
CONFIG_CPU_COPY_V6=y
 | 
			
		||||
CONFIG_CPU_CP15=y
 | 
			
		||||
CONFIG_CPU_CP15_MMU=y
 | 
			
		||||
CONFIG_CPU_HAS_ASID=y
 | 
			
		||||
# CONFIG_CPU_ICACHE_DISABLE is not set
 | 
			
		||||
CONFIG_CPU_IDLE=y
 | 
			
		||||
CONFIG_CPU_IDLE_GOV_LADDER=y
 | 
			
		||||
CONFIG_CPU_IDLE_GOV_MENU=y
 | 
			
		||||
CONFIG_CPU_PABRT_V6=y
 | 
			
		||||
CONFIG_CPU_PM=y
 | 
			
		||||
CONFIG_CPU_RMAP=y
 | 
			
		||||
CONFIG_CPU_TLB_V6=y
 | 
			
		||||
CONFIG_CPU_V6K=y
 | 
			
		||||
CONFIG_CRC16=y
 | 
			
		||||
CONFIG_CRYPTO_CRC32C=y
 | 
			
		||||
CONFIG_CRYPTO_DEFLATE=y
 | 
			
		||||
CONFIG_CRYPTO_HASH=y
 | 
			
		||||
CONFIG_CRYPTO_HASH2=y
 | 
			
		||||
CONFIG_CRYPTO_LZO=y
 | 
			
		||||
CONFIG_CRYPTO_XZ=y
 | 
			
		||||
CONFIG_DCACHE_WORD_ACCESS=y
 | 
			
		||||
CONFIG_DEBUG_LL=y
 | 
			
		||||
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 | 
			
		||||
# CONFIG_DEBUG_LL_UART_8250 is not set
 | 
			
		||||
CONFIG_DEBUG_LL_UART_NONE=y
 | 
			
		||||
# CONFIG_DEBUG_LL_UART_PL01X is not set
 | 
			
		||||
# CONFIG_DEBUG_UART_8250 is not set
 | 
			
		||||
# CONFIG_DEBUG_UART_PL01X is not set
 | 
			
		||||
# CONFIG_DEBUG_USER is not set
 | 
			
		||||
CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=8
 | 
			
		||||
CONFIG_DETECT_HUNG_TASK=y
 | 
			
		||||
CONFIG_DIRECT_IO=y
 | 
			
		||||
CONFIG_DMADEVICES=y
 | 
			
		||||
CONFIG_DMA_CACHE_FIQ_BROADCAST=y
 | 
			
		||||
# CONFIG_DMA_CACHE_RWFO is not set
 | 
			
		||||
CONFIG_DMA_OF=y
 | 
			
		||||
CONFIG_DNOTIFY=y
 | 
			
		||||
CONFIG_DTC=y
 | 
			
		||||
# CONFIG_DW_DMAC_CORE is not set
 | 
			
		||||
# CONFIG_DW_DMAC_PCI is not set
 | 
			
		||||
CONFIG_EARLY_PRINTK=y
 | 
			
		||||
CONFIG_FIQ=y
 | 
			
		||||
CONFIG_GENERIC_BUG=y
 | 
			
		||||
CONFIG_GENERIC_CLOCKEVENTS=y
 | 
			
		||||
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
 | 
			
		||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 | 
			
		||||
CONFIG_GENERIC_IDLE_POLL_SETUP=y
 | 
			
		||||
CONFIG_GENERIC_IO=y
 | 
			
		||||
CONFIG_GENERIC_IRQ_SHOW=y
 | 
			
		||||
CONFIG_GENERIC_PCI_IOMAP=y
 | 
			
		||||
CONFIG_GENERIC_PINCONF=y
 | 
			
		||||
CONFIG_GENERIC_SCHED_CLOCK=y
 | 
			
		||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y
 | 
			
		||||
CONFIG_GENERIC_STRNCPY_FROM_USER=y
 | 
			
		||||
CONFIG_GENERIC_STRNLEN_USER=y
 | 
			
		||||
CONFIG_GPIOLIB=y
 | 
			
		||||
CONFIG_GPIO_DEVRES=y
 | 
			
		||||
CONFIG_GPIO_GENERIC=y
 | 
			
		||||
CONFIG_GPIO_GENERIC_PLATFORM=y
 | 
			
		||||
CONFIG_GPIO_SYSFS=y
 | 
			
		||||
CONFIG_HARDIRQS_SW_RESEND=y
 | 
			
		||||
CONFIG_HAS_DMA=y
 | 
			
		||||
CONFIG_HAS_IOMEM=y
 | 
			
		||||
CONFIG_HAS_IOPORT=y
 | 
			
		||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS 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_BPF_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_ATTRS=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_KERNEL_GZIP=y
 | 
			
		||||
CONFIG_HAVE_KERNEL_LZ4=y
 | 
			
		||||
CONFIG_HAVE_KERNEL_LZMA=y
 | 
			
		||||
CONFIG_HAVE_KERNEL_LZO=y
 | 
			
		||||
CONFIG_HAVE_KERNEL_XZ=y
 | 
			
		||||
CONFIG_HAVE_MEMBLOCK=y
 | 
			
		||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 | 
			
		||||
CONFIG_HAVE_NET_DSA=y
 | 
			
		||||
CONFIG_HAVE_OPROFILE=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_HOTPLUG_CPU=y
 | 
			
		||||
CONFIG_HZ_FIXED=0
 | 
			
		||||
CONFIG_I2C=y
 | 
			
		||||
CONFIG_I2C_ALGOBIT=y
 | 
			
		||||
CONFIG_I2C_BOARDINFO=y
 | 
			
		||||
CONFIG_ICPLUS_PHY=y
 | 
			
		||||
CONFIG_INET_DIAG=y
 | 
			
		||||
CONFIG_INET_LRO=y
 | 
			
		||||
CONFIG_INET_TCP_DIAG=y
 | 
			
		||||
CONFIG_INET_UDP_DIAG=y
 | 
			
		||||
CONFIG_INPUT=y
 | 
			
		||||
# CONFIG_INPUT_MISC is not set
 | 
			
		||||
CONFIG_IOMMU_HELPER=y
 | 
			
		||||
CONFIG_IOMMU_SUPPORT=y
 | 
			
		||||
# CONFIG_IP_ADVANCED_ROUTER is not set
 | 
			
		||||
# CONFIG_IP_MULTICAST is not set
 | 
			
		||||
CONFIG_IP_PNP=y
 | 
			
		||||
# CONFIG_IP_PNP_BOOTP is not set
 | 
			
		||||
CONFIG_IP_PNP_DHCP=y
 | 
			
		||||
# CONFIG_IP_PNP_RARP is not set
 | 
			
		||||
CONFIG_IRQCHIP=y
 | 
			
		||||
CONFIG_IRQ_DOMAIN=y
 | 
			
		||||
CONFIG_IRQ_FORCED_THREADING=y
 | 
			
		||||
CONFIG_IRQ_TIME_ACCOUNTING=y
 | 
			
		||||
CONFIG_IRQ_WORK=y
 | 
			
		||||
# CONFIG_ISDN is not set
 | 
			
		||||
# CONFIG_JFFS2_FS is not set
 | 
			
		||||
CONFIG_JUMP_LABEL=y
 | 
			
		||||
CONFIG_KALLSYMS=y
 | 
			
		||||
CONFIG_KALLSYMS_ALL=y
 | 
			
		||||
CONFIG_KGDB=y
 | 
			
		||||
# CONFIG_KGDB_KDB is not set
 | 
			
		||||
CONFIG_KGDB_SERIAL_CONSOLE=y
 | 
			
		||||
# CONFIG_KGDB_TESTS is not set
 | 
			
		||||
CONFIG_KTIME_SCALAR=y
 | 
			
		||||
# CONFIG_LDM_DEBUG is not set
 | 
			
		||||
CONFIG_LDM_PARTITION=y
 | 
			
		||||
# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
 | 
			
		||||
# CONFIG_LEDS_TRIGGER_NETDEV is not set
 | 
			
		||||
# CONFIG_LEDS_TRIGGER_TIMER is not set
 | 
			
		||||
CONFIG_LOCKUP_DETECTOR=y
 | 
			
		||||
CONFIG_LZO_COMPRESS=y
 | 
			
		||||
CONFIG_LZO_DECOMPRESS=y
 | 
			
		||||
CONFIG_MACH_OX820=y
 | 
			
		||||
CONFIG_MAGIC_SYSRQ=y
 | 
			
		||||
CONFIG_MAILBOX=y
 | 
			
		||||
CONFIG_MDIO_BOARDINFO=y
 | 
			
		||||
CONFIG_MIGHT_HAVE_PCI=y
 | 
			
		||||
CONFIG_MIGRATION=y
 | 
			
		||||
CONFIG_MODULES_USE_ELF_REL=y
 | 
			
		||||
# CONFIG_MODULE_STRIPPED is not set
 | 
			
		||||
# CONFIG_MTD_CFI is not set
 | 
			
		||||
# CONFIG_MTD_COMPLEX_MAPPINGS is not set
 | 
			
		||||
CONFIG_MTD_NAND=y
 | 
			
		||||
CONFIG_MTD_NAND_ECC=y
 | 
			
		||||
CONFIG_MTD_NAND_OXNAS=y
 | 
			
		||||
CONFIG_MTD_NAND_PLATFORM=y
 | 
			
		||||
# CONFIG_MTD_SM_COMMON is not set
 | 
			
		||||
CONFIG_MTD_SPLIT_FIRMWARE=y
 | 
			
		||||
CONFIG_MTD_UBI=y
 | 
			
		||||
CONFIG_MTD_UBI_BEB_LIMIT=20
 | 
			
		||||
CONFIG_MTD_UBI_BLOCK=y
 | 
			
		||||
# CONFIG_MTD_UBI_FASTMAP is not set
 | 
			
		||||
# CONFIG_MTD_UBI_GLUEBI is not set
 | 
			
		||||
CONFIG_MTD_UBI_WL_THRESHOLD=4096
 | 
			
		||||
CONFIG_MTD_UIMAGE_SPLIT=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_NO_HZ_COMMON=y
 | 
			
		||||
CONFIG_NO_HZ_IDLE=y
 | 
			
		||||
CONFIG_NR_CPUS=2
 | 
			
		||||
CONFIG_OF=y
 | 
			
		||||
CONFIG_OF_ADDRESS=y
 | 
			
		||||
CONFIG_OF_EARLY_FLATTREE=y
 | 
			
		||||
CONFIG_OF_FLATTREE=y
 | 
			
		||||
CONFIG_OF_GPIO=y
 | 
			
		||||
CONFIG_OF_IOMMU=y
 | 
			
		||||
CONFIG_OF_IRQ=y
 | 
			
		||||
CONFIG_OF_MDIO=y
 | 
			
		||||
CONFIG_OF_MTD=y
 | 
			
		||||
CONFIG_OF_NET=y
 | 
			
		||||
CONFIG_OF_PCI=y
 | 
			
		||||
CONFIG_OF_PCI_IRQ=y
 | 
			
		||||
CONFIG_OLD_SIGACTION=y
 | 
			
		||||
CONFIG_OLD_SIGSUSPEND3=y
 | 
			
		||||
CONFIG_PACKET_DIAG=y
 | 
			
		||||
CONFIG_PAGEFLAGS_EXTENDED=y
 | 
			
		||||
CONFIG_PAGE_OFFSET=0xC0000000
 | 
			
		||||
CONFIG_PCI=y
 | 
			
		||||
CONFIG_PCIEAER=y
 | 
			
		||||
CONFIG_PCIEASPM=y
 | 
			
		||||
# CONFIG_PCIEASPM_DEBUG is not set
 | 
			
		||||
CONFIG_PCIEASPM_DEFAULT=y
 | 
			
		||||
# CONFIG_PCIEASPM_PERFORMANCE is not set
 | 
			
		||||
# CONFIG_PCIEASPM_POWERSAVE is not set
 | 
			
		||||
CONFIG_PCIEPORTBUS=y
 | 
			
		||||
CONFIG_PCIE_PME=y
 | 
			
		||||
CONFIG_PCI_OXNAS=y
 | 
			
		||||
CONFIG_PERF_USE_VMALLOC=y
 | 
			
		||||
CONFIG_PHYLIB=y
 | 
			
		||||
CONFIG_PINCTRL=y
 | 
			
		||||
CONFIG_PINCTRL_OXNAS=y
 | 
			
		||||
CONFIG_PLXTECH_RPS=y
 | 
			
		||||
CONFIG_PM=y
 | 
			
		||||
CONFIG_PM_CLK=y
 | 
			
		||||
# CONFIG_PM_DEBUG is not set
 | 
			
		||||
CONFIG_PM_RUNTIME=y
 | 
			
		||||
CONFIG_POWER_RESET=y
 | 
			
		||||
CONFIG_POWER_RESET_GPIO=y
 | 
			
		||||
# CONFIG_POWER_RESET_VEXPRESS is not set
 | 
			
		||||
CONFIG_POWER_SUPPLY=y
 | 
			
		||||
CONFIG_PPS=y
 | 
			
		||||
# CONFIG_PREEMPT_RCU is not set
 | 
			
		||||
CONFIG_PRINTK_TIME=y
 | 
			
		||||
CONFIG_PROC_DEVICETREE=y
 | 
			
		||||
CONFIG_PTP_1588_CLOCK=y
 | 
			
		||||
CONFIG_PWM=y
 | 
			
		||||
CONFIG_PWM_SYSFS=y
 | 
			
		||||
CONFIG_RCU_CPU_STALL_TIMEOUT=21
 | 
			
		||||
CONFIG_RCU_STALL_COMMON=y
 | 
			
		||||
CONFIG_REALTEK_PHY=y
 | 
			
		||||
CONFIG_RELAY=y
 | 
			
		||||
CONFIG_RESET_CONTROLLER=y
 | 
			
		||||
CONFIG_RESET_CONTROLLER_OXNAS=y
 | 
			
		||||
CONFIG_RFS_ACCEL=y
 | 
			
		||||
CONFIG_RPS=y
 | 
			
		||||
CONFIG_RTC_CLASS=y
 | 
			
		||||
# CONFIG_RTC_DRV_CMOS is not set
 | 
			
		||||
CONFIG_SCHED_HRTICK=y
 | 
			
		||||
CONFIG_SCSI=y
 | 
			
		||||
CONFIG_SERIAL_8250_NR_UARTS=1
 | 
			
		||||
CONFIG_SERIAL_8250_PCI=y
 | 
			
		||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 | 
			
		||||
# CONFIG_SERIAL_KGDB_NMI is not set
 | 
			
		||||
CONFIG_SERIAL_OF_PLATFORM=y
 | 
			
		||||
CONFIG_SMP=y
 | 
			
		||||
CONFIG_SMP_ON_UP=y
 | 
			
		||||
CONFIG_SOCK_DIAG=y
 | 
			
		||||
CONFIG_STMMAC_DA=y
 | 
			
		||||
CONFIG_STMMAC_DEBUG_FS=y
 | 
			
		||||
CONFIG_STMMAC_ETH=y
 | 
			
		||||
# CONFIG_STMMAC_PCI is not set
 | 
			
		||||
CONFIG_STMMAC_PLATFORM=y
 | 
			
		||||
CONFIG_STOP_MACHINE=y
 | 
			
		||||
# CONFIG_STRIP_ASM_SYMS is not set
 | 
			
		||||
CONFIG_SWIOTLB=y
 | 
			
		||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 | 
			
		||||
CONFIG_TREE_RCU=y
 | 
			
		||||
CONFIG_UBIFS_FS=y
 | 
			
		||||
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
 | 
			
		||||
CONFIG_UBIFS_FS_LZO=y
 | 
			
		||||
CONFIG_UBIFS_FS_XZ=y
 | 
			
		||||
CONFIG_UBIFS_FS_ZLIB=y
 | 
			
		||||
CONFIG_UID16=y
 | 
			
		||||
CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
 | 
			
		||||
CONFIG_USB=y
 | 
			
		||||
CONFIG_USB_COMMON=y
 | 
			
		||||
# CONFIG_USB_EHCI_HCD is not set
 | 
			
		||||
CONFIG_USB_SUPPORT=y
 | 
			
		||||
# CONFIG_USB_UHCI_HCD is not set
 | 
			
		||||
CONFIG_USE_OF=y
 | 
			
		||||
CONFIG_VECTORS_BASE=0xffff0000
 | 
			
		||||
CONFIG_VEXPRESS_CONFIG=y
 | 
			
		||||
# CONFIG_VFP is not set
 | 
			
		||||
CONFIG_VM_EVENT_COUNTERS=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
 | 
			
		||||
CONFIG_ZLIB_DEFLATE=y
 | 
			
		||||
CONFIG_ZLIB_INFLATE=y
 | 
			
		||||
CONFIG_ZONE_DMA_FLAG=0
 | 
			
		||||
@ -1,56 +0,0 @@
 | 
			
		||||
--- a/arch/arm/include/asm/glue-cache.h
 | 
			
		||||
+++ b/arch/arm/include/asm/glue-cache.h
 | 
			
		||||
@@ -156,11 +156,19 @@ extern 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)
 | 
			
		||||
+#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST
 | 
			
		||||
 #define __cpuc_flush_dcache_area	__glue(_CACHE,_flush_kern_dcache_area)
 | 
			
		||||
 
 | 
			
		||||
 #define dmac_map_area			__glue(_CACHE,_dma_map_area)
 | 
			
		||||
 #define dmac_unmap_area			__glue(_CACHE,_dma_unmap_area)
 | 
			
		||||
 #define dmac_flush_range		__glue(_CACHE,_dma_flush_range)
 | 
			
		||||
+#else
 | 
			
		||||
+#define __cpuc_flush_dcache_area	__glue(fiq,_flush_kern_dcache_area)
 | 
			
		||||
+
 | 
			
		||||
+#define dmac_map_area			__glue(fiq,_dma_map_area)
 | 
			
		||||
+#define dmac_unmap_area			__glue(fiq,_dma_unmap_area)
 | 
			
		||||
+#define dmac_flush_range		__glue(fiq,_dma_flush_range)
 | 
			
		||||
+#endif /* CONFIG_DMA_CACHE_FIQ_BROADCAST */
 | 
			
		||||
 #endif
 | 
			
		||||
 
 | 
			
		||||
 #endif
 | 
			
		||||
--- a/arch/arm/mm/Kconfig
 | 
			
		||||
+++ b/arch/arm/mm/Kconfig
 | 
			
		||||
@@ -844,6 +844,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
 | 
			
		||||
@@ -291,7 +291,11 @@ void flush_dcache_page(struct page *page
 | 
			
		||||
 
 | 
			
		||||
 	mapping = page_mapping(page);
 | 
			
		||||
 
 | 
			
		||||
+#ifndef CONFIG_DMA_CACHE_FIQ_BROADCAST
 | 
			
		||||
 	if (!cache_ops_need_broadcast() &&
 | 
			
		||||
+#else
 | 
			
		||||
+	if (
 | 
			
		||||
+#endif
 | 
			
		||||
 	    mapping && !page_mapped(page))
 | 
			
		||||
 		clear_bit(PG_dcache_clean, &page->flags);
 | 
			
		||||
 	else {
 | 
			
		||||
@ -1,95 +0,0 @@
 | 
			
		||||
--- a/drivers/reset/core.c
 | 
			
		||||
+++ b/drivers/reset/core.c
 | 
			
		||||
@@ -127,15 +127,16 @@ int reset_control_deassert(struct reset_
 | 
			
		||||
 EXPORT_SYMBOL_GPL(reset_control_deassert);
 | 
			
		||||
 
 | 
			
		||||
 /**
 | 
			
		||||
- * reset_control_get - Lookup and obtain a reference to a reset controller.
 | 
			
		||||
- * @dev: device to be reset by the controller
 | 
			
		||||
+ * of_reset_control_get - Lookup and obtain a reference to a reset controller.
 | 
			
		||||
+ * @node: device to be reset by the controller
 | 
			
		||||
  * @id: reset line name
 | 
			
		||||
  *
 | 
			
		||||
  * Returns a struct reset_control or IS_ERR() condition containing errno.
 | 
			
		||||
  *
 | 
			
		||||
  * Use of id names is optional.
 | 
			
		||||
  */
 | 
			
		||||
-struct reset_control *reset_control_get(struct device *dev, const char *id)
 | 
			
		||||
+struct reset_control *of_reset_control_get(struct device_node *node,
 | 
			
		||||
+					   const char *id)
 | 
			
		||||
 {
 | 
			
		||||
 	struct reset_control *rstc = ERR_PTR(-EPROBE_DEFER);
 | 
			
		||||
 	struct reset_controller_dev *r, *rcdev;
 | 
			
		||||
@@ -144,13 +145,10 @@ struct reset_control *reset_control_get(
 | 
			
		||||
 	int rstc_id;
 | 
			
		||||
 	int ret;
 | 
			
		||||
 
 | 
			
		||||
-	if (!dev)
 | 
			
		||||
-		return ERR_PTR(-EINVAL);
 | 
			
		||||
-
 | 
			
		||||
 	if (id)
 | 
			
		||||
-		index = of_property_match_string(dev->of_node,
 | 
			
		||||
+		index = of_property_match_string(node,
 | 
			
		||||
 						 "reset-names", id);
 | 
			
		||||
-	ret = of_parse_phandle_with_args(dev->of_node, "resets", "#reset-cells",
 | 
			
		||||
+	ret = of_parse_phandle_with_args(node, "resets", "#reset-cells",
 | 
			
		||||
 					 index, &args);
 | 
			
		||||
 	if (ret)
 | 
			
		||||
 		return ERR_PTR(ret);
 | 
			
		||||
@@ -185,12 +183,35 @@ struct reset_control *reset_control_get(
 | 
			
		||||
 		return ERR_PTR(-ENOMEM);
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
-	rstc->dev = dev;
 | 
			
		||||
 	rstc->rcdev = rcdev;
 | 
			
		||||
 	rstc->id = rstc_id;
 | 
			
		||||
 
 | 
			
		||||
 	return rstc;
 | 
			
		||||
 }
 | 
			
		||||
+EXPORT_SYMBOL_GPL(of_reset_control_get);
 | 
			
		||||
+
 | 
			
		||||
+/**
 | 
			
		||||
+ * reset_control_get - Lookup and obtain a reference to a reset controller.
 | 
			
		||||
+ * @dev: device to be reset by the controller
 | 
			
		||||
+ * @id: reset line name
 | 
			
		||||
+ *
 | 
			
		||||
+ * Returns a struct reset_control or IS_ERR() condition containing errno.
 | 
			
		||||
+ *
 | 
			
		||||
+ * Use of id names is optional.
 | 
			
		||||
+ */
 | 
			
		||||
+struct reset_control *reset_control_get(struct device *dev, const char *id)
 | 
			
		||||
+{
 | 
			
		||||
+	struct reset_control *rstc;
 | 
			
		||||
+
 | 
			
		||||
+	if (!dev)
 | 
			
		||||
+		return ERR_PTR(-EINVAL);
 | 
			
		||||
+
 | 
			
		||||
+	rstc = of_reset_control_get(dev->of_node, id);
 | 
			
		||||
+	if (!IS_ERR(rstc))
 | 
			
		||||
+		rstc->dev = dev;
 | 
			
		||||
+
 | 
			
		||||
+	return rstc;
 | 
			
		||||
+}
 | 
			
		||||
 EXPORT_SYMBOL_GPL(reset_control_get);
 | 
			
		||||
 
 | 
			
		||||
 /**
 | 
			
		||||
--- a/include/linux/reset.h
 | 
			
		||||
+++ b/include/linux/reset.h
 | 
			
		||||
@@ -1,6 +1,8 @@
 | 
			
		||||
 #ifndef _LINUX_RESET_H_
 | 
			
		||||
 #define _LINUX_RESET_H_
 | 
			
		||||
 
 | 
			
		||||
+#include <linux/of.h>
 | 
			
		||||
+
 | 
			
		||||
 struct device;
 | 
			
		||||
 struct reset_control;
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +10,8 @@ int reset_control_reset(struct reset_con
 | 
			
		||||
 int reset_control_assert(struct reset_control *rstc);
 | 
			
		||||
 int reset_control_deassert(struct reset_control *rstc);
 | 
			
		||||
 
 | 
			
		||||
+struct reset_control *of_reset_control_get(struct device_node *node,
 | 
			
		||||
+					   const char *id);
 | 
			
		||||
 struct reset_control *reset_control_get(struct device *dev, const char *id);
 | 
			
		||||
 void reset_control_put(struct reset_control *rstc);
 | 
			
		||||
 struct reset_control *devm_reset_control_get(struct device *dev, const char *id);
 | 
			
		||||
@ -1,10 +0,0 @@
 | 
			
		||||
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
 | 
			
		||||
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
 | 
			
		||||
@@ -65,6 +65,7 @@ onnn	ON Semiconductor Corp.
 | 
			
		||||
 panasonic	Panasonic Corporation
 | 
			
		||||
 phytec	PHYTEC Messtechnik GmbH
 | 
			
		||||
 picochip	Picochip Ltd
 | 
			
		||||
+plxtech	PLX Technology, Inc.
 | 
			
		||||
 powervr	PowerVR (deprecated, use img)
 | 
			
		||||
 qca	Qualcomm Atheros, Inc.
 | 
			
		||||
 qcom	Qualcomm Technologies, Inc
 | 
			
		||||
@ -1,69 +0,0 @@
 | 
			
		||||
--- a/arch/arm/Kconfig
 | 
			
		||||
+++ b/arch/arm/Kconfig
 | 
			
		||||
@@ -367,6 +367,17 @@ config ARCH_VERSATILE
 | 
			
		||||
 	help
 | 
			
		||||
 	  This enables support for ARM Ltd Versatile board.
 | 
			
		||||
 
 | 
			
		||||
+config ARCH_OXNAS
 | 
			
		||||
+	bool "Oxford Semiconductor 815/820/825 NAS SoC"
 | 
			
		||||
+	select ARCH_REQUIRE_GPIOLIB
 | 
			
		||||
+	select CLKDEV_LOOKUP
 | 
			
		||||
+	select GENERIC_CLOCKEVENTS
 | 
			
		||||
+	select COMMON_CLK
 | 
			
		||||
+	select MIGHT_HAVE_PCI
 | 
			
		||||
+	select ARCH_HAS_RESET_CONTROLLER
 | 
			
		||||
+	help
 | 
			
		||||
+		This enables support for Oxsemi 815/820/825 NAS SoC
 | 
			
		||||
+
 | 
			
		||||
 config ARCH_AT91
 | 
			
		||||
 	bool "Atmel AT91"
 | 
			
		||||
 	select ARCH_REQUIRE_GPIOLIB
 | 
			
		||||
@@ -999,6 +1010,8 @@ source "arch/arm/mach-omap2/Kconfig"
 | 
			
		||||
 
 | 
			
		||||
 source "arch/arm/mach-orion5x/Kconfig"
 | 
			
		||||
 
 | 
			
		||||
+source "arch/arm/mach-oxnas/Kconfig"
 | 
			
		||||
+
 | 
			
		||||
 source "arch/arm/mach-picoxcell/Kconfig"
 | 
			
		||||
 
 | 
			
		||||
 source "arch/arm/mach-pxa/Kconfig"
 | 
			
		||||
--- a/arch/arm/Makefile
 | 
			
		||||
+++ b/arch/arm/Makefile
 | 
			
		||||
@@ -183,6 +183,7 @@ machine-$(CONFIG_ARCH_NSPIRE)		+= nspire
 | 
			
		||||
 machine-$(CONFIG_ARCH_OMAP1)		+= omap1
 | 
			
		||||
 machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2
 | 
			
		||||
 machine-$(CONFIG_ARCH_ORION5X)		+= orion5x
 | 
			
		||||
+machine-$(CONFIG_ARCH_OXNAS)		+= oxnas
 | 
			
		||||
 machine-$(CONFIG_ARCH_PICOXCELL)	+= picoxcell
 | 
			
		||||
 machine-$(CONFIG_ARCH_PXA)		+= pxa
 | 
			
		||||
 machine-$(CONFIG_ARCH_REALVIEW)		+= realview
 | 
			
		||||
--- a/arch/arm/boot/dts/Makefile
 | 
			
		||||
+++ b/arch/arm/boot/dts/Makefile
 | 
			
		||||
@@ -233,6 +233,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420
 | 
			
		||||
 	am43x-epos-evm.dtb \
 | 
			
		||||
 	dra7-evm.dtb
 | 
			
		||||
 dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
 | 
			
		||||
+dtb-$(CONFIG_ARCH_OXNAS) += ox820-pogoplug-pro.dtb
 | 
			
		||||
 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 | 
			
		||||
 dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 | 
			
		||||
 	ste-hrefprev60-stuib.dtb \
 | 
			
		||||
--- a/arch/arm/tools/mach-types
 | 
			
		||||
+++ b/arch/arm/tools/mach-types
 | 
			
		||||
@@ -228,6 +228,7 @@ edb9302a		MACH_EDB9302A		EDB9302A		1127
 | 
			
		||||
 edb9307a		MACH_EDB9307A		EDB9307A		1128
 | 
			
		||||
 omap_3430sdp		MACH_OMAP_3430SDP	OMAP_3430SDP		1138
 | 
			
		||||
 vstms			MACH_VSTMS		VSTMS			1140
 | 
			
		||||
+ox820			MACH_OX820		OX820			1152
 | 
			
		||||
 micro9m			MACH_MICRO9M		MICRO9M			1169
 | 
			
		||||
 bug			MACH_BUG		BUG			1179
 | 
			
		||||
 at91sam9263ek		MACH_AT91SAM9263EK	AT91SAM9263EK		1202
 | 
			
		||||
--- a/drivers/clk/Makefile
 | 
			
		||||
+++ b/drivers/clk/Makefile
 | 
			
		||||
@@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_LOONGSON1)		+= clk-ls1
 | 
			
		||||
 obj-$(CONFIG_COMMON_CLK_MAX77686)	+= clk-max77686.o
 | 
			
		||||
 obj-$(CONFIG_ARCH_NOMADIK)		+= clk-nomadik.o
 | 
			
		||||
 obj-$(CONFIG_ARCH_NSPIRE)		+= clk-nspire.o
 | 
			
		||||
+obj-$(CONFIG_ARCH_OXNAS)		+= clk-oxnas.o
 | 
			
		||||
 obj-$(CONFIG_CLK_PPC_CORENET)		+= clk-ppc-corenet.o
 | 
			
		||||
 obj-$(CONFIG_COMMON_CLK_S2MPS11)	+= clk-s2mps11.o
 | 
			
		||||
 obj-$(CONFIG_COMMON_CLK_SI5351)		+= clk-si5351.o
 | 
			
		||||
@ -1,20 +0,0 @@
 | 
			
		||||
--- a/drivers/clocksource/Kconfig
 | 
			
		||||
+++ b/drivers/clocksource/Kconfig
 | 
			
		||||
@@ -140,3 +140,9 @@ config VF_PIT_TIMER
 | 
			
		||||
 	bool
 | 
			
		||||
 	help
 | 
			
		||||
 	  Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
 | 
			
		||||
+
 | 
			
		||||
+config CLKSRC_RPS_TIMER
 | 
			
		||||
+	def_bool y if ARCH_OXNAS
 | 
			
		||||
+	select CLKSRC_MMIO
 | 
			
		||||
+	help
 | 
			
		||||
+	  This option enables support for the oxnas rps timers.
 | 
			
		||||
--- a/drivers/clocksource/Makefile
 | 
			
		||||
+++ b/drivers/clocksource/Makefile
 | 
			
		||||
@@ -37,3 +37,5 @@ obj-$(CONFIG_ARM_ARCH_TIMER)		+= arm_arc
 | 
			
		||||
 obj-$(CONFIG_ARM_GLOBAL_TIMER)		+= arm_global_timer.o
 | 
			
		||||
 obj-$(CONFIG_CLKSRC_METAG_GENERIC)	+= metag_generic.o
 | 
			
		||||
 obj-$(CONFIG_ARCH_HAS_TICK_BROADCAST)	+= dummy_timer.o
 | 
			
		||||
+
 | 
			
		||||
+obj-$(CONFIG_CLKSRC_RPS_TIMER)		+= oxnas_rps_timer.o
 | 
			
		||||
@ -1,34 +0,0 @@
 | 
			
		||||
--- a/drivers/irqchip/Kconfig
 | 
			
		||||
+++ b/drivers/irqchip/Kconfig
 | 
			
		||||
@@ -10,6 +10,11 @@ config ARM_GIC
 | 
			
		||||
 config GIC_NON_BANKED
 | 
			
		||||
 	bool
 | 
			
		||||
 
 | 
			
		||||
+config PLXTECH_RPS
 | 
			
		||||
+	def_bool y if ARHC_OXNAS
 | 
			
		||||
+	depends on ARCH_OXNAS
 | 
			
		||||
+	select IRQ_DOMAIN
 | 
			
		||||
+
 | 
			
		||||
 config ARM_NVIC
 | 
			
		||||
 	bool
 | 
			
		||||
 	select IRQ_DOMAIN
 | 
			
		||||
--- a/drivers/irqchip/Makefile
 | 
			
		||||
+++ b/drivers/irqchip/Makefile
 | 
			
		||||
@@ -20,6 +20,7 @@ obj-$(CONFIG_IMGPDC_IRQ)		+= irq-imgpdc.
 | 
			
		||||
 obj-$(CONFIG_SIRF_IRQ)			+= irq-sirfsoc.o
 | 
			
		||||
 obj-$(CONFIG_RENESAS_INTC_IRQPIN)	+= irq-renesas-intc-irqpin.o
 | 
			
		||||
 obj-$(CONFIG_RENESAS_IRQC)		+= irq-renesas-irqc.o
 | 
			
		||||
+obj-$(CONFIG_PLXTECH_RPS)		+= irq-rps.o
 | 
			
		||||
 obj-$(CONFIG_VERSATILE_FPGA_IRQ)	+= irq-versatile-fpga.o
 | 
			
		||||
 obj-$(CONFIG_ARCH_NSPIRE)		+= irq-zevio.o
 | 
			
		||||
 obj-$(CONFIG_ARCH_VT8500)		+= irq-vt8500.o
 | 
			
		||||
--- a/drivers/irqchip/irq-gic.c
 | 
			
		||||
+++ b/drivers/irqchip/irq-gic.c
 | 
			
		||||
@@ -1015,6 +1015,7 @@ IRQCHIP_DECLARE(gic_400, "arm,gic-400", 
 | 
			
		||||
 IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init);
 | 
			
		||||
 IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init);
 | 
			
		||||
 IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init);
 | 
			
		||||
+IRQCHIP_DECLARE(arm11_mpcore_gic, "arm,arm11mp-gic", gic_of_init);
 | 
			
		||||
 IRQCHIP_DECLARE(msm_8660_qgic, "qcom,msm-8660-qgic", gic_of_init);
 | 
			
		||||
 IRQCHIP_DECLARE(msm_qgic2, "qcom,msm-qgic2", gic_of_init);
 | 
			
		||||
 
 | 
			
		||||
@ -1,28 +0,0 @@
 | 
			
		||||
--- a/drivers/pinctrl/Kconfig
 | 
			
		||||
+++ b/drivers/pinctrl/Kconfig
 | 
			
		||||
@@ -87,6 +87,15 @@ config PINCTRL_AT91
 | 
			
		||||
 	help
 | 
			
		||||
 	  Say Y here to enable the at91 pinctrl driver
 | 
			
		||||
 
 | 
			
		||||
+config PINCTRL_OXNAS
 | 
			
		||||
+	bool "OXNAS pinctrl driver"
 | 
			
		||||
+	depends on OF
 | 
			
		||||
+	depends on ARCH_OXNAS
 | 
			
		||||
+	select PINMUX
 | 
			
		||||
+	select PINCONF
 | 
			
		||||
+	help
 | 
			
		||||
+	  Say Y here to enable the oxnas pinctrl driver
 | 
			
		||||
+
 | 
			
		||||
 config PINCTRL_BAYTRAIL
 | 
			
		||||
 	bool "Intel Baytrail GPIO pin control"
 | 
			
		||||
 	depends on GPIOLIB && ACPI && X86
 | 
			
		||||
--- a/drivers/pinctrl/Makefile
 | 
			
		||||
+++ b/drivers/pinctrl/Makefile
 | 
			
		||||
@@ -67,6 +67,7 @@ obj-$(CONFIG_PINCTRL_LANTIQ)	+= pinctrl-
 | 
			
		||||
 obj-$(CONFIG_PINCTRL_TB10X)	+= pinctrl-tb10x.o
 | 
			
		||||
 obj-$(CONFIG_PINCTRL_ST) 	+= pinctrl-st.o
 | 
			
		||||
 obj-$(CONFIG_PINCTRL_VF610)	+= pinctrl-vf610.o
 | 
			
		||||
+obj-$(CONFIG_PINCTRL_OXNAS)	+= pinctrl-oxnas.o
 | 
			
		||||
 
 | 
			
		||||
 obj-$(CONFIG_PLAT_ORION)        += mvebu/
 | 
			
		||||
 obj-$(CONFIG_ARCH_SHMOBILE)	+= sh-pfc/
 | 
			
		||||
@ -1,19 +0,0 @@
 | 
			
		||||
--- a/drivers/pci/host/Kconfig
 | 
			
		||||
+++ b/drivers/pci/host/Kconfig
 | 
			
		||||
@@ -33,4 +33,9 @@ config PCI_RCAR_GEN2
 | 
			
		||||
 	  There are 3 internal PCI controllers available with a single
 | 
			
		||||
 	  built-in EHCI/OHCI host controller present on each one.
 | 
			
		||||
 
 | 
			
		||||
+config PCI_OXNAS
 | 
			
		||||
+	bool "PLX Oxnas PCIe controller"
 | 
			
		||||
+	depends on ARCH_OXNAS
 | 
			
		||||
+	select PCIEPORTBUS
 | 
			
		||||
+
 | 
			
		||||
 endmenu
 | 
			
		||||
--- a/drivers/pci/host/Makefile
 | 
			
		||||
+++ b/drivers/pci/host/Makefile
 | 
			
		||||
@@ -4,3 +4,4 @@ obj-$(CONFIG_PCI_IMX6) += pci-imx6.o
 | 
			
		||||
 obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
 | 
			
		||||
 obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o
 | 
			
		||||
 obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
 | 
			
		||||
+obj-$(CONFIG_PCI_OXNAS) += pcie-oxnas.o
 | 
			
		||||
@ -1,16 +0,0 @@
 | 
			
		||||
--- a/drivers/reset/Kconfig
 | 
			
		||||
+++ b/drivers/reset/Kconfig
 | 
			
		||||
@@ -11,3 +11,7 @@ menuconfig RESET_CONTROLLER
 | 
			
		||||
 	  via GPIOs or SoC-internal reset controller modules.
 | 
			
		||||
 
 | 
			
		||||
 	  If unsure, say no.
 | 
			
		||||
+
 | 
			
		||||
+config RESET_CONTROLLER_OXNAS
 | 
			
		||||
+	bool
 | 
			
		||||
+	select RESET_CONTROLLER
 | 
			
		||||
--- a/drivers/reset/Makefile
 | 
			
		||||
+++ b/drivers/reset/Makefile
 | 
			
		||||
@@ -1,2 +1,3 @@
 | 
			
		||||
 obj-$(CONFIG_RESET_CONTROLLER) += core.o
 | 
			
		||||
+obj-$(CONFIG_RESET_CONTROLLER_OXNAS) += reset-ox820.o
 | 
			
		||||
 obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o
 | 
			
		||||
@ -1,24 +0,0 @@
 | 
			
		||||
--- a/drivers/mtd/nand/Kconfig
 | 
			
		||||
+++ b/drivers/mtd/nand/Kconfig
 | 
			
		||||
@@ -510,4 +510,12 @@ config MTD_NAND_XWAY
 | 
			
		||||
 	  Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached
 | 
			
		||||
 	  to the External Bus Unit (EBU).
 | 
			
		||||
 
 | 
			
		||||
+config MTD_NAND_OXNAS
 | 
			
		||||
+	tristate "Support for NAND on Plxtech NAS782X SoC"
 | 
			
		||||
+	depends on ARCH_OXNAS
 | 
			
		||||
+	select MTD_NAND_PLATFORM
 | 
			
		||||
+	help
 | 
			
		||||
+	  Enables support for NAND Flash chips on Plxtech NAS782X SoCs. NAND is attached
 | 
			
		||||
+	  to the STATIC Unit.
 | 
			
		||||
+
 | 
			
		||||
 endif # MTD_NAND
 | 
			
		||||
--- a/drivers/mtd/nand/Makefile
 | 
			
		||||
+++ b/drivers/mtd/nand/Makefile
 | 
			
		||||
@@ -49,5 +49,6 @@ obj-$(CONFIG_MTD_NAND_JZ4740)		+= jz4740
 | 
			
		||||
 obj-$(CONFIG_MTD_NAND_GPMI_NAND)	+= gpmi-nand/
 | 
			
		||||
 obj-$(CONFIG_MTD_NAND_XWAY)		+= xway_nand.o
 | 
			
		||||
 obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH)	+= bcm47xxnflash/
 | 
			
		||||
+obj-$(CONFIG_MTD_NAND_OXNAS)		+= oxnas_nand.o
 | 
			
		||||
 
 | 
			
		||||
 nand-objs := nand_base.o nand_bbt.o
 | 
			
		||||
@ -1,26 +0,0 @@
 | 
			
		||||
--- a/drivers/ata/Kconfig
 | 
			
		||||
+++ b/drivers/ata/Kconfig
 | 
			
		||||
@@ -330,6 +330,13 @@ config SATA_VITESSE
 | 
			
		||||
 
 | 
			
		||||
 	  If unsure, say N.
 | 
			
		||||
 
 | 
			
		||||
+config SATA_OXNAS
 | 
			
		||||
+	tristate "PLXTECH NAS782X SATA support"
 | 
			
		||||
+	help
 | 
			
		||||
+	  This option enables support for Nas782x Serial ATA controller.
 | 
			
		||||
+
 | 
			
		||||
+	  If unsure, say N.
 | 
			
		||||
+
 | 
			
		||||
 comment "PATA SFF controllers with BMDMA"
 | 
			
		||||
 
 | 
			
		||||
 config PATA_ALI
 | 
			
		||||
--- a/drivers/ata/Makefile
 | 
			
		||||
+++ b/drivers/ata/Makefile
 | 
			
		||||
@@ -31,6 +31,7 @@ obj-$(CONFIG_SATA_SVW)		+= sata_svw.o
 | 
			
		||||
 obj-$(CONFIG_SATA_ULI)		+= sata_uli.o
 | 
			
		||||
 obj-$(CONFIG_SATA_VIA)		+= sata_via.o
 | 
			
		||||
 obj-$(CONFIG_SATA_VITESSE)	+= sata_vsc.o
 | 
			
		||||
+obj-$(CONFIG_SATA_OXNAS)	+= sata_oxnas.o
 | 
			
		||||
 
 | 
			
		||||
 # SFF PATA w/ BMDMA
 | 
			
		||||
 obj-$(CONFIG_PATA_ALI)		+= pata_ali.o
 | 
			
		||||
@ -1,26 +0,0 @@
 | 
			
		||||
--- a/drivers/usb/host/Kconfig
 | 
			
		||||
+++ b/drivers/usb/host/Kconfig
 | 
			
		||||
@@ -273,6 +273,13 @@ config USB_OCTEON_EHCI
 | 
			
		||||
 	  USB 2.0 device support.  All CN6XXX based chips with USB are
 | 
			
		||||
 	  supported.
 | 
			
		||||
 
 | 
			
		||||
+config USB_EHCI_OXNAS
 | 
			
		||||
+	tristate "OXNAS EHCI Module"
 | 
			
		||||
+	depends on USB_EHCI_HCD && ARCH_OXNAS
 | 
			
		||||
+	select USB_EHCI_ROOT_HUB_TT
 | 
			
		||||
+	---help---
 | 
			
		||||
+	  Enable support for the OX820 SOC's on-chip EHCI controller.
 | 
			
		||||
+
 | 
			
		||||
 endif # USB_EHCI_HCD
 | 
			
		||||
 
 | 
			
		||||
 config USB_OXU210HP_HCD
 | 
			
		||||
--- a/drivers/usb/host/Makefile
 | 
			
		||||
+++ b/drivers/usb/host/Makefile
 | 
			
		||||
@@ -37,6 +37,7 @@ obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-
 | 
			
		||||
 obj-$(CONFIG_USB_EHCI_MSM)	+= ehci-msm.o
 | 
			
		||||
 obj-$(CONFIG_USB_EHCI_TEGRA)	+= ehci-tegra.o
 | 
			
		||||
 obj-$(CONFIG_USB_W90X900_EHCI)	+= ehci-w90x900.o
 | 
			
		||||
+obj-$(CONFIG_USB_EHCI_OXNAS)	+= ehci-oxnas.o
 | 
			
		||||
 
 | 
			
		||||
 obj-$(CONFIG_USB_OXU210HP_HCD)	+= oxu210hp-hcd.o
 | 
			
		||||
 obj-$(CONFIG_USB_ISP116X_HCD)	+= isp116x-hcd.o
 | 
			
		||||
@ -1,14 +0,0 @@
 | 
			
		||||
--- a/arch/arm/boot/dts/Makefile
 | 
			
		||||
+++ b/arch/arm/boot/dts/Makefile
 | 
			
		||||
@@ -233,7 +233,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420
 | 
			
		||||
 	am43x-epos-evm.dtb \
 | 
			
		||||
 	dra7-evm.dtb
 | 
			
		||||
 dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
 | 
			
		||||
-dtb-$(CONFIG_ARCH_OXNAS) += ox820-pogoplug-pro.dtb
 | 
			
		||||
+dtb-$(CONFIG_ARCH_OXNAS) += ox820-pogoplug-pro.dtb \
 | 
			
		||||
+	ox820-pogoplug-v3.dtb \
 | 
			
		||||
+	ox820-stg212.dtb \
 | 
			
		||||
+	ox820-kd20.dtb
 | 
			
		||||
 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
 | 
			
		||||
 dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
 | 
			
		||||
 	ste-hrefprev60-stuib.dtb \
 | 
			
		||||
@ -1,61 +0,0 @@
 | 
			
		||||
Index: linux-3.18-rc7/drivers/ata/libata-core.c
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-3.18-rc7.orig/drivers/ata/libata-core.c
 | 
			
		||||
+++ linux-3.18-rc7/drivers/ata/libata-core.c
 | 
			
		||||
@@ -1568,6 +1568,14 @@ unsigned ata_exec_internal_sg(struct ata
 | 
			
		||||
 		return AC_ERR_SYSTEM;
 | 
			
		||||
 	}
 | 
			
		||||
 
 | 
			
		||||
+	if (ap->ops->acquire_hw && !ap->ops->acquire_hw(ap, 0, 0)) {
 | 
			
		||||
+		spin_unlock_irqrestore(ap->lock, flags);
 | 
			
		||||
+		if (!ap->ops->acquire_hw(ap, 1, (2*HZ))) {
 | 
			
		||||
+			return AC_ERR_TIMEOUT;
 | 
			
		||||
+		}
 | 
			
		||||
+		spin_lock_irqsave(ap->lock, flags);
 | 
			
		||||
+	}
 | 
			
		||||
+
 | 
			
		||||
 	/* initialize internal qc */
 | 
			
		||||
 
 | 
			
		||||
 	/* XXX: Tag 0 is used for drivers with legacy EH as some
 | 
			
		||||
@@ -4739,6 +4747,9 @@ static struct ata_queued_cmd *ata_qc_new
 | 
			
		||||
 	if (unlikely(ap->pflags & ATA_PFLAG_FROZEN))
 | 
			
		||||
 		return NULL;
 | 
			
		||||
 
 | 
			
		||||
+	if (ap->ops->qc_new && ap->ops->qc_new(ap))
 | 
			
		||||
+		return NULL;
 | 
			
		||||
+
 | 
			
		||||
 	for (i = 0, tag = ap->last_tag + 1; i < max_queue; i++, tag++) {
 | 
			
		||||
 		tag = tag < max_queue ? tag : 0;
 | 
			
		||||
 
 | 
			
		||||
@@ -4805,6 +4816,8 @@ void ata_qc_free(struct ata_queued_cmd *
 | 
			
		||||
 	if (likely(ata_tag_valid(tag))) {
 | 
			
		||||
 		qc->tag = ATA_TAG_POISON;
 | 
			
		||||
 		clear_bit(tag, &ap->qc_allocated);
 | 
			
		||||
+		if (ap->ops->qc_free)
 | 
			
		||||
+			ap->ops->qc_free(qc);
 | 
			
		||||
 	}
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
Index: linux-3.18-rc7/include/linux/libata.h
 | 
			
		||||
===================================================================
 | 
			
		||||
--- linux-3.18-rc7.orig/include/linux/libata.h
 | 
			
		||||
+++ linux-3.18-rc7/include/linux/libata.h
 | 
			
		||||
@@ -884,6 +884,8 @@ struct ata_port_operations {
 | 
			
		||||
 	void (*qc_prep)(struct ata_queued_cmd *qc);
 | 
			
		||||
 	unsigned int (*qc_issue)(struct ata_queued_cmd *qc);
 | 
			
		||||
 	bool (*qc_fill_rtf)(struct ata_queued_cmd *qc);
 | 
			
		||||
+	int (*qc_new)(struct ata_port *ap);
 | 
			
		||||
+	void (*qc_free)(struct ata_queued_cmd *qc);
 | 
			
		||||
 
 | 
			
		||||
 	/*
 | 
			
		||||
 	 * Configuration and exception handling
 | 
			
		||||
@@ -974,6 +976,9 @@ struct ata_port_operations {
 | 
			
		||||
 	void (*phy_reset)(struct ata_port *ap);
 | 
			
		||||
 	void (*eng_timeout)(struct ata_port *ap);
 | 
			
		||||
 
 | 
			
		||||
+	int (*acquire_hw)(struct ata_port *ap, int may_sleep,
 | 
			
		||||
+			  int timeout_jiffies);
 | 
			
		||||
+
 | 
			
		||||
 	/*
 | 
			
		||||
 	 * ->inherits must be the last field and all the preceding
 | 
			
		||||
 	 * fields must be pointers.
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user