oxnas: re-add support for kernel 3.14

This reverts commit c81ddddde5fd193802d511b42eb7b108aac17136 on
https://gitorious.org/openwrt-oxnas/openwrt-oxnas.git
which removed patches and config for 3.14.

[arm_introduce-dma-fiq-irq-broadcast patch was renamed to match 3.18]

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

SVN-Revision: 43520

13 files changed, 495 insertions, 0 deletions

diff --git a/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch
new file mode 100644
index 0000000000..ed01fe128e
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch
@@ -0,0 +1,62 @@
+Index: linux-3.14.18/arch/arm/include/asm/glue-cache.h
+===================================================================
+--- linux-3.14.18.orig/arch/arm/include/asm/glue-cache.h
++++ linux-3.14.18/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
+Index: linux-3.14.18/arch/arm/mm/Kconfig
+===================================================================
+--- linux-3.14.18.orig/arch/arm/mm/Kconfig
++++ linux-3.14.18/arch/arm/mm/Kconfig
+@@ -843,6 +843,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
+ 
+Index: linux-3.14.18/arch/arm/mm/flush.c
+===================================================================
+--- linux-3.14.18.orig/arch/arm/mm/flush.c
++++ linux-3.14.18/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 {
diff --git a/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch b/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch
new file mode 100644
index 0000000000..3b3947c6bf
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch
@@ -0,0 +1,99 @@
+Index: linux-3.13.7/drivers/reset/core.c
+===================================================================
+--- linux-3.13.7.orig/drivers/reset/core.c
++++ linux-3.13.7/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);
+ 
+ /**
+Index: linux-3.13.7/include/linux/reset.h
+===================================================================
+--- linux-3.13.7.orig/include/linux/reset.h
++++ linux-3.13.7/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);
diff --git a/target/linux/oxnas/patches-3.14/250-add-plxtech-vendor-prefix.patch b/target/linux/oxnas/patches-3.14/250-add-plxtech-vendor-prefix.patch
new file mode 100644
index 0000000000..c08754d6e5
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/250-add-plxtech-vendor-prefix.patch
@@ -0,0 +1,12 @@
+Index: linux-3.14.18/Documentation/devicetree/bindings/vendor-prefixes.txt
+===================================================================
+--- linux-3.14.18.orig/Documentation/devicetree/bindings/vendor-prefixes.txt
++++ linux-3.14.18/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
diff --git a/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch b/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch
new file mode 100644
index 0000000000..b6e2efb851
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch
@@ -0,0 +1,79 @@
+Index: linux-3.14.18/arch/arm/Kconfig
+===================================================================
+--- linux-3.14.18.orig/arch/arm/Kconfig
++++ linux-3.14.18/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"
+Index: linux-3.14.18/arch/arm/Makefile
+===================================================================
+--- linux-3.14.18.orig/arch/arm/Makefile
++++ linux-3.14.18/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
+Index: linux-3.14.18/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-3.14.18.orig/arch/arm/boot/dts/Makefile
++++ linux-3.14.18/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 \
+Index: linux-3.14.18/arch/arm/tools/mach-types
+===================================================================
+--- linux-3.14.18.orig/arch/arm/tools/mach-types
++++ linux-3.14.18/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
+Index: linux-3.14.18/drivers/clk/Makefile
+===================================================================
+--- linux-3.14.18.orig/drivers/clk/Makefile
++++ linux-3.14.18/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
diff --git a/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch b/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch
new file mode 100644
index 0000000000..1eb74debcf
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch
@@ -0,0 +1,24 @@
+Index: linux-3.14.18/drivers/clocksource/Kconfig
+===================================================================
+--- linux-3.14.18.orig/drivers/clocksource/Kconfig
++++ linux-3.14.18/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.
+Index: linux-3.14.18/drivers/clocksource/Makefile
+===================================================================
+--- linux-3.14.18.orig/drivers/clocksource/Makefile
++++ linux-3.14.18/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
diff --git a/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch b/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch
new file mode 100644
index 0000000000..6406a3f554
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch
@@ -0,0 +1,40 @@
+Index: linux-3.14.18/drivers/irqchip/Kconfig
+===================================================================
+--- linux-3.14.18.orig/drivers/irqchip/Kconfig
++++ linux-3.14.18/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
+Index: linux-3.14.18/drivers/irqchip/Makefile
+===================================================================
+--- linux-3.14.18.orig/drivers/irqchip/Makefile
++++ linux-3.14.18/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
+Index: linux-3.14.18/drivers/irqchip/irq-gic.c
+===================================================================
+--- linux-3.14.18.orig/drivers/irqchip/irq-gic.c
++++ linux-3.14.18/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);
+ 
diff --git a/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch b/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch
new file mode 100644
index 0000000000..60caca361d
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch
@@ -0,0 +1,32 @@
+Index: linux-3.14.18/drivers/pinctrl/Kconfig
+===================================================================
+--- linux-3.14.18.orig/drivers/pinctrl/Kconfig
++++ linux-3.14.18/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
+Index: linux-3.14.18/drivers/pinctrl/Makefile
+===================================================================
+--- linux-3.14.18.orig/drivers/pinctrl/Makefile
++++ linux-3.14.18/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/
diff --git a/target/linux/oxnas/patches-3.14/340-oxnas-pcie.patch b/target/linux/oxnas/patches-3.14/340-oxnas-pcie.patch
new file mode 100644
index 0000000000..ca0ccb83c8
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/340-oxnas-pcie.patch
@@ -0,0 +1,23 @@
+Index: linux-3.14.18/drivers/pci/host/Kconfig
+===================================================================
+--- linux-3.14.18.orig/drivers/pci/host/Kconfig
++++ linux-3.14.18/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
+Index: linux-3.14.18/drivers/pci/host/Makefile
+===================================================================
+--- linux-3.14.18.orig/drivers/pci/host/Makefile
++++ linux-3.14.18/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
diff --git a/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch b/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch
new file mode 100644
index 0000000000..820d70b2df
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch
@@ -0,0 +1,20 @@
+Index: linux-3.14.18/drivers/reset/Kconfig
+===================================================================
+--- linux-3.14.18.orig/drivers/reset/Kconfig
++++ linux-3.14.18/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
+Index: linux-3.14.18/drivers/reset/Makefile
+===================================================================
+--- linux-3.14.18.orig/drivers/reset/Makefile
++++ linux-3.14.18/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
diff --git a/target/linux/oxnas/patches-3.14/400-oxnas-nand.patch b/target/linux/oxnas/patches-3.14/400-oxnas-nand.patch
new file mode 100644
index 0000000000..a5a1b02aeb
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/400-oxnas-nand.patch
@@ -0,0 +1,28 @@
+Index: linux-3.14.18/drivers/mtd/nand/Kconfig
+===================================================================
+--- linux-3.14.18.orig/drivers/mtd/nand/Kconfig
++++ linux-3.14.18/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
+Index: linux-3.14.18/drivers/mtd/nand/Makefile
+===================================================================
+--- linux-3.14.18.orig/drivers/mtd/nand/Makefile
++++ linux-3.14.18/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
diff --git a/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch b/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch
new file mode 100644
index 0000000000..d203734a43
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch
@@ -0,0 +1,30 @@
+Index: linux-3.14.18/drivers/ata/Kconfig
+===================================================================
+--- linux-3.14.18.orig/drivers/ata/Kconfig
++++ linux-3.14.18/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
+Index: linux-3.14.18/drivers/ata/Makefile
+===================================================================
+--- linux-3.14.18.orig/drivers/ata/Makefile
++++ linux-3.14.18/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
diff --git a/target/linux/oxnas/patches-3.14/800-oxnas-ehci.patch b/target/linux/oxnas/patches-3.14/800-oxnas-ehci.patch
new file mode 100644
index 0000000000..94e62a910f
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/800-oxnas-ehci.patch
@@ -0,0 +1,30 @@
+Index: linux-3.14.18/drivers/usb/host/Kconfig
+===================================================================
+--- linux-3.14.18.orig/drivers/usb/host/Kconfig
++++ linux-3.14.18/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
+Index: linux-3.14.18/drivers/usb/host/Makefile
+===================================================================
+--- linux-3.14.18.orig/drivers/usb/host/Makefile
++++ linux-3.14.18/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
diff --git a/target/linux/oxnas/patches-3.14/900-more-boards.patch b/target/linux/oxnas/patches-3.14/900-more-boards.patch
new file mode 100644
index 0000000000..04bbfaa657
--- /dev/null
+++ b/target/linux/oxnas/patches-3.14/900-more-boards.patch
@@ -0,0 +1,16 @@
+Index: linux-3.14.18/arch/arm/boot/dts/Makefile
+===================================================================
+--- linux-3.14.18.orig/arch/arm/boot/dts/Makefile
++++ linux-3.14.18/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 \