mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	kirkwood: drop 4.3 support
Signed-off-by: Luka Perkov <luka.perkov@sartura.hr> SVN-Revision: 48499
This commit is contained in:
		
							parent
							
								
									a29c7ca3d9
								
							
						
					
					
						commit
						6bc24292ab
					
				@ -1,318 +0,0 @@
 | 
			
		||||
CONFIG_ALIGNMENT_TRAP=y
 | 
			
		||||
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 | 
			
		||||
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 | 
			
		||||
CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 | 
			
		||||
CONFIG_ARCH_HAS_SG_CHAIN=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=y
 | 
			
		||||
# CONFIG_ARCH_MULTI_V4 is not set
 | 
			
		||||
# CONFIG_ARCH_MULTI_V4T is not set
 | 
			
		||||
CONFIG_ARCH_MULTI_V4_V5=y
 | 
			
		||||
CONFIG_ARCH_MULTI_V5=y
 | 
			
		||||
CONFIG_ARCH_MVEBU=y
 | 
			
		||||
CONFIG_ARCH_NR_GPIO=0
 | 
			
		||||
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_SUPPORTS_BIG_ENDIAN=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_ARCH_WANT_OPTIONAL_GPIOLIB=y
 | 
			
		||||
CONFIG_ARM=y
 | 
			
		||||
CONFIG_ARM_APPENDED_DTB=y
 | 
			
		||||
CONFIG_ARM_ATAG_DTB_COMPAT=y
 | 
			
		||||
# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set
 | 
			
		||||
CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y
 | 
			
		||||
# CONFIG_ARM_CPUIDLE is not set
 | 
			
		||||
# CONFIG_ARM_CPU_SUSPEND is not set
 | 
			
		||||
CONFIG_ARM_HAS_SG_CHAIN=y
 | 
			
		||||
# CONFIG_ARM_KIRKWOOD_CPUIDLE is not set
 | 
			
		||||
CONFIG_ARM_L1_CACHE_SHIFT=5
 | 
			
		||||
# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
 | 
			
		||||
CONFIG_ARM_PATCH_PHYS_VIRT=y
 | 
			
		||||
# CONFIG_ARM_THUMB is not set
 | 
			
		||||
CONFIG_ATAGS=y
 | 
			
		||||
CONFIG_AUTO_ZRELADDR=y
 | 
			
		||||
CONFIG_BLK_DEV_SD=y
 | 
			
		||||
CONFIG_CACHE_FEROCEON_L2=y
 | 
			
		||||
# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 | 
			
		||||
# CONFIG_CACHE_L2X0 is not set
 | 
			
		||||
CONFIG_CLKDEV_LOOKUP=y
 | 
			
		||||
CONFIG_CLKSRC_MMIO=y
 | 
			
		||||
CONFIG_CLKSRC_OF=y
 | 
			
		||||
CONFIG_CLONE_BACKWARDS=y
 | 
			
		||||
CONFIG_CMDLINE="rootdelay=1 root=/dev/mmcblk0p1 noinitrd console=ttyS0,115200"
 | 
			
		||||
CONFIG_CMDLINE_FROM_BOOTLOADER=y
 | 
			
		||||
CONFIG_COMMON_CLK=y
 | 
			
		||||
CONFIG_CPU_32v5=y
 | 
			
		||||
CONFIG_CPU_ABRT_EV5T=y
 | 
			
		||||
# CONFIG_CPU_BIG_ENDIAN is not set
 | 
			
		||||
CONFIG_CPU_CACHE_VIVT=y
 | 
			
		||||
CONFIG_CPU_COPY_FEROCEON=y
 | 
			
		||||
CONFIG_CPU_CP15=y
 | 
			
		||||
CONFIG_CPU_CP15_MMU=y
 | 
			
		||||
CONFIG_CPU_FEROCEON=y
 | 
			
		||||
# CONFIG_CPU_FEROCEON_OLD_ID is not set
 | 
			
		||||
# CONFIG_CPU_ICACHE_DISABLE is not set
 | 
			
		||||
CONFIG_CPU_IDLE=y
 | 
			
		||||
CONFIG_CPU_IDLE_GOV_LADDER=y
 | 
			
		||||
CONFIG_CPU_PABRT_LEGACY=y
 | 
			
		||||
CONFIG_CPU_PM=y
 | 
			
		||||
CONFIG_CPU_TLB_FEROCEON=y
 | 
			
		||||
CONFIG_CPU_USE_DOMAINS=y
 | 
			
		||||
CONFIG_CRC16=y
 | 
			
		||||
# CONFIG_CRC32_SARWATE is not set
 | 
			
		||||
CONFIG_CRC32_SLICEBY8=y
 | 
			
		||||
CONFIG_CRYPTO_CRC32C=y
 | 
			
		||||
CONFIG_CRYPTO_DEFLATE=y
 | 
			
		||||
CONFIG_CRYPTO_HASH=y
 | 
			
		||||
CONFIG_CRYPTO_HASH2=y
 | 
			
		||||
CONFIG_CRYPTO_LZO=y
 | 
			
		||||
CONFIG_CRYPTO_RNG2=y
 | 
			
		||||
CONFIG_CRYPTO_WORKQUEUE=y
 | 
			
		||||
CONFIG_DEBUG_LL=y
 | 
			
		||||
CONFIG_DEBUG_LL_INCLUDE="debug/8250.S"
 | 
			
		||||
CONFIG_DEBUG_MVEBU_UART0=y
 | 
			
		||||
# CONFIG_DEBUG_MVEBU_UART0_ALTERNATE is not set
 | 
			
		||||
# CONFIG_DEBUG_MVEBU_UART1_ALTERNATE is not set
 | 
			
		||||
CONFIG_DEBUG_UART_8250=y
 | 
			
		||||
# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set
 | 
			
		||||
CONFIG_DEBUG_UART_8250_SHIFT=2
 | 
			
		||||
# CONFIG_DEBUG_UART_8250_WORD is not set
 | 
			
		||||
CONFIG_DEBUG_UART_PHYS=0xf1012000
 | 
			
		||||
CONFIG_DEBUG_UART_VIRT=0xfed12000
 | 
			
		||||
CONFIG_DEBUG_UNCOMPRESS=y
 | 
			
		||||
# CONFIG_DEBUG_USER is not set
 | 
			
		||||
# CONFIG_DLCI is not set
 | 
			
		||||
CONFIG_DNOTIFY=y
 | 
			
		||||
CONFIG_DTC=y
 | 
			
		||||
# CONFIG_EARLY_PRINTK is not set
 | 
			
		||||
CONFIG_EDAC_ATOMIC_SCRUB=y
 | 
			
		||||
CONFIG_EDAC_SUPPORT=y
 | 
			
		||||
CONFIG_EXT4_FS=y
 | 
			
		||||
CONFIG_FIX_EARLYCON_MEM=y
 | 
			
		||||
CONFIG_FRAME_POINTER=y
 | 
			
		||||
CONFIG_FS_MBCACHE=y
 | 
			
		||||
CONFIG_GENERIC_ALLOCATOR=y
 | 
			
		||||
