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