17ec83b63f8a55d1d0c9ddba801bb5a1c147b10e
[openwrt.git] / target / linux / oxnas / patches-3.18 / 300-introduce-oxnas-platform.patch
1 Index: linux-3.18-rc4/arch/arm/Kconfig
2 ===================================================================
3 --- linux-3.18-rc4.orig/arch/arm/Kconfig
4 +++ linux-3.18-rc4/arch/arm/Kconfig
5 @@ -369,6 +369,17 @@ config ARCH_VERSATILE
6         help
7           This enables support for ARM Ltd Versatile board.
8  
9 +config ARCH_OXNAS
10 +       bool "Oxford Semiconductor 815/820/825 NAS SoC"
11 +       select ARCH_REQUIRE_GPIOLIB
12 +       select CLKDEV_LOOKUP
13 +       select GENERIC_CLOCKEVENTS
14 +       select COMMON_CLK
15 +       select MIGHT_HAVE_PCI
16 +       select ARCH_HAS_RESET_CONTROLLER
17 +       help
18 +               This enables support for Oxsemi 815/820/825 NAS SoC
19 +
20  config ARCH_AT91
21         bool "Atmel AT91"
22         select ARCH_REQUIRE_GPIOLIB
23 @@ -922,6 +933,8 @@ source "arch/arm/mach-omap2/Kconfig"
24  
25  source "arch/arm/mach-orion5x/Kconfig"
26  
27 +source "arch/arm/mach-oxnas/Kconfig"
28 +
29  source "arch/arm/mach-picoxcell/Kconfig"
30  
31  source "arch/arm/mach-pxa/Kconfig"
32 Index: linux-3.18-rc4/arch/arm/Makefile
33 ===================================================================
34 --- linux-3.18-rc4.orig/arch/arm/Makefile
35 +++ linux-3.18-rc4/arch/arm/Makefile
36 @@ -187,6 +187,7 @@ machine-$(CONFIG_ARCH_NSPIRE)               += nspire
37  machine-$(CONFIG_ARCH_OMAP1)           += omap1
38  machine-$(CONFIG_ARCH_OMAP2PLUS)       += omap2
39  machine-$(CONFIG_ARCH_ORION5X)         += orion5x
40 +machine-$(CONFIG_ARCH_OXNAS)           += oxnas
41  machine-$(CONFIG_ARCH_PICOXCELL)       += picoxcell
42  machine-$(CONFIG_ARCH_PXA)             += pxa
43  machine-$(CONFIG_ARCH_QCOM)            += qcom
44 Index: linux-3.18-rc4/arch/arm/boot/dts/Makefile
45 ===================================================================
46 --- linux-3.18-rc4.orig/arch/arm/boot/dts/Makefile
47 +++ linux-3.18-rc4/arch/arm/boot/dts/Makefile
48 @@ -352,6 +352,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += orion5x-la
49         orion5x-lacie-ethernet-disk-mini-v2.dtb \
50         orion5x-maxtor-shared-storage-2.dtb \
51         orion5x-rd88f5182-nas.dtb
52 +dtb-$(CONFIG_ARCH_OXNAS) += ox820-pogoplug-pro.dtb
53  dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
54  dtb-$(CONFIG_ARCH_QCOM) += \
55         qcom-apq8064-cm-qs600.dtb \
56 Index: linux-3.18-rc4/arch/arm/tools/mach-types
57 ===================================================================
58 --- linux-3.18-rc4.orig/arch/arm/tools/mach-types
59 +++ linux-3.18-rc4/arch/arm/tools/mach-types
60 @@ -228,6 +228,7 @@ edb9302a            MACH_EDB9302A           EDB9302A                1127
61  edb9307a               MACH_EDB9307A           EDB9307A                1128
62  omap_3430sdp           MACH_OMAP_3430SDP       OMAP_3430SDP            1138
63  vstms                  MACH_VSTMS              VSTMS                   1140
64 +ox820                  MACH_OX820              OX820                   1152
65  micro9m                        MACH_MICRO9M            MICRO9M                 1169
66  bug                    MACH_BUG                BUG                     1179
67  at91sam9263ek          MACH_AT91SAM9263EK      AT91SAM9263EK           1202
68 Index: linux-3.18-rc4/drivers/clk/Makefile
69 ===================================================================
70 --- linux-3.18-rc4.orig/drivers/clk/Makefile
71 +++ linux-3.18-rc4/drivers/clk/Makefile
72 @@ -29,6 +29,7 @@ obj-$(CONFIG_COMMON_CLK_MAX77802)     += clk
73  obj-$(CONFIG_ARCH_MOXART)              += clk-moxart.o
74  obj-$(CONFIG_ARCH_NOMADIK)             += clk-nomadik.o
75  obj-$(CONFIG_ARCH_NSPIRE)              += clk-nspire.o
76 +obj-$(CONFIG_ARCH_OXNAS)               += clk-oxnas.o
77  obj-$(CONFIG_COMMON_CLK_PALMAS)                += clk-palmas.o
78  obj-$(CONFIG_CLK_PPC_CORENET)          += clk-ppc-corenet.o
79  obj-$(CONFIG_COMMON_CLK_RK808)         += clk-rk808.o