CONFIG_GENERIC_ATOMIC64=y
 | 
			
		||||
CONFIG_GENERIC_BUG=y
 | 
			
		||||
CONFIG_GENERIC_CLOCKEVENTS=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_PHY=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_MVEBU=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_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_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_LATENCYTOP_SUPPORT=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_SYSCALL_TRACEPOINTS=y
 | 
			
		||||
CONFIG_HAVE_UID16=y
 | 
			
		||||
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 | 
			
		||||
CONFIG_HW_RANDOM=y
 | 
			
		||||
CONFIG_HZ_FIXED=0
 | 
			
		||||
CONFIG_HZ_PERIODIC=y
 | 
			
		||||
CONFIG_I2C=y
 | 
			
		||||
CONFIG_I2C_BOARDINFO=y
 | 
			
		||||
CONFIG_INITRAMFS_SOURCE=""
 | 
			
		||||
CONFIG_IOMMU_HELPER=y
 | 
			
		||||
CONFIG_IP_PIMSM_V1=y
 | 
			
		||||
CONFIG_IP_PIMSM_V2=y
 | 
			
		||||
CONFIG_IRQCHIP=y
 | 
			
		||||
CONFIG_IRQ_DOMAIN=y
 | 
			
		||||
CONFIG_IRQ_FORCED_THREADING=y
 | 
			
		||||
CONFIG_IRQ_WORK=y
 | 
			
		||||
CONFIG_JBD2=y
 | 
			
		||||
CONFIG_KIRKWOOD_CLK=y
 | 
			
		||||
CONFIG_LEDS_GPIO=y
 | 
			
		||||
CONFIG_LEDS_NETXBIG=y
 | 
			
		||||
CONFIG_LEDS_NS2=y
 | 
			
		||||
CONFIG_LEGACY_PTYS=y
 | 
			
		||||
CONFIG_LEGACY_PTY_COUNT=256
 | 
			
		||||
CONFIG_LIBFDT=y
 | 
			
		||||
CONFIG_LZO_COMPRESS=y
 | 
			
		||||
CONFIG_LZO_DECOMPRESS=y
 | 
			
		||||
CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 | 
			
		||||
CONFIG_MACH_KIRKWOOD=y
 | 
			
		||||
CONFIG_MACH_MVEBU_ANY=y
 | 
			
		||||
# CONFIG_MACH_NETXBIG is not set
 | 
			
		||||
CONFIG_MANGLE_BOOTARGS=y
 | 
			
		||||
CONFIG_MDIO_BOARDINFO=y
 | 
			
		||||
CONFIG_MIGHT_HAVE_PCI=y
 | 
			
		||||
CONFIG_MMC=y
 | 
			
		||||
CONFIG_MMC_BLOCK=y
 | 
			
		||||
CONFIG_MMC_MVSDIO=y
 | 
			
		||||
# CONFIG_MMC_TIFM_SD is not set
 | 
			
		||||
CONFIG_MODULES_USE_ELF_REL=y
 | 
			
		||||
# CONFIG_MTD_CFI is not set
 | 
			
		||||
CONFIG_MTD_CMDLINE_PARTS=y
 | 
			
		||||
CONFIG_MTD_NAND=y
 | 
			
		||||
CONFIG_MTD_NAND_ECC=y
 | 
			
		||||
CONFIG_MTD_NAND_ORION=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_MULTI_IRQ_HANDLER=y
 | 
			
		||||
CONFIG_MV643XX_ETH=y
 | 
			
		||||
CONFIG_MVEBU_CLK_COMMON=y
 | 
			
		||||
CONFIG_MVEBU_MBUS=y
 | 
			
		||||
CONFIG_MVMDIO=y
 | 
			
		||||
# CONFIG_MVNETA is not set
 | 
			
		||||
CONFIG_MVSW61XX_PHY=y
 | 
			
		||||
CONFIG_NEED_DMA_MAP_STATE=y
 | 
			
		||||
CONFIG_NEED_KUSER_HELPERS=y
 | 
			
		||||
CONFIG_NEED_PER_CPU_KM=y
 | 
			
		||||
CONFIG_NLS=y
 | 
			
		||||
CONFIG_NO_BOOTMEM=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_MTD=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_ORION_IRQCHIP=y
 | 
			
		||||
CONFIG_ORION_TIMER=y
 | 
			
		||||
CONFIG_OUTER_CACHE=y
 | 
			
		||||
CONFIG_PAGEFLAGS_EXTENDED=y
 | 
			
		||||
CONFIG_PAGE_OFFSET=0xC0000000
 | 
			
		||||
CONFIG_PCI=y
 | 
			
		||||
# CONFIG_PCI_DOMAINS_GENERIC is not set
 | 
			
		||||
CONFIG_PCI_MVEBU=y
 | 
			
		||||
CONFIG_PERF_USE_VMALLOC=y
 | 
			
		||||
CONFIG_PGTABLE_LEVELS=2
 | 
			
		||||
CONFIG_PHYLIB=y
 | 
			
		||||
CONFIG_PHY_MVEBU_SATA=y
 | 
			
		||||
CONFIG_PINCTRL=y
 | 
			
		||||
CONFIG_PINCTRL_KIRKWOOD=y
 | 
			
		||||
CONFIG_PINCTRL_MVEBU=y
 | 
			
		||||
# CONFIG_PINCTRL_SINGLE is not set
 | 
			
		||||
CONFIG_PLAT_ORION=y
 | 
			
		||||
CONFIG_POWER_RESET=y
 | 
			
		||||
CONFIG_POWER_RESET_GPIO=y
 | 
			
		||||
# CONFIG_POWER_RESET_QNAP is not set
 | 
			
		||||
CONFIG_POWER_SUPPLY=y
 | 
			
		||||
# CONFIG_RCU_STALL_COMMON is not set
 | 
			
		||||
CONFIG_REGMAP=y
 | 
			
		||||
CONFIG_REGULATOR=y
 | 
			
		||||
CONFIG_REGULATOR_FIXED_VOLTAGE=y
 | 
			
		||||
CONFIG_RTC_CLASS=y
 | 
			
		||||
# CONFIG_RTC_DRV_MV is not set
 | 
			
		||||
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 | 
			
		||||
CONFIG_SCHED_HRTICK=y
 | 
			
		||||
# CONFIG_SCHED_INFO is not set
 | 
			
		||||
CONFIG_SCSI=y
 | 
			
		||||
CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
 | 
			
		||||
CONFIG_SERIAL_OF_PLATFORM=y
 | 
			
		||||
# CONFIG_SG_SPLIT is not set
 | 
			
		||||
CONFIG_SOC_BUS=y
 | 
			
		||||
CONFIG_SPARSE_IRQ=y
 | 
			
		||||
CONFIG_SPI=y
 | 
			
		||||
CONFIG_SPI_MASTER=y
 | 
			
		||||
CONFIG_SPI_ORION=y
 | 
			
		||||
CONFIG_SPLIT_PTLOCK_CPUS=999999
 | 
			
		||||
CONFIG_SRCU=y
 | 
			
		||||
