72 lines
2.3 KiB
Diff
72 lines
2.3 KiB
Diff
|
--- a/arch/arm/Kconfig
|
||
|
|
+++ b/arch/arm/Kconfig
|
||
|
|
@@ -602,6 +602,19 @@ config ARCH_LPC32XX
|
||
|
|
help
|
||
|
|
Support for the NXP LPC32XX family of processors
|
||
|
|
|
||
|
|
+config ARCH_OXNAS
|
||
|
|
+ bool "Oxford Semiconductor 815/820/825 NAS SoC"
|
||
|
|
+ select ARM_GIC
|
||
|
|
+ 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 Oxford 815/820/825 NAS SoC
|
||
|
|
+ later renamed to PLXTECH NAS782x.
|
||
|
|
+
|
||
|
|
config ARCH_PXA
|
||
|
|
bool "PXA2xx/PXA3xx-based"
|
||
|
|
depends on MMU
|
||
|
|
@@ -882,6 +895,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"
|
||
|
|
--- a/arch/arm/Makefile
|
||
|
|
+++ b/arch/arm/Makefile
|
||
|
|
@@ -200,6 +200,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_QCOM) += qcom
|
||
|
|
--- a/arch/arm/boot/dts/Makefile
|
||
|
|
+++ b/arch/arm/boot/dts/Makefile
|
||
|
|
@@ -497,6 +497,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
|
||
|
|
orion5x-lswsgl.dtb \
|
||
|
|
orion5x-maxtor-shared-storage-2.dtb \
|
||
|
|
orion5x-rd88f5182-nas.dtb
|
||
|
|
+dtb-$(CONFIG_ARCH_OXNAS) += ox820-pogoplug-pro.dtb
|
||
|
|
dtb-$(CONFIG_ARCH_PRIMA2) += \
|
||
|
|
prima2-evb.dtb
|
||
|
|
dtb-$(CONFIG_ARCH_QCOM) += \
|
||
|
|
--- a/arch/arm/tools/mach-types
|
||
|
|
+++ b/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
|
||
|
|
--- a/drivers/clk/Makefile
|
||
|
|
+++ b/drivers/clk/Makefile
|
||
|
|
@@ -32,6 +32,7 @@ obj-$(CONFIG_ARCH_MB86S7X) += clk-mb86s
|
||
|
|
obj-$(CONFIG_ARCH_MOXART) += clk-moxart.o
|
||
|
|
obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o
|
||
|
|
obj-$(CONFIG_ARCH_NSPIRE) += clk-nspire.o
|
||
|
|
+obj-$(CONFIG_ARCH_OXNAS) += clk-oxnas.o
|
||
|
|
obj-$(CONFIG_COMMON_CLK_PALMAS) += clk-palmas.o
|
||
|
|
obj-$(CONFIG_CLK_QORIQ) += clk-qoriq.o
|
||
|
|
obj-$(CONFIG_COMMON_CLK_RK808) += clk-rk808.o
|