kernel: refresh patches
[openwrt.git] / target / linux / oxnas / patches-3.14 / 300-introduce-oxnas-platform.patch
1 --- a/arch/arm/Kconfig
2 +++ b/arch/arm/Kconfig
3 @@ -367,6 +367,17 @@ config ARCH_VERSATILE
4         help
5           This enables support for ARM Ltd Versatile board.
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 Oxsemi 815/820/825 NAS SoC
17 +
18  config ARCH_AT91
19         bool "Atmel AT91"
20         select ARCH_REQUIRE_GPIOLIB
21 @@ -999,6 +1010,8 @@ source "arch/arm/mach-omap2/Kconfig"
22  
23  source "arch/arm/mach-orion5x/Kconfig"
24  
25 +source "arch/arm/mach-oxnas/Kconfig"
26 +
27  source "arch/arm/mach-picoxcell/Kconfig"
28  
29  source "arch/arm/mach-pxa/Kconfig"
30 --- a/arch/arm/Makefile
31 +++ b/arch/arm/Makefile
32 @@ -183,6 +183,7 @@ machine-$(CONFIG_ARCH_NSPIRE)               += nspire
33  machine-$(CONFIG_ARCH_OMAP1)           += omap1
34  machine-$(CONFIG_ARCH_OMAP2PLUS)       += omap2
35  machine-$(CONFIG_ARCH_ORION5X)         += orion5x
36 +machine-$(CONFIG_ARCH_OXNAS)           += oxnas
37  machine-$(CONFIG_ARCH_PICOXCELL)       += picoxcell
38  machine-$(CONFIG_ARCH_PXA)             += pxa
39  machine-$(CONFIG_ARCH_REALVIEW)                += realview
40 --- a/arch/arm/boot/dts/Makefile
41 +++ b/arch/arm/boot/dts/Makefile
42 @@ -233,6 +233,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420
43         am43x-epos-evm.dtb \
44         dra7-evm.dtb
45  dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
46 +dtb-$(CONFIG_ARCH_OXNAS) += ox820-pogoplug-pro.dtb
47  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
48  dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
49         ste-hrefprev60-stuib.dtb \
50 --- a/arch/arm/tools/mach-types
51 +++ b/arch/arm/tools/mach-types
52 @@ -228,6 +228,7 @@ edb9302a            MACH_EDB9302A           EDB9302A                1127
53  edb9307a               MACH_EDB9307A           EDB9307A                1128
54  omap_3430sdp           MACH_OMAP_3430SDP       OMAP_3430SDP            1138
55  vstms                  MACH_VSTMS              VSTMS                   1140
56 +ox820                  MACH_OX820              OX820                   1152
57  micro9m                        MACH_MICRO9M            MICRO9M                 1169
58  bug                    MACH_BUG                BUG                     1179
59  at91sam9263ek          MACH_AT91SAM9263EK      AT91SAM9263EK           1202
60 --- a/drivers/clk/Makefile
61 +++ b/drivers/clk/Makefile
62 @@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_LOONGSON1)          += clk-ls1
63  obj-$(CONFIG_COMMON_CLK_MAX77686)      += clk-max77686.o
64  obj-$(CONFIG_ARCH_NOMADIK)             += clk-nomadik.o
65  obj-$(CONFIG_ARCH_NSPIRE)              += clk-nspire.o
66 +obj-$(CONFIG_ARCH_OXNAS)               += clk-oxnas.o
67  obj-$(CONFIG_CLK_PPC_CORENET)          += clk-ppc-corenet.o
68  obj-$(CONFIG_COMMON_CLK_S2MPS11)       += clk-s2mps11.o
69  obj-$(CONFIG_COMMON_CLK_SI5351)                += clk-si5351.o