# CONFIG_SUNXI_SRAM is not set
 | 
			
		||||
CONFIG_SWCONFIG=y
 | 
			
		||||
CONFIG_SWIOTLB=y
 | 
			
		||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 | 
			
		||||
CONFIG_TICK_CPU_ACCOUNTING=y
 | 
			
		||||
CONFIG_UBIFS_FS=y
 | 
			
		||||
CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 | 
			
		||||
CONFIG_UBIFS_FS_LZO=y
 | 
			
		||||
# CONFIG_UBIFS_FS_XZ is not set
 | 
			
		||||
CONFIG_UBIFS_FS_ZLIB=y
 | 
			
		||||
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 | 
			
		||||
CONFIG_USB=y
 | 
			
		||||
CONFIG_USB_COMMON=y
 | 
			
		||||
CONFIG_USB_EHCI_HCD=y
 | 
			
		||||
CONFIG_USB_EHCI_HCD_ORION=y
 | 
			
		||||
# CONFIG_USB_EHCI_HCD_PLATFORM is not set
 | 
			
		||||
CONFIG_USB_EHCI_PCI=y
 | 
			
		||||
CONFIG_USB_STORAGE=y
 | 
			
		||||
CONFIG_USB_SUPPORT=y
 | 
			
		||||
# CONFIG_USB_UHCI_HCD is not set
 | 
			
		||||
CONFIG_USE_OF=y
 | 
			
		||||
CONFIG_VECTORS_BASE=0xffff0000
 | 
			
		||||
# CONFIG_VFP is not set
 | 
			
		||||
CONFIG_VM_EVENT_COUNTERS=y
 | 
			
		||||
CONFIG_WAN=y
 | 
			
		||||
CONFIG_XZ_DEC_ARM=y
 | 
			
		||||
CONFIG_XZ_DEC_BCJ=y
 | 
			
		||||
CONFIG_ZBOOT_ROM_BSS=0x0
 | 
			
		||||
CONFIG_ZBOOT_ROM_TEXT=0x0
 | 
			
		||||
CONFIG_ZLIB_DEFLATE=y
 | 
			
		||||
CONFIG_ZLIB_INFLATE=y
 | 
			
		||||
CONFIG_ZONE_DMA_FLAG=0
 | 
			
		||||
@ -1,61 +0,0 @@
 | 
			
		||||
The WRT1900AC among other Linksys routers uses a dual-firmware layout.
 | 
			
		||||
Dynamically rename the active partition to "ubi".
 | 
			
		||||
 | 
			
		||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 | 
			
		||||
 | 
			
		||||
--- a/drivers/mtd/ofpart.c
 | 
			
		||||
+++ b/drivers/mtd/ofpart.c
 | 
			
		||||
