Revert "ar71xx: prevent spurious ethernet resets from dma hang check false positives"
[openwrt/openwrt.git] / target / linux / oxnas / patches-4.4 / 300-introduce-oxnas-platform.patch
1 --- a/arch/arm/Kconfig
2 +++ b/arch/arm/Kconfig
3 @@ -602,6 +602,19 @@ config ARCH_LPC32XX
4 help
5 Support for the NXP LPC32XX family of processors
6
7 +config ARCH_OXNAS
8 + bool "Oxford Semiconductor 815/820/825 NAS SoC"
9 + select ARM_GIC
10 + select ARCH_REQUIRE_GPIOLIB
11 + select CLKDEV_LOOKUP
12 + select GENERIC_CLOCKEVENTS
13 + select COMMON_CLK
14 + select MIGHT_HAVE_PCI
15 + select ARCH_HAS_RESET_CONTROLLER
16 + help
17 + This enables support for Oxford 815/820/825 NAS SoC
18 + later renamed to PLXTECH NAS782x.
19 +
20 config ARCH_PXA
21 bool "PXA2xx/PXA3xx-based"
22 depends on MMU
23 @@ -882,6 +895,8 @@ source "arch/arm/mach-omap2/Kconfig"
24
25 source "arch/arm/mach-orion5x/Kconfig"
26
27 +source "arch/arm/mach-oxnas/Kconfig"
28 +
29 source "arch/arm/mach-picoxcell/Kconfig"
30
31 source "arch/arm/mach-pxa/Kconfig"
32 --- a/arch/arm/Makefile
33 +++ b/arch/arm/Makefile
34 @@ -200,6 +200,7 @@ machine-$(CONFIG_ARCH_NSPIRE) += nspire
35 machine-$(CONFIG_ARCH_OMAP1) += omap1
36 machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
37 machine-$(CONFIG_ARCH_ORION5X) += orion5x
38 +machine-$(CONFIG_ARCH_OXNAS) += oxnas
39 machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell
40 machine-$(CONFIG_ARCH_PXA) += pxa
41 machine-$(CONFIG_ARCH_QCOM) += qcom
42 --- a/arch/arm/boot/dts/Makefile
43 +++ b/arch/arm/boot/dts/Makefile
44 @@ -497,6 +497,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
45 orion5x-lswsgl.dtb \
46 orion5x-maxtor-shared-storage-2.dtb \
47 orion5x-rd88f5182-nas.dtb
48 +dtb-$(CONFIG_ARCH_OXNAS) += ox820-pogoplug-pro.dtb
49 dtb-$(CONFIG_ARCH_PRIMA2) += \
50 prima2-evb.dtb
51 dtb-$(CONFIG_ARCH_QCOM) += \
52 --- a/arch/arm/tools/mach-types
53 +++ b/arch/arm/tools/mach-types
54 @@ -228,6 +228,7 @@ edb9302a MACH_EDB9302A EDB9302A 1127
55 edb9307a MACH_EDB9307A EDB9307A 1128
56 omap_3430sdp MACH_OMAP_3430SDP OMAP_3430SDP 1138
57 vstms MACH_VSTMS VSTMS 1140
58 +ox820 MACH_OX820 OX820 1152
59 micro9m MACH_MICRO9M MICRO9M 1169
60 bug MACH_BUG BUG 1179
61 at91sam9263ek MACH_AT91SAM9263EK AT91SAM9263EK 1202
62 --- a/drivers/clk/Makefile
63 +++ b/drivers/clk/Makefile
64 @@ -32,6 +32,7 @@ obj-$(CONFIG_ARCH_MB86S7X) += clk-mb86s
65 obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o
66 obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
67 obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o
68 +obj-$(CONFIG_ARCH_OXNAS) += clk-oxnas.o
69 obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.o
70 obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.o
71 obj-$(CONFIG_COMMON_CLK_RK808) += clk-rk808.o