blob: b6e2efb8519391d77e0b9907ceb29afd4d5227a6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
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
|