@@ -25,12 +25,15 @@ static bool node_has_compatible(struct d
 | 
			
		||||
 	return of_get_property(pp, "compatible", NULL);
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
+static int mangled_rootblock;
 | 
			
		||||
+
 | 
			
		||||
 static int parse_ofpart_partitions(struct mtd_info *master,
 | 
			
		||||
 				   struct mtd_partition **pparts,
 | 
			
		||||
 				   struct mtd_part_parser_data *data)
 | 
			
		||||
 {
 | 
			
		||||
 	struct device_node *node;
 | 
			
		||||
 	const char *partname;
 | 
			
		||||
+	const char *owrtpart = "ubi";
 | 
			
		||||
 	struct device_node *pp;
 | 
			
		||||
 	int nr_parts, i;
 | 
			
		||||
 
 | 
			
		||||
@@ -78,9 +81,15 @@ static int parse_ofpart_partitions(struc
 | 
			
		||||
 		(*pparts)[i].offset = of_read_number(reg, a_cells);
 | 
			
		||||
 		(*pparts)[i].size = of_read_number(reg + a_cells, s_cells);
 | 
			
		||||
 
 | 
			
		||||
-		partname = of_get_property(pp, "label", &len);
 | 
			
		||||
-		if (!partname)
 | 
			
		||||
-			partname = of_get_property(pp, "name", &len);
 | 
			
		||||
+		if (mangled_rootblock && (i == mangled_rootblock)) {
 | 
			
		||||
+				partname = owrtpart;
 | 
			
		||||
+		} else {
 | 
			
		||||
+			partname = of_get_property(pp, "label", &len);
 | 
			
		||||
+
 | 
			
		||||
+			if (!partname)
 | 
			
		||||
+				partname = of_get_property(pp, "name", &len);
 | 
			
		||||
+		}
 | 
			
		||||
+
 | 
			
		||||
 		(*pparts)[i].name = partname;
 | 
			
		||||
 
 | 
			
		||||
 		if (of_get_property(pp, "read-only", &len))
 | 
			
		||||
@@ -178,6 +187,18 @@ static int __init ofpart_parser_init(voi
 | 
			
		||||
 	return 0;
 | 
			
		||||
 }
 | 
			
		||||
 
 | 
			
		||||
+static int __init active_root(char *str)
 | 
			
		||||
+{
 | 
			
		||||
+	get_option(&str, &mangled_rootblock);
 | 
			
		||||
+
 | 
			
		||||
+	if (!mangled_rootblock)
 | 
			
		||||
+		return 1;
 | 
			
		||||
+
 | 
			
		||||
+	return 1;
 | 
			
		||||
+}
 | 
			
		||||
+
 | 
			
		||||
+__setup("mangled_rootblock=", active_root);
 | 
			
		||||
+
 | 
			
		||||
 static void __exit ofpart_parser_exit(void)
 | 
			
		||||
 {
 | 
			
		||||
 	deregister_mtd_parser(&ofpart_parser);
 | 
			
		||||
@ -1,20 +0,0 @@
 | 
			
		||||
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
 | 
			
		||||
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
 | 
			
		||||
@@ -117,13 +117,13 @@
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
 	partition@100000 {
 | 
			
		||||
-		label = "uImage";
 | 
			
		||||
-		reg = <0x0100000 0x600000>;
 | 
			
		||||
+		label = "second stage u-boot";
 | 
			
		||||
+		reg = <0x100000 0x200000>;
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
-	partition@700000 {
 | 
			
		||||
+	partition@200000 {
 | 
			
		||||
 		label = "root";
 | 
			
		||||
-		reg = <0x0700000 0xf900000>;
 | 
			
		||||
+		reg = <0x200000 0xfe00000>;
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
 };
 | 
			
		||||
@ -1,41 +0,0 @@
 | 
			
		||||
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
 | 
			
		||||
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
 | 
			
		||||
@@ -155,28 +155,23 @@
 | 
			
		||||
 	status = "okay";
 | 
			
		||||
 
 | 
			
		||||
 	partition@0 {
 | 
			
		||||
-		label = "uboot";
 | 
			
		||||
-		reg = <0x0000000 0xc0000>;
 | 
			
		||||
+		label = "u-boot";
 | 
			
		||||
+		reg = <0x0000000 0xe0000>;
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
-	partition@a0000 {
 | 
			
		||||
-		label = "env";
 | 
			
		||||
-		reg = <0xa0000 0x20000>;
 | 
			
		||||
+	partition@e0000 {
 | 
			
		||||
+		label = "u-boot environment";
 | 
			
		||||
+		reg = <0xe0000 0x100000>;
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
 	partition@100000 {
 | 
			
		||||
-		label = "zImage";
 | 
			
		||||
-		reg = <0x100000 0x300000>;
 | 
			
		||||
+		label = "second stage u-boot";
 | 
			
		||||
+		reg = <0x100000 0x200000>;
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
-	partition@540000 {
 | 
			
		||||
-		label = "initrd";
 | 
			
		||||
-		reg = <0x540000 0x300000>;
 | 
			
		||||
-	};
 | 
			
		||||
-
 | 
			
		||||
-	partition@980000 {
 | 
			
		||||
-		label = "boot";
 | 
			
		||||
-		reg = <0x980000 0x1f400000>;
 | 
			
		||||
+	partition@200000 {
 | 
			
		||||
+		label = "root";
 | 
			
		||||
+		reg = <0x200000 0x1fe00000>;
 | 
			
		||||
 	};
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
@ -1,32 +0,0 @@
 | 
			
		||||
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
 | 
			
		||||
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
 | 
			
		||||
@@ -77,18 +77,22 @@
 | 
			
		||||
 
 | 
			
		||||
 	partition@0 {
 | 
			
		||||
 		label = "u-boot";
 | 
			
		||||
-		reg = <0x0000000 0x100000>;
 | 
			
		||||
-		read-only;
 | 
			
		||||
+		reg = <0x0000000 0xe0000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@e0000 {
 | 
			
		||||
+		label = "u-boot environment";
 | 
			
		||||
+		reg = <0xe0000 0x100000>;
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
 	partition@100000 {
 | 
			
		||||
-		label = "uImage";
 | 
			
		||||
-		reg = <0x0100000 0x400000>;
 | 
			
		||||
+		label = "second stage u-boot";
 | 
			
		||||
+		reg = <0x100000 0x200000>;
 | 
			
		||||
 	};
 | 
			
		||||
 
 | 
			
		||||
-	partition@500000 {
 | 
			
		||||
-		label = "data";
 | 
			
		||||
-		reg = <0x0500000 0xfb00000>;
 | 
			
		||||
+	partition@200000 {
 | 
			
		||||
+		label = "root";
 | 
			
		||||
+		reg = <0x200000 0xfe00000>;
 | 
			
		||||
 	};
 | 
			
		||||
 };
 | 
			
		||||
 
 | 
			
		||||
@ -1,200 +0,0 @@
 | 
			
		||||
--- a/arch/arm/boot/dts/Makefile
 | 
			
		||||
+++ b/arch/arm/boot/dts/Makefile
 | 
			
		||||
@@ -176,6 +176,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
 | 
			
		||||
 	kirkwood-is2.dtb \
 | 
			
		||||
 	kirkwood-km_kirkwood.dtb \
 | 
			
		||||
 	kirkwood-laplug.dtb \
 | 
			
		||||
+	kirkwood-linksys-viper.dtb \
 | 
			
		||||
 	kirkwood-lschlv2.dtb \
 | 
			
		||||
 	kirkwood-lswvl.dtb \
 | 
			
		||||
 	kirkwood-lswxl.dtb \
 | 
			
		||||
--- /dev/null
 | 
			
		||||
+++ b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
 | 
			
		||||
@@ -0,0 +1,187 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * kirkwood-linksys-viper.dts - Device Tree file for Linksys EA4500
 | 
			
		||||
+ *
 | 
			
		||||
+ * (c) 2013 Jonas Gorski <jogo@openwrt.org>
 | 
			
		||||
+ * (c) 2013 Deutsche Telekom Innovation Laboratories
 | 
			
		||||
+ * (c) 2014 Luka Perkov <luka@openwrt.org>
 | 
			
		||||
+ *
 | 
			
		||||
+ * This file is licensed under the terms of the GNU General Public
 | 
			
		||||
+ * License version 2.  This program is licensed "as is" without any
 | 
			
		||||
+ * warranty of any kind, whether express or implied.
 | 
			
		||||
+ */
 | 
			
		||||
+
 | 
			
		||||
+/dts-v1/;
 | 
			
		||||
+
 | 
			
		||||
+#include "kirkwood.dtsi"
 | 
			
		||||
+#include "kirkwood-6282.dtsi"
 | 
			
		||||
+
 | 
			
		||||
+/ {
 | 
			
		||||
+	model = "Linksys E4200v2 / EA4500";
 | 
			
		||||
+	compatible = "linksys,viper", "marvell,kirkwood-88f6282", "marvell,kirkwood";
 | 
			
		||||
+
 | 
			
		||||
+	memory {
 | 
			
		||||
+		device_type = "memory";
 | 
			
		||||
+		reg = <0x00000000 0x8000000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	chosen {
 | 
			
		||||
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	mbus {
 | 
			
		||||
+		pcie-controller {
 | 
			
		||||
+			status = "okay";
 | 
			
		||||
+
 | 
			
		||||
+			pcie@1,0 {
 | 
			
		||||
+				status = "okay";
 | 
			
		||||
+			};
 | 
			
		||||
+
 | 
			
		||||
+			pcie@2,0 {
 | 
			
		||||
+				status = "okay";
 | 
			
		||||
+			};
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	ocp@f1000000 {
 | 
			
		||||
+		pinctrl: pin-controller@10000 {
 | 
			
		||||
+			pmx_led_white_health: pmx-led-white-health {
 | 
			
		||||
+				marvell,pins = "mpp7";
 | 
			
		||||
+				marvell,function = "gpo";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_white_pulse: pmx-led-white-pulse {
 | 
			
		||||
+				marvell,pins = "mpp14";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_btn_wps: pmx-btn-wps {
 | 
			
		||||
+				marvell,pins = "mpp47";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_btn_reset: pmx-btn-reset {
 | 
			
		||||
+				marvell,pins = "mpp48";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		rtc@10300 {
 | 
			
		||||
+			status = "disabled";
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		serial@12000 {
 | 
			
		||||
+			status = "okay";
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	gpio_keys {
 | 
			
		||||
+		compatible = "gpio-keys";
 | 
			
		||||
+		#address-cells = <1>;
 | 
			
		||||
+		#size-cells = <0>;
 | 
			
		||||
+		pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >;
 | 
			
		||||
+		pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+		button@15 {
 | 
			
		||||
+			label = "WPS Button";
 | 
			
		||||
+			linux,code = <KEY_WPS_BUTTON>;
 | 
			
		||||
+			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		button@16 {
 | 
			
		||||
+			label = "Reset Button";
 | 
			
		||||
+			linux,code = <KEY_RESTART>;
 | 
			
		||||
+			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	gpio-leds {
 | 
			
		||||
+		compatible = "gpio-leds";
 | 
			
		||||
+		pinctrl-0 = < &pmx_led_white_health &pmx_led_white_pulse >;
 | 
			
		||||
+		pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+		white-health {
 | 
			
		||||
+			label = "viper:white:health";
 | 
			
		||||
+			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		white-pulse {
 | 
			
		||||
+			label = "viper:white:pulse";
 | 
			
		||||
+			gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	mvsw61xx {
 | 
			
		||||
+		compatible = "marvell,88e6171";
 | 
			
		||||
+		status = "okay";
 | 
			
		||||
+		reg = <0x10>;
 | 
			
		||||
+
 | 
			
		||||
+		mii-bus = <&mdio>;
 | 
			
		||||
+		cpu-port-0 = <5>;
 | 
			
		||||
+		cpu-port-1 = <6>;
 | 
			
		||||
+		is-indirect;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+&nand {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+	pinctrl-0 = <&pmx_nand>;
 | 
			
		||||
+	pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+	partition@0 {
 | 
			
		||||
+		label = "u-boot";
 | 
			
		||||
+		reg = <0x0 0x80000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@80000 {
 | 
			
		||||
+		label = "u_env";
 | 
			
		||||
+		reg = <0x80000 0x20000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@a0000 {
 | 
			
		||||
+		label = "s_env";
 | 
			
		||||
+		reg = <0xa0000 0x20000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@200000 {
 | 
			
		||||
+		label = "kernel1";
 | 
			
		||||
+		reg = <0x200000 0x1a00000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@4a0000 {
 | 
			
		||||
+		label = "rootfs1";
 | 
			
		||||
+		reg = <0x4a0000 0x1760000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@1c00000 {
 | 
			
		||||
+		label = "kernel2";
 | 
			
		||||
+		reg = <0x1c00000 0x1a00000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@1ea0000 {
 | 
			
		||||
+		label = "rootfs2";
 | 
			
		||||
+		reg = <0x1ea0000 0x1760000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@3600000 {
 | 
			
		||||
+		label = "syscfg";
 | 
			
		||||
+		reg = <0x3600000 0x4a00000>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+&mdio {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+ð0 {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+	ethernet0-port@0 {
 | 
			
		||||
+		speed = <1000>;
 | 
			
		||||
+		duplex = <1>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+ð1 {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+	ethernet1-port@0 {
 | 
			
		||||
+		speed = <1000>;
 | 
			
		||||
+		duplex = <1>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
@ -1,192 +0,0 @@
 | 
			
		||||
--- a/arch/arm/boot/dts/Makefile
 | 
			
		||||
+++ b/arch/arm/boot/dts/Makefile
 | 
			
		||||
@@ -176,6 +176,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
 | 
			
		||||
 	kirkwood-is2.dtb \
 | 
			
		||||
 	kirkwood-km_kirkwood.dtb \
 | 
			
		||||
 	kirkwood-laplug.dtb \
 | 
			
		||||
+	kirkwood-linksys-audi.dtb \
 | 
			
		||||
 	kirkwood-linksys-viper.dtb \
 | 
			
		||||
 	kirkwood-lschlv2.dtb \
 | 
			
		||||
 	kirkwood-lswvl.dtb \
 | 
			
		||||
--- /dev/null
 | 
			
		||||
+++ b/arch/arm/boot/dts/kirkwood-linksys-audi.dts
 | 
			
		||||
@@ -0,0 +1,179 @@
 | 
			
		||||
+/*
 | 
			
		||||
+ * kirkwood-linksys-audi.dts - Device Tree file for Linksys EA3500
 | 
			
		||||
+ *
 | 
			
		||||
+ * (c) 2013 Jonas Gorski <jogo@openwrt.org>
 | 
			
		||||
+ * (c) 2013 Deutsche Telekom Innovation Laboratories
 | 
			
		||||
+ * (c) 2014 Luka Perkov <luka@openwrt.org>
 | 
			
		||||
+ * (c) 2014 Dan Walters <dan@walters.io>
 | 
			
		||||
+ *
 | 
			
		||||
+ * This file is licensed under the terms of the GNU General Public
 | 
			
		||||
+ * License version 2.  This program is licensed "as is" without any
 | 
			
		||||
+ * warranty of any kind, whether express or implied.
 | 
			
		||||
+ */
 | 
			
		||||
+
 | 
			
		||||
+/dts-v1/;
 | 
			
		||||
+
 | 
			
		||||
+#include "kirkwood.dtsi"
 | 
			
		||||
+#include "kirkwood-6282.dtsi"
 | 
			
		||||
+
 | 
			
		||||
+/ {
 | 
			
		||||
+	model = "Linksys EA3500";
 | 
			
		||||
+	compatible = "linksys,audi", "marvell,kirkwood-88f6282", "marvell,kirkwood";
 | 
			
		||||
+
 | 
			
		||||
+	memory {
 | 
			
		||||
+		device_type = "memory";
 | 
			
		||||
+		reg = <0x00000000 0x4000000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	chosen {
 | 
			
		||||
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	mbus {
 | 
			
		||||
+		pcie-controller {
 | 
			
		||||
+			status = "okay";
 | 
			
		||||
+
 | 
			
		||||
+			pcie@1,0 {
 | 
			
		||||
+				status = "okay";
 | 
			
		||||
+			};
 | 
			
		||||
+
 | 
			
		||||
+			pcie@2,0 {
 | 
			
		||||
+				status = "okay";
 | 
			
		||||
+			};
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	ocp@f1000000 {
 | 
			
		||||
+		pinctrl: pin-controller@10000 {
 | 
			
		||||
+			pmx_led_green_power: pmx-led-green-power {
 | 
			
		||||
+				marvell,pins = "mpp7";
 | 
			
		||||
+				marvell,function = "gpo";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_btn_wps: pmx-btn-wps {
 | 
			
		||||
+				marvell,pins = "mpp47";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_btn_reset: pmx-btn-reset {
 | 
			
		||||
+				marvell,pins = "mpp48";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		rtc@10300 {
 | 
			
		||||
+			status = "disabled";
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		serial@12000 {
 | 
			
		||||
+			status = "okay";
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	gpio_keys {
 | 
			
		||||
+		compatible = "gpio-keys";
 | 
			
		||||
+		#address-cells = <1>;
 | 
			
		||||
+		#size-cells = <0>;
 | 
			
		||||
+		pinctrl-0 = < &pmx_btn_wps &pmx_btn_reset >;
 | 
			
		||||
+		pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+		button@15 {
 | 
			
		||||
+			label = "WPS Button";
 | 
			
		||||
+			linux,code = <KEY_WPS_BUTTON>;
 | 
			
		||||
+			gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		button@16 {
 | 
			
		||||
+			label = "Reset Button";
 | 
			
		||||
+			linux,code = <KEY_RESTART>;
 | 
			
		||||
+			gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	gpio-leds {
 | 
			
		||||
+		compatible = "gpio-leds";
 | 
			
		||||
+		pinctrl-0 = < &pmx_led_green_power >;
 | 
			
		||||
+		pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+		green-power {
 | 
			
		||||
+			label = "audi:green:power";
 | 
			
		||||
+			gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	mvsw61xx {
 | 
			
		||||
+		compatible = "marvell,88e6171";
 | 
			
		||||
+		status = "okay";
 | 
			
		||||
+		reg = <0x10>;
 | 
			
		||||
+
 | 
			
		||||
+		mii-bus = <&mdio>;
 | 
			
		||||
+		cpu-port-0 = <5>;
 | 
			
		||||
+		cpu-port-1 = <6>;
 | 
			
		||||
+		is-indirect;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+&nand {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+	pinctrl-0 = <&pmx_nand>;
 | 
			
		||||
+	pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+	partition@0 {
 | 
			
		||||
+		label = "u-boot";
 | 
			
		||||
+		reg = <0x0 0x80000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@80000 {
 | 
			
		||||
+		label = "u_env";
 | 
			
		||||
+		reg = <0x80000 0x4000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@84000 {
 | 
			
		||||
+		label = "s_env";
 | 
			
		||||
+		reg = <0x84000 0x4000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@200000 {
 | 
			
		||||
+		label = "kernel1";
 | 
			
		||||
+		reg = <0x200000 0x1400000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@490000 {
 | 
			
		||||
+		label = "rootfs1";
 | 
			
		||||
+		reg = <0x490000 0x1170000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@1600000 {
 | 
			
		||||
+		label = "kernel2";
 | 
			
		||||
+		reg = <0x1600000 0x1400000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@1890000 {
 | 
			
		||||
+		label = "rootfs2";
 | 
			
		||||
+		reg = <0x1890000 0x1170000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@2a00000 {
 | 
			
		||||
+		label = "syscfg";
 | 
			
		||||
+		reg = <0x2a00000  0x1600000>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+&mdio {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+ð0 {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+	ethernet0-port@0 {
 | 
			
		||||
+		speed = <1000>;
 | 
			
		||||
+		duplex = <1>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+ð1 {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+	ethernet1-port@0 {
 | 
			
		||||
+		speed = <1000>;
 | 
			
		||||
+		duplex = <1>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
@ -1,140 +0,0 @@
 | 
			
		||||
--- a/arch/arm/boot/dts/Makefile
 | 
			
		||||
+++ b/arch/arm/boot/dts/Makefile
 | 
			
		||||
@@ -168,6 +168,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
 | 
			
		||||
 	kirkwood-ds411.dtb \
 | 
			
		||||
 	kirkwood-ds411j.dtb \
 | 
			
		||||
 	kirkwood-ds411slim.dtb \
 | 
			
		||||
+	kirkwood-goflexhome.dtb \
 | 
			
		||||
 	kirkwood-goflexnet.dtb \
 | 
			
		||||
 	kirkwood-guruplug-server-plus.dtb \
 | 
			
		||||
 	kirkwood-ib62x0.dtb \
 | 
			
		||||
--- /dev/null
 | 
			
		||||
+++ b/arch/arm/boot/dts/kirkwood-goflexhome.dts
 | 
			
		||||
@@ -0,0 +1,127 @@
 | 
			
		||||
+/dts-v1/;
 | 
			
		||||
+
 | 
			
		||||
+#include "kirkwood.dtsi"
 | 
			
		||||
+#include "kirkwood-6281.dtsi"
 | 
			
		||||
+
 | 
			
		||||
+/ {
 | 
			
		||||
+	model = "Seagate GoFlex Home";
 | 
			
		||||
+	compatible = "seagate,goflexhome", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 | 
			
		||||
+
 | 
			
		||||
+	memory {
 | 
			
		||||
+		device_type = "memory";
 | 
			
		||||
+		reg = <0x00000000 0x8000000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	chosen {
 | 
			
		||||
+		bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";
 | 
			
		||||
+		stdout-path = &uart0;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	ocp@f1000000 {
 | 
			
		||||
+		pinctrl: pin-controller@10000 {
 | 
			
		||||
+			pmx_usb_power_enable: pmx-usb-power-enable {
 | 
			
		||||
+				marvell,pins = "mpp29";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_white: pmx-led-white {
 | 
			
		||||
+				marvell,pins = "mpp40";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_green: pmx-led_green {
 | 
			
		||||
+				marvell,pins = "mpp46";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_orange: pmx-led-orange {
 | 
			
		||||
+				marvell,pins = "mpp47";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+		};
 | 
			
		||||
+		serial@12000 {
 | 
			
		||||
+			status = "ok";
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		sata@80000 {
 | 
			
		||||
+			status = "okay";
 | 
			
		||||
+			nr-ports = <2>;
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+	};
 | 
			
		||||
+	gpio-leds {
 | 
			
		||||
+		compatible = "gpio-leds";
 | 
			
		||||
+
 | 
			
		||||
+		health {
 | 
			
		||||
+			label = "status:green:health";
 | 
			
		||||
+			gpios = <&gpio1 14 1>;
 | 
			
		||||
+			linux,default-trigger = "default-on";
 | 
			
		||||
+		};
 | 
			
		||||
+		fault {
 | 
			
		||||
+			label = "status:orange:fault";
 | 
			
		||||
+			gpios = <&gpio1 15 1>;
 | 
			
		||||
+		};
 | 
			
		||||
+		misc {
 | 
			
		||||
+			label = "status:white:misc";
 | 
			
		||||
+			gpios = <&gpio1 8 1>;
 | 
			
		||||
+			linux,default-trigger = "ide-disk";
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+	regulators {
 | 
			
		||||
+		compatible = "simple-bus";
 | 
			
		||||
+		#address-cells = <1>;
 | 
			
		||||
+		#size-cells = <0>;
 | 
			
		||||
+		pinctrl-0 = <&pmx_usb_power_enable>;
 | 
			
		||||
+		pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+		usb_power: regulator@1 {
 | 
			
		||||
+			compatible = "regulator-fixed";
 | 
			
		||||
+			reg = <1>;
 | 
			
		||||
+			regulator-name = "USB Power";
 | 
			
		||||
+			regulator-min-microvolt = <5000000>;
 | 
			
		||||
+			regulator-max-microvolt = <5000000>;
 | 
			
		||||
+			enable-active-high;
 | 
			
		||||
+			regulator-always-on;
 | 
			
		||||
+			regulator-boot-on;
 | 
			
		||||
+			gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+&nand {
 | 
			
		||||
+	chip-delay = <40>;
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+
 | 
			
		||||
+	partition@0 {
 | 
			
		||||
+		label = "u-boot";
 | 
			
		||||
+		reg = <0x0000000 0x100000>;
 | 
			
		||||
+		read-only;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@100000 {
 | 
			
		||||
+		label = "uImage";
 | 
			
		||||
+		reg = <0x0100000 0x400000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@500000 {
 | 
			
		||||
+		label = "pogoplug";
 | 
			
		||||
+		reg = <0x0500000 0x2000000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@2500000 {
 | 
			
		||||
+		label = "root";
 | 
			
		||||
+		reg = <0x02500000 0xd800000>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+&mdio {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+
 | 
			
		||||
+	ethphy0: ethernet-phy@0 {
 | 
			
		||||
+		reg = <0>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+ð0 {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+	ethernet0-port@0 {
 | 
			
		||||
+		phy-handle = <ðphy0>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
@ -1,300 +0,0 @@
 | 
			
		||||
--- /dev/null
 | 
			
		||||
+++ b/arch/arm/boot/dts/kirkwood-nsa310s.dts
 | 
			
		||||
@@ -0,0 +1,287 @@
 | 
			
		||||
+/dts-v1/;
 | 
			
		||||
+
 | 
			
		||||
+#include "kirkwood.dtsi"
 | 
			
		||||
+#include "kirkwood-6281.dtsi"
 | 
			
		||||
+
 | 
			
		||||
+/ {
 | 
			
		||||
+	model = "ZyXEL NSA310S";
 | 
			
		||||
+	compatible = "zyxel,nsa310s", "marvell,kirkwood-88f6702", "marvell,kirkwood";
 | 
			
		||||
+
 | 
			
		||||
+	memory {
 | 
			
		||||
+		device_type = "memory";
 | 
			
		||||
+		reg = <0x00000000 0x10000000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	chosen {
 | 
			
		||||
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
 | 
			
		||||
+		stdout-path = &uart0;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	mbus {
 | 
			
		||||
+		pcie-controller {
 | 
			
		||||
+			status = "okay";
 | 
			
		||||
+
 | 
			
		||||
+			pcie@1,0 {
 | 
			
		||||
+				status = "okay";
 | 
			
		||||
+			};
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	ocp@f1000000 {
 | 
			
		||||
+		pinctrl: pin-controller@10000 {
 | 
			
		||||
+			pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+			pmx_sata0: pmx-sata0 {
 | 
			
		||||
+				marvell,pins;
 | 
			
		||||
+				marvell,function = "sata0";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_sata1: pmx-sata1 {
 | 
			
		||||
+				marvell,pins;
 | 
			
		||||
+				marvell,function = "sata1";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_usb_power: pmx-usb-power {
 | 
			
		||||
+				marvell,pins = "mpp21";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_pwr_off: pmx-pwr-off {
 | 
			
		||||
+				marvell,pins = "mpp27";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_btn_reset: pmx-btn-reset {
 | 
			
		||||
+				marvell,pins = "mpp24";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_btn_copy: pmx-btn-copy {
 | 
			
		||||
+				marvell,pins = "mpp25";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_btn_power: pmx-btn-power {
 | 
			
		||||
+				marvell,pins = "mpp26";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_hdd2_green: pmx-led-hdd2-green {
 | 
			
		||||
+				marvell,pins = "mpp34";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_hdd2_red: pmx-led-hdd2-red {
 | 
			
		||||
+				marvell,pins = "mpp12";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_usb_green: pmx-led-usb-green {
 | 
			
		||||
+				marvell,pins = "mpp15";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_copy_green: pmx-led-copy-green {
 | 
			
		||||
+				marvell,pins = "mpp22";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_copy_red: pmx-led-copy-red {
 | 
			
		||||
+				marvell,pins = "mpp23";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_sys_green: pmx-led-sys-green {
 | 
			
		||||
+				marvell,pins = "mpp28";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_sys_orange: pmx-led-sys-orange {
 | 
			
		||||
+				marvell,pins = "mpp29";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_hdd1_green: pmx-led-hdd1-green {
 | 
			
		||||
+				marvell,pins = "mpp16";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_led_hdd1_red: pmx-led-hdd1-red {
 | 
			
		||||
+				marvell,pins = "mpp13";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+			pmx_pwr_sata1: pmx-pwr-sata1 {
 | 
			
		||||
+				marvell,pins = "mpp33";
 | 
			
		||||
+				marvell,function = "gpio";
 | 
			
		||||
+			};
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		serial@12000 {
 | 
			
		||||
+			status = "okay";
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		sata@80000 {
 | 
			
		||||
+			status = "okay";
 | 
			
		||||
+			nr-ports = <2>;
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		rtc@10300 {
 | 
			
		||||
+			status = "disabled";
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		i2c@11000 {
 | 
			
		||||
+			status = "okay";
 | 
			
		||||
+			ht1382: rtc@68 {
 | 
			
		||||
+				compatible = "htk,ht1382";
 | 
			
		||||
+				reg = <0x68>;
 | 
			
		||||
+			};
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	regulators {
 | 
			
		||||
+		compatible = "simple-bus";
 | 
			
		||||
+		#address-cells = <1>;
 | 
			
		||||
+		#size-cells = <0>;
 | 
			
		||||
+		pinctrl-names = "default";
 | 
			
		||||
+		pinctrl-0 = <&pmx_usb_power &pmx_pwr_sata1>;
 | 
			
		||||
+
 | 
			
		||||
+		usb0_power: regulator@1 {
 | 
			
		||||
+			compatible = "regulator-fixed";
 | 
			
		||||
+			reg = <1>;
 | 
			
		||||
+			regulator-name = "USB Power";
 | 
			
		||||
+			regulator-min-microvolt = <5000000>;
 | 
			
		||||
+			regulator-max-microvolt = <5000000>;
 | 
			
		||||
+			regulator-always-on;
 | 
			
		||||
+			regulator-boot-on;
 | 
			
		||||
+			enable-active-high;
 | 
			
		||||
+			gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+
 | 
			
		||||
+		sata1_power: regulator@2 {
 | 
			
		||||
+			compatible = "regulator-fixed";
 | 
			
		||||
+			reg = <2>;
 | 
			
		||||
+			regulator-name = "SATA1 Power";
 | 
			
		||||
+			regulator-min-microvolt = <5000000>;
 | 
			
		||||
+			regulator-max-microvolt = <5000000>;
 | 
			
		||||
+			regulator-always-on;
 | 
			
		||||
+			regulator-boot-on;
 | 
			
		||||
+			enable-active-high;
 | 
			
		||||
+			gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+
 | 
			
		||||
+	gpio_keys {
 | 
			
		||||
+		compatible = "gpio-keys";
 | 
			
		||||
+		#address-cells = <1>;
 | 
			
		||||
+		#size-cells = <0>;
 | 
			
		||||
+		pinctrl-0 = <&pmx_btn_reset &pmx_btn_copy &pmx_btn_power>;
 | 
			
		||||
+		pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+		button@1 {
 | 
			
		||||
+			label = "Power Button";
 | 
			
		||||
+			linux,code = <KEY_POWER>;
 | 
			
		||||
+			gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+		button@2 {
 | 
			
		||||
+			label = "Copy Button";
 | 
			
		||||
+			linux,code = <KEY_COPY>;
 | 
			
		||||
+			gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
 | 
			
		||||
+		};
 | 
			
		||||
+		button@3 {
 | 
			
		||||
+			label = "Reset Button";
 | 
			
		||||
+			linux,code = <KEY_RESTART>;
 | 
			
		||||
+			gpios = <&gpio0 24 GPIO_ACTIVE_LOW>;
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	gpio-leds {
 | 
			
		||||
+		compatible = "gpio-leds";
 | 
			
		||||
+		pinctrl-0 = <&pmx_led_hdd2_green &pmx_led_hdd2_red
 | 
			
		||||
+				&pmx_led_usb_green
 | 
			
		||||
+				&pmx_led_sys_green &pmx_led_sys_orange
 | 
			
		||||
+				&pmx_led_copy_green &pmx_led_copy_red
 | 
			
		||||
+				&pmx_led_hdd1_green &pmx_led_hdd1_red>;
 | 
			
		||||
+		pinctrl-names = "default";
 | 
			
		||||
+
 | 
			
		||||
+		green-sys {
 | 
			
		||||
+			label = "nsa310s:green:sys";
 | 
			
		||||
+			gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+			linux,default-trigger = "timer";
 | 
			
		||||
+		};
 | 
			
		||||
+		orange-sys {
 | 
			
		||||
+			label = "nsa310s:orange:sys";
 | 
			
		||||
+			gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+		green-hdd1 {
 | 
			
		||||
+			label = "nsa310s:green:hdd1";
 | 
			
		||||
+			gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+		red-hdd1 {
 | 
			
		||||
+			label = "nsa310s:red:hdd1";
 | 
			
		||||
+			gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+		green-hdd2 {
 | 
			
		||||
+			label = "nsa310s:green:hdd2";
 | 
			
		||||
+			gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+		red-hdd2 {
 | 
			
		||||
+			label = "nsa310s:red:hdd2";
 | 
			
		||||
+			gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+		green-usb {
 | 
			
		||||
+			label = "nsa310s:green:usb";
 | 
			
		||||
+			gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+		green-copy {
 | 
			
		||||
+			label = "nsa310s:green:copy";
 | 
			
		||||
+			gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+			linux,default-trigger = "ide-disk";
 | 
			
		||||
+		};
 | 
			
		||||
+		red-copy {
 | 
			
		||||
+			label = "nsa310s:red:copy";
 | 
			
		||||
+			gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+		};
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	gpio_poweroff {
 | 
			
		||||
+		compatible = "gpio-poweroff";
 | 
			
		||||
+		pinctrl-0 = <&pmx_pwr_off>;
 | 
			
		||||
+		pinctrl-names = "default";
 | 
			
		||||
+		gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+&nand {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+	chip-delay = <35>;
 | 
			
		||||
+
 | 
			
		||||
+	partition@0 {
 | 
			
		||||
+		label = "u-boot";
 | 
			
		||||
+		reg = <0x0000000 0xe0000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@e0000 {
 | 
			
		||||
+		label = "u-boot environment";
 | 
			
		||||
+		reg = <0xe0000 0x100000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@100000 {
 | 
			
		||||
+		label = "second stage u-boot";
 | 
			
		||||
+		reg = <0x100000 0x200000>;
 | 
			
		||||
+	};
 | 
			
		||||
+
 | 
			
		||||
+	partition@200000 {
 | 
			
		||||
+		label = "root";
 | 
			
		||||
+		reg = <0x200000 0x7e00000>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+&mdio {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+	ethphy0: ethernet-phy@1 {
 | 
			
		||||
+		compatible = "marvell,88e1318s";
 | 
			
		||||
+		reg = <1>;
 | 
			
		||||
+		marvell,reg-init = <0x1 0x16 0x0 0x3>,
 | 
			
		||||
+							<0x1 0x10 0x0 0x1017>,
 | 
			
		||||
+							<0x1 0x11 0x0 0x4408>,
 | 
			
		||||
+							<0x1 0x16 0x0 0x0>,
 | 
			
		||||
+							<0x1 0x4 0x0 0x1e1>,
 | 
			
		||||
+							<0x1 0x9 0x0 0x300>,
 | 
			
		||||
+							<0x1 0x10 0x0 0x3860>,
 | 
			
		||||
+							<0x1 0x0 0x0 0x9140>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
+
 | 
			
		||||
+ð0 {
 | 
			
		||||
+	status = "okay";
 | 
			
		||||
+
 | 
			
		||||
+	ethernet0-port@0 {
 | 
			
		||||
+		phy-handle = <ðphy0>;
 | 
			
		||||
+	};
 | 
			
		||||
+};
 | 
			
		||||
--- a/arch/arm/boot/dts/Makefile
 | 
			
		||||
+++ b/arch/arm/boot/dts/Makefile
 | 
			
		||||
@@ -196,6 +196,7 @@ dtb-$(CONFIG_MACH_KIRKWOOD) += \
 | 
			
		||||
 	kirkwood-ns2mini.dtb \
 | 
			
		||||
 	kirkwood-nsa310.dtb \
 | 
			
		||||
 	kirkwood-nsa310a.dtb \
 | 
			
		||||
+	kirkwood-nsa310s.dtb \
 | 
			
		||||
 	kirkwood-openblocks_a6.dtb \
 | 
			
		||||
 	kirkwood-openblocks_a7.dtb \
 | 
			
		||||
 	kirkwood-openrd-base.dtb \
 | 
			
		||||
@ -1,35 +0,0 @@
 | 
			
		||||
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
 | 
			
		||||
Subject: [PATCH] net: mv643xx_eth: Make TSO disabled by default
 | 
			
		||||
 | 
			
		||||
Data corruption has been observed to be produced by TSO. For instance,
 | 
			
		||||
accessing files on a NFS-server with TSO enabled results in different data
 | 
			
		||||
transferred each time.
 | 
			
		||||
 | 
			
		||||
This has been observed only on Kirkwood platforms, i.e. with the mv643xx_eth
 | 
			
		||||
driver. Same tests on platforms using the mvneta ethernet driver have
 | 
			
		||||
passed without errors.
 | 
			
		||||
 | 
			
		||||
Make TSO disabled by default for now, until we can found a proper fix
 | 
			
		||||
for the regression.
 | 
			
		||||
 | 
			
		||||
Fixes: 3ae8f4e0b98 ('net: mv643xx_eth: Implement software TSO')
 | 
			
		||||
Reported-by: Slawomir Gajzner <slawomir.gajzner@gmail.com>
 | 
			
		||||
Reported-by: Julien D'Ascenzio <jdascenzio@yahoo.fr>
 | 
			
		||||
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
 | 
			
		||||
---
 | 
			
		||||
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
 | 
			
		||||
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
 | 
			
		||||
@@ -3178,11 +3178,11 @@ static int mv643xx_eth_probe(struct plat
 | 
			
		||||
 	dev->watchdog_timeo = 2 * HZ;
 | 
			
		||||
 	dev->base_addr = 0;
 | 
			
		||||
 
 | 
			
		||||
-	dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
 | 
			
		||||
+	dev->features = NETIF_F_SG | NETIF_F_IP_CSUM;
 | 
			
		||||
 	dev->vlan_features = dev->features;
 | 
			
		||||
 
 | 
			
		||||
 	dev->features |= NETIF_F_RXCSUM;
 | 
			
		||||
-	dev->hw_features = dev->features;
 | 
			
		||||
+	dev->hw_features = dev->features | NETIF_F_TSO;
 | 
			
		||||
 
 | 
			
		||||
 	dev->priv_flags |= IFF_UNICAST_FLT;
 | 
			
		||||
 	dev->gso_max_segs = MV643XX_MAX_TSO_SEGS;
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user