2014-12-08 12:04:25 +00:00
|
|
|
--- a/arch/arm/Kconfig
|
|
|
|
|
+++ b/arch/arm/Kconfig
|
2014-12-05 00:20:41 +00:00
|
|
|
@@ -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"
|
2014-12-08 12:04:25 +00:00
|
|
|
--- a/arch/arm/Makefile
|
|
|
|
|
+++ b/arch/arm/Makefile
|
2014-12-05 00:20:41 +00:00
|
|
|
@@ -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
|
2014-12-08 12:04:25 +00:00
|
|
|
--- a/arch/arm/boot/dts/Makefile
|
|
|
|
|
+++ b/arch/arm/boot/dts/Makefile
|
2014-12-05 00:20:41 +00:00
|
|
|
@@ -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 \
|
2014-12-08 12:04:25 +00:00
|
|
|
--- a/arch/arm/tools/mach-types
|
|
|
|
|
+++ b/arch/arm/tools/mach-types
|
2014-12-05 00:20:41 +00:00
|
|
|
@@ -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
|
2014-12-08 12:04:25 +00:00
|
|
|
--- a/drivers/clk/Makefile
|
|
|
|
|
+++ b/drivers/clk/Makefile
|
2014-12-05 00:20:41 +00:00
|
|
|
@@ -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
|
