core/linux-kirkwood to 3.18-2; revert upstream commits to (re)enable cpuidle,watchdog,leds

2025-01-17 23:34:07 +00:00 · 2014-12-12 03:43:59 +00:00 · 2014-12-12 03:43:59 +00:00 · 770005328a
commit 770005328a
parent e7d462f88c
4 changed files with 190 additions and 92 deletions
--- a/core/linux-kirkwood/PKGBUILD
+++ b/core/linux-kirkwood/PKGBUILD
@ -7,7 +7,7 @@ pkgbase=linux-kirkwood
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood"
 pkgver=3.18
-pkgrel=1
+pkgrel=2
 cryptodev_commit=6aa62a2c320b04f55fdfe0ed015c3d9b48997239
 bfqver=v7r6

@ -31,8 +31,8 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch")

 md5sums=('9e854df51ca3fef8bfe566dbd7b89241'
-         'befe42f1bb735b5f89aebe1de94ad75d'
-         '9a12cbd817569e4db4c1dbe72af6920c'
+         'adae431c969e3fcf32aa8c315c96e02a'
+         'fad0103ae663d6bacb922628f6d26fa7'
         'df25fccf87d246f97dac2843e22debe6'
         '9b5a265440abf57d2052838f31486a3a'
         '09d44b9f07abfaeaf4f688ee52034786'
--- a/core/linux-kirkwood/archlinuxarm.patch
+++ b/core/linux-kirkwood/archlinuxarm.patch
@ -1,7 +1,7 @@
 diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
--- a/arch/arm/Kconfig	2014-10-30 16:43:25.000000000 +0000
-+++ b/arch/arm/Kconfig	2014-11-04 02:59:55.513011483 +0000
-@@ -532,6 +532,21 @@
+--- a/arch/arm/Kconfig	2014-12-07 22:21:05.000000000 +0000
+++ b/arch/arm/Kconfig	2014-12-12 01:25:01.856852253 +0000
+@@ -536,6 +536,21 @@
 	help
 	  Support for the Marvell Dove SoC 88AP510
 
@ -23,7 +23,7 @@ diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
 config ARCH_MV78XX0
 	bool "Marvell MV78xx0"
 	select ARCH_REQUIRE_GPIOLIB
-@@ -886,6 +901,8 @@
+@@ -892,6 +907,8 @@
 
 source "arch/arm/mach-keystone/Kconfig"
 
@ -31,11 +31,11 @@ diff -ruN a/arch/arm/Kconfig b/arch/arm/Kconfig
 +
 source "arch/arm/mach-ks8695/Kconfig"
 
- source "arch/arm/mach-msm/Kconfig"
+ source "arch/arm/mach-meson/Kconfig"
 diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
--- a/arch/arm/Kconfig.debug	2014-10-30 16:43:25.000000000 +0000
-+++ b/arch/arm/Kconfig.debug	2014-11-04 03:02:07.125277513 +0000
-@@ -1054,7 +1054,7 @@
+--- a/arch/arm/Kconfig.debug	2014-12-07 22:21:05.000000000 +0000
+++ b/arch/arm/Kconfig.debug	2014-12-12 01:25:01.866852959 +0000
+@@ -1088,7 +1088,7 @@
 	def_bool ARCH_DOVE || ARCH_EBSA110 || \
 		(FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
 		ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
@ -43,9 +43,9 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
 +		ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \
 		ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
 
- config DEBUG_UART_PHYS
-@@ -1111,7 +1111,7 @@
- 	default 0xe0000000 if ARCH_SPEAR13XX
+ # Compatibility options for BCM63xx
+@@ -1154,7 +1154,7 @@
+ 	default 0xe4007000 if DEBUG_HIP04_UART
 	default 0xf0000be0 if ARCH_EBSA110
 	default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE
 -	default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \
@ -53,7 +53,7 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
 				ARCH_ORION5X
 	default 0xf7fc9000 if DEBUG_BERLIN_UART
 	default 0xf8b00000 if DEBUG_HIX5HD2_UART
-@@ -1179,6 +1179,7 @@
+@@ -1228,6 +1228,7 @@
 	default 0xfec90000 if DEBUG_RK32_UART2
 	default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
 	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
@ -62,19 +62,19 @@ diff -ruN a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
 	default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
 	default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
 diff -ruN a/arch/arm/Makefile b/arch/arm/Makefile
--- a/arch/arm/Makefile	2014-10-30 16:43:25.000000000 +0000
-+++ b/arch/arm/Makefile	2014-11-04 01:48:52.433556285 +0000
-@@ -166,6 +166,7 @@
+--- a/arch/arm/Makefile	2014-12-07 22:21:05.000000000 +0000
+++ b/arch/arm/Makefile	2014-12-12 01:25:01.871853311 +0000
+@@ -165,6 +165,7 @@
 machine-$(CONFIG_ARCH_IOP33X)		+= iop33x
 machine-$(CONFIG_ARCH_IXP4XX)		+= ixp4xx
 machine-$(CONFIG_ARCH_KEYSTONE)		+= keystone
 +machine-$(CONFIG_ARCH_KIRKWOOD)         += kirkwood
 machine-$(CONFIG_ARCH_KS8695)		+= ks8695
 machine-$(CONFIG_ARCH_LPC32XX)		+= lpc32xx
- machine-$(CONFIG_ARCH_MMP)		+= mmp
+ machine-$(CONFIG_ARCH_MESON)		+= meson
 diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 --- a/arch/arm/mach-kirkwood/Kconfig	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/Kconfig	2014-11-04 01:42:05.939715501 +0000
+++ b/arch/arm/mach-kirkwood/Kconfig	2014-12-12 01:25:01.878853805 +0000
@@ -0,0 +1,258 @@
 +if ARCH_KIRKWOOD
 +
@ -336,7 +336,7 @@ diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 +endif
 diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 --- a/arch/arm/mach-kirkwood/Makefile	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/Makefile	2014-11-04 01:42:05.945715927 +0000
+++ b/arch/arm/mach-kirkwood/Makefile	2014-12-12 01:25:01.881854016 +0000
@@ -0,0 +1,35 @@
 +obj-$(CONFIG_KIRKWOOD_LEGACY)	+= irq.o mpp.o common.o pcie.o
 +obj-$(CONFIG_PM)		+= pm.o
@ -375,14 +375,14 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 +obj-$(CONFIG_ARCH_KIRKWOOD_DT)		+= board-dt.o
 diff -ruN a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot
 --- a/arch/arm/mach-kirkwood/Makefile.boot	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/Makefile.boot	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/Makefile.boot	2014-12-12 01:25:01.882854087 +0000
@@ -0,0 +1,3 @@
 +   zreladdr-y	+= 0x00008000
 +params_phys-y	:= 0x00000100
 +initrd_phys-y	:= 0x00800000
 diff -ruN a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
 --- a/arch/arm/mach-kirkwood/board-dt.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/board-dt.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/board-dt.c	2014-12-12 01:25:01.888854510 +0000
@@ -0,0 +1,223 @@
 +/*
 + * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
@ -609,7 +609,7 @@ diff -ruN a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3-gpio.c
 --- a/arch/arm/mach-kirkwood/bubba3-gpio.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c	2014-11-04 01:42:05.915713796 +0000
+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c	2014-12-12 01:25:01.891854722 +0000
@@ -0,0 +1,392 @@
 +/*
 + * Excito BUBBA|3 led driver.
@ -1005,7 +1005,7 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-gpio.c b/arch/arm/mach-kirkwood/bubba3
 +module_exit(bubba3_cleanup);
 diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba3-setup.c
 --- a/arch/arm/mach-kirkwood/bubba3-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/bubba3-setup.c	2014-11-04 01:42:05.920714151 +0000
+++ b/arch/arm/mach-kirkwood/bubba3-setup.c	2014-12-12 01:25:01.894854933 +0000
@@ -0,0 +1,234 @@
 +/*
 + * arch/arm/mach-kirkwood/bubba3-setup.c
@ -1243,7 +1243,7 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
 --- a/arch/arm/mach-kirkwood/common.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/common.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/common.c	2014-12-12 01:25:01.902855497 +0000
@@ -0,0 +1,746 @@
 +/*
 + * arch/arm/mach-kirkwood/common.c
@ -1993,7 +1993,7 @@ diff -ruN a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
 --- a/arch/arm/mach-kirkwood/common.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/common.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/common.h	2014-12-12 01:25:01.903855568 +0000
@@ -0,0 +1,74 @@
 +/*
 + * arch/arm/mach-kirkwood/common.h
@ -2071,7 +2071,7 @@ diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c
 --- a/arch/arm/mach-kirkwood/d2net_v2-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c	2014-12-12 01:25:01.906855779 +0000
@@ -0,0 +1,231 @@
 +/*
 + * arch/arm/mach-kirkwood/d2net_v2-setup.c
@ -2306,7 +2306,7 @@ diff -ruN a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2n
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
 --- a/arch/arm/mach-kirkwood/dockstar-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2014-11-04 01:42:05.923714365 +0000
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2014-12-12 01:25:01.908855920 +0000
@@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/dockstar-setup.c
@ -2425,7 +2425,7 @@ diff -ruN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
 --- a/arch/arm/mach-kirkwood/goflexhome-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2014-11-04 01:42:05.927714649 +0000
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2014-12-12 01:25:01.909855991 +0000
@@ -0,0 +1,124 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexhome-setup.c
@ -2553,7 +2553,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
 +
 diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
 --- a/arch/arm/mach-kirkwood/goflexnet-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2014-11-04 01:42:05.929714791 +0000
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2014-12-12 01:25:01.911856132 +0000
@@ -0,0 +1,177 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -2734,7 +2734,7 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
 +
 diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
 --- a/arch/arm/mach-kirkwood/guruplug-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2014-11-04 01:42:05.932715004 +0000
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2014-12-12 01:25:01.913856273 +0000
@@ -0,0 +1,228 @@
 +/*
 + * arch/arm/mach-kirkwood/guruplug-setup.c
@ -2966,7 +2966,7 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/iconnect-setup.c
 --- a/arch/arm/mach-kirkwood/iconnect-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2014-11-04 01:42:05.934715146 +0000
+++ b/arch/arm/mach-kirkwood/iconnect-setup.c	2014-12-12 01:25:01.915856414 +0000
@@ -0,0 +1,204 @@
 +/*
 + * arch/arm/mach-kirkwood/iconnect-setup.c
@ -3174,7 +3174,7 @@ diff -ruN a/arch/arm/mach-kirkwood/iconnect-setup.c b/arch/arm/mach-kirkwood/ico
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h
 --- a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/bridge-regs.h	2014-12-12 01:25:01.916856484 +0000
@@ -0,0 +1,86 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/bridge-regs.h
@ -3264,7 +3264,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/bridge-regs.h b/arch/arm/mach-ki
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-kirkwood/include/mach/entry-macro.S
 --- a/arch/arm/mach-kirkwood/include/mach/entry-macro.S	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/entry-macro.S	2014-12-12 01:25:01.917856555 +0000
@@ -0,0 +1,34 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/entry-macro.S
@ -3302,7 +3302,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/entry-macro.S b/arch/arm/mach-ki
 +	.endm
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkwood/include/mach/hardware.h
 --- a/arch/arm/mach-kirkwood/include/mach/hardware.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/hardware.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/hardware.h	2014-12-12 01:25:01.918856625 +0000
@@ -0,0 +1,14 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/hardware.h
@ -3320,7 +3320,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/hardware.h b/arch/arm/mach-kirkw
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/include/mach/irqs.h
 --- a/arch/arm/mach-kirkwood/include/mach/irqs.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/irqs.h	2014-12-12 01:25:01.919856696 +0000
@@ -0,0 +1,65 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/irqs.h
@ -3389,7 +3389,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/irqs.h b/arch/arm/mach-kirkwood/
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkwood/include/mach/kirkwood.h
 --- a/arch/arm/mach-kirkwood/include/mach/kirkwood.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2014-12-12 01:25:01.921856837 +0000
@@ -0,0 +1,142 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/kirkwood.h
@ -3535,7 +3535,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/kirkwood.h b/arch/arm/mach-kirkw
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/include/mach/uncompress.h b/arch/arm/mach-kirkwood/include/mach/uncompress.h
 --- a/arch/arm/mach-kirkwood/include/mach/uncompress.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/include/mach/uncompress.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/include/mach/uncompress.h	2014-12-12 01:25:01.921856837 +0000
@@ -0,0 +1,46 @@
 +/*
 + * arch/arm/mach-kirkwood/include/mach/uncompress.h
@ -3585,7 +3585,7 @@ diff -ruN a/arch/arm/mach-kirkwood/include/mach/uncompress.h b/arch/arm/mach-kir
 +#define arch_decomp_setup()
 diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c
 --- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2014-11-04 01:42:05.936715288 +0000
+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c	2014-12-12 01:25:01.923856978 +0000
@@ -0,0 +1,137 @@
 +/*
 + * arch/arm/mach-kirkwood/ionics-stratus-setup.c
@ -3726,7 +3726,7 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
 --- a/arch/arm/mach-kirkwood/irq.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/irq.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/irq.c	2014-12-12 01:25:01.924857049 +0000
@@ -0,0 +1,82 @@
 +/*
 + * arch/arm/mach-kirkwood/irq.c
@ -3812,7 +3812,7 @@ diff -ruN a/arch/arm/mach-kirkwood/irq.c b/arch/arm/mach-kirkwood/irq.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/lacie_v2-common.c
 --- a/arch/arm/mach-kirkwood/lacie_v2-common.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.c	2014-12-12 01:25:01.925857119 +0000
@@ -0,0 +1,114 @@
 +/*
 + * arch/arm/mach-kirkwood/lacie_v2-common.c
@ -3930,7 +3930,7 @@ diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.c b/arch/arm/mach-kirkwood/la
 +}
 diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.h b/arch/arm/mach-kirkwood/lacie_v2-common.h
 --- a/arch/arm/mach-kirkwood/lacie_v2-common.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/lacie_v2-common.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/lacie_v2-common.h	2014-12-12 01:25:01.926857190 +0000
@@ -0,0 +1,16 @@
 +/*
 + * arch/arm/mach-kirkwood/lacie_v2-common.h
@ -3950,7 +3950,7 @@ diff -ruN a/arch/arm/mach-kirkwood/lacie_v2-common.h b/arch/arm/mach-kirkwood/la
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
 --- a/arch/arm/mach-kirkwood/mpp.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/mpp.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/mpp.c	2014-12-12 01:25:01.927857260 +0000
@@ -0,0 +1,43 @@
 +/*
 + * arch/arm/mach-kirkwood/mpp.c
@ -3997,7 +3997,7 @@ diff -ruN a/arch/arm/mach-kirkwood/mpp.c b/arch/arm/mach-kirkwood/mpp.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
 --- a/arch/arm/mach-kirkwood/mpp.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/mpp.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/mpp.h	2014-12-12 01:25:01.932857613 +0000
@@ -0,0 +1,348 @@
 +/*
 + * linux/arch/arm/mach-kirkwood/mpp.h -- Multi Purpose Pins
@ -4349,7 +4349,7 @@ diff -ruN a/arch/arm/mach-kirkwood/mpp.h b/arch/arm/mach-kirkwood/mpp.h
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
 --- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c	2014-11-04 01:42:05.948716140 +0000
+++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c	2014-12-12 01:25:01.934857754 +0000
@@ -0,0 +1,172 @@
 +/*
 + * arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
@ -4525,7 +4525,7 @@ diff -ruN a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkw
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6210-setup.c
 --- a/arch/arm/mach-kirkwood/nas6210-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2014-11-04 01:42:05.950716282 +0000
+++ b/arch/arm/mach-kirkwood/nas6210-setup.c	2014-12-12 01:25:01.935857824 +0000
@@ -0,0 +1,186 @@
 +/*
 + * arch/arm/mach-kirkwood/nas6210-setup.c
@ -4715,7 +4715,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c
 --- a/arch/arm/mach-kirkwood/netspace_v2-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c	2014-11-04 01:42:05.954716567 +0000
+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c	2014-12-12 01:25:01.938858036 +0000
@@ -0,0 +1,293 @@
 +/*
 + * arch/arm/mach-kirkwood/netspace_v2-setup.c
@ -5012,7 +5012,7 @@ diff -ruN a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
 --- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c	2014-12-12 01:25:01.942858318 +0000
@@ -0,0 +1,422 @@
 +/*
 + * arch/arm/mach-kirkwood/netxbig_v2-setup.c
@ -5438,7 +5438,7 @@ diff -ruN a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/n
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa310-setup.c
 --- a/arch/arm/mach-kirkwood/nsa310-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2014-11-04 01:42:05.957716780 +0000
+++ b/arch/arm/mach-kirkwood/nsa310-setup.c	2014-12-12 01:25:01.945858529 +0000
@@ -0,0 +1,359 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa310-setup.c
@ -5801,7 +5801,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa310-setup.c b/arch/arm/mach-kirkwood/nsa31
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa320-setup.c
 --- a/arch/arm/mach-kirkwood/nsa320-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2014-11-04 01:42:05.961717064 +0000
+++ b/arch/arm/mach-kirkwood/nsa320-setup.c	2014-12-12 01:25:01.947858670 +0000
@@ -0,0 +1,305 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa320-setup.c
@ -6110,7 +6110,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa325-setup.c
 --- a/arch/arm/mach-kirkwood/nsa325-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/nsa325-setup.c	2014-11-04 01:42:05.965717348 +0000
+++ b/arch/arm/mach-kirkwood/nsa325-setup.c	2014-12-12 01:25:01.951858953 +0000
@@ -0,0 +1,359 @@
 +/*
 + * arch/arm/mach-kirkwood/nsa325-setup.c
@ -6473,7 +6473,7 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa32
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
 --- a/arch/arm/mach-kirkwood/openrd-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/openrd-setup.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/openrd-setup.c	2014-12-12 01:25:01.953859094 +0000
@@ -0,0 +1,255 @@
 +/*
 + * arch/arm/mach-kirkwood/openrd-setup.c
@ -6732,7 +6732,7 @@ diff -ruN a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openr
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
 --- a/arch/arm/mach-kirkwood/pcie.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pcie.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/pcie.c	2014-12-12 01:25:01.956859305 +0000
@@ -0,0 +1,296 @@
 +/*
 + * arch/arm/mach-kirkwood/pcie.c
@ -7032,7 +7032,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c
 --- a/arch/arm/mach-kirkwood/pm.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pm.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/pm.c	2014-12-12 01:25:01.957859376 +0000
@@ -0,0 +1,76 @@
 +/*
 + * Power Management driver for Marvell Kirkwood SoCs
@ -7112,7 +7112,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pm.c b/arch/arm/mach-kirkwood/pm.c
 +}
 diff -ruN a/arch/arm/mach-kirkwood/pm.h b/arch/arm/mach-kirkwood/pm.h
 --- a/arch/arm/mach-kirkwood/pm.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pm.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/pm.h	2014-12-12 01:25:01.957859376 +0000
@@ -0,0 +1,26 @@
 +/*
 + * Power Management driver for Marvell Kirkwood SoCs
@ -7142,7 +7142,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pm.h b/arch/arm/mach-kirkwood/pm.h
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pogo_e02-setup.c
 --- a/arch/arm/mach-kirkwood/pogo_e02-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2014-11-04 01:42:05.967717490 +0000
+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c	2014-12-12 01:25:01.959859517 +0000
@@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/pogo_e02-setup.c
@ -7261,7 +7261,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogo_e02-setup.c b/arch/arm/mach-kirkwood/pog
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/pogoplugv4-setup.c
 --- a/arch/arm/mach-kirkwood/pogoplugv4-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2014-11-04 01:42:05.969717632 +0000
+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c	2014-12-12 01:25:01.960859587 +0000
@@ -0,0 +1,195 @@
 +/*
 + * arch/arm/mach-kirkwood/pogoplugv4-setup.c
@ -7460,7 +7460,7 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
 --- a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c	2014-12-12 01:25:01.962859728 +0000
@@ -0,0 +1,89 @@
 +/*
 + * arch/arm/mach-kirkwood/rd88f6192-nas-setup.c
@ -7553,7 +7553,7 @@ diff -ruN a/arch/arm/mach-kirkwood/rd88f6192-nas-setup.c b/arch/arm/mach-kirkwoo
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c	2014-12-12 01:25:01.963859799 +0000
@@ -0,0 +1,128 @@
 +/*
 + * arch/arm/mach-kirkwood/rd88f6281-setup.c
@ -7685,7 +7685,7 @@ diff -ruN a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2014-11-04 01:42:05.970717703 +0000
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2014-12-12 01:25:01.965859940 +0000
@@ -0,0 +1,170 @@
 +/*
 + * arch/arm/mach-kirkwood/sheevaplug-setup.c
@ -7859,7 +7859,7 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
 +#endif
 diff -ruN a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-setup.c
 --- a/arch/arm/mach-kirkwood/t5325-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/t5325-setup.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/t5325-setup.c	2014-12-12 01:25:01.967860081 +0000
@@ -0,0 +1,216 @@
 +/*
 + *
@ -8079,7 +8079,7 @@ diff -ruN a/arch/arm/mach-kirkwood/t5325-setup.c b/arch/arm/mach-kirkwood/t5325-
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topkick-setup.c
 --- a/arch/arm/mach-kirkwood/topkick-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2014-11-04 01:42:05.972717845 +0000
+++ b/arch/arm/mach-kirkwood/topkick-setup.c	2014-12-12 01:25:01.968860151 +0000
@@ -0,0 +1,165 @@
 +/*
 + * arch/arm/mach-kirkwood/topkick-setup.c
@ -8248,7 +8248,7 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c
 --- a/arch/arm/mach-kirkwood/ts219-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/ts219-setup.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/ts219-setup.c	2014-12-12 01:25:01.970860292 +0000
@@ -0,0 +1,142 @@
 +/*
 + *
@ -8394,7 +8394,7 @@ diff -ruN a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-setup.c
 --- a/arch/arm/mach-kirkwood/ts41x-setup.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/ts41x-setup.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c	2014-12-12 01:25:01.972860433 +0000
@@ -0,0 +1,186 @@
 +/*
 + *
@ -8584,7 +8584,7 @@ diff -ruN a/arch/arm/mach-kirkwood/ts41x-setup.c b/arch/arm/mach-kirkwood/ts41x-
 +MACHINE_END
 diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x-common.c
 --- a/arch/arm/mach-kirkwood/tsx1x-common.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/tsx1x-common.c	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/tsx1x-common.c	2014-12-12 01:25:01.973860504 +0000
@@ -0,0 +1,113 @@
 +#include <linux/kernel.h>
 +#include <linux/pci.h>
@ -8701,7 +8701,7 @@ diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.c b/arch/arm/mach-kirkwood/tsx1x
 +
 diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x-common.h
 --- a/arch/arm/mach-kirkwood/tsx1x-common.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/arch/arm/mach-kirkwood/tsx1x-common.h	2014-10-30 16:41:01.000000000 +0000
+++ b/arch/arm/mach-kirkwood/tsx1x-common.h	2014-12-12 01:25:01.973860504 +0000
@@ -0,0 +1,7 @@
 +#ifndef __ARCH_KIRKWOOD_TSX1X_COMMON_H
 +#define __ARCH_KIRKWOOD_TSX1X_COMMON_H
@ -8711,9 +8711,9 @@ diff -ruN a/arch/arm/mach-kirkwood/tsx1x-common.h b/arch/arm/mach-kirkwood/tsx1x
 +
 +#endif
 diff -ruN a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
--- a/arch/arm/mm/Kconfig	2014-10-30 16:43:25.000000000 +0000
-+++ b/arch/arm/mm/Kconfig	2014-11-04 03:03:51.859647980 +0000
-@@ -854,7 +854,7 @@
+--- a/arch/arm/mm/Kconfig	2014-12-07 22:21:05.000000000 +0000
+++ b/arch/arm/mm/Kconfig	2014-12-12 01:25:01.997862196 +0000
+@@ -855,7 +855,7 @@
 
 config CACHE_FEROCEON_L2
 	bool "Enable the Feroceon L2 cache controller"
@ -8722,9 +8722,21 @@ diff -ruN a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
 	default y
 	select OUTER_CACHE
 	help
+diff -ruN a/drivers/ata/Kconfig b/drivers/ata/Kconfig
+--- a/drivers/ata/Kconfig	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/ata/Kconfig	2014-12-12 01:29:52.153324472 +0000
+@@ -299,7 +299,7 @@
+ 
+ config SATA_MV
+ 	tristate "Marvell SATA support"
+-	depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
+	depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+ 		   ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
+ 	select GENERIC_PHY
+ 	help
 diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
--- a/drivers/ata/sata_mv.c	2014-10-30 16:43:25.000000000 +0000
-+++ b/drivers/ata/sata_mv.c	2014-11-04 01:44:25.677636594 +0000
+--- a/drivers/ata/sata_mv.c	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/ata/sata_mv.c	2014-12-12 01:25:02.011863184 +0000
@@ -72,6 +72,7 @@
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
@ -8742,10 +8754,34 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
 	if (pp->pp_flags & MV_PP_FLAG_EDMA_EN) {
 		int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0);
 		if (want_ncq != using_ncq)
+diff -ruN a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
+--- a/drivers/cpufreq/Kconfig.arm	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/cpufreq/Kconfig.arm	2014-12-12 01:26:17.539188086 +0000
+@@ -119,7 +119,7 @@
+ 	  If in doubt, say Y.
+ 
+ config ARM_KIRKWOOD_CPUFREQ
+-	def_bool MACH_KIRKWOOD
+	def_bool ARCH_KIRKWOOD || MACH_KIRKWOOD
+ 	help
+ 	  This adds the CPUFreq driver for Marvell Kirkwood
+ 	  SoCs.
+diff -ruN a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
+--- a/drivers/cpuidle/Kconfig.arm	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/cpuidle/Kconfig.arm	2014-12-12 01:30:21.105354272 +0000
+@@ -29,7 +29,7 @@
+ 
+ config ARM_KIRKWOOD_CPUIDLE
+ 	bool "CPU Idle Driver for Marvell Kirkwood SoCs"
+-	depends on MACH_KIRKWOOD
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+ 	help
+ 	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.
+ 
 diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
--- a/drivers/hwmon/Kconfig	2014-10-30 16:43:25.000000000 +0000
-+++ b/drivers/hwmon/Kconfig	2014-11-04 01:44:25.681636878 +0000
-@@ -1669,6 +1669,19 @@
+--- a/drivers/hwmon/Kconfig	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/hwmon/Kconfig	2014-12-12 01:25:02.017863607 +0000
+@@ -1680,6 +1680,19 @@
 	  This driver provides support for the Ultra45 workstation environmental
 	  sensors.
 
@ -8766,19 +8802,19 @@ diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
 
 comment "ACPI drivers"
 diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
--- a/drivers/hwmon/Makefile	2014-10-30 16:43:25.000000000 +0000
-+++ b/drivers/hwmon/Makefile	2014-11-04 01:44:25.682636949 +0000
+--- a/drivers/hwmon/Makefile	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/hwmon/Makefile	2014-12-12 01:25:02.019863748 +0000
@@ -114,6 +114,7 @@
 obj-$(CONFIG_SENSORS_MAX6650)	+= max6650.o
 obj-$(CONFIG_SENSORS_MAX6697)	+= max6697.o
 obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o
 +obj-$(CONFIG_SENSORS_NSA3XX)	+= nsa3xx-hwmon.o
 obj-$(CONFIG_SENSORS_MCP3021)	+= mcp3021.o
+ obj-$(CONFIG_SENSORS_MENF21BMC_HWMON) += menf21bmc_hwmon.o
 obj-$(CONFIG_SENSORS_NCT6683)	+= nct6683.o
- obj-$(CONFIG_SENSORS_NCT6775)	+= nct6775.o
 diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 --- a/drivers/hwmon/nsa3xx-hwmon.c	1970-01-01 00:00:00.000000000 +0000
-+++ b/drivers/hwmon/nsa3xx-hwmon.c	2014-11-04 01:44:25.685637162 +0000
+++ b/drivers/hwmon/nsa3xx-hwmon.c	2014-12-12 01:25:02.021863889 +0000
@@ -0,0 +1,251 @@
 +/*
 + * drivers/hwmon/nsa3xx-hwmon.c
@ -9031,9 +9067,30 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c
 +MODULE_DESCRIPTION("NSA3XX Hardware Monitoring");
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("platform:nsa3xx-hwmon");
+diff -ruN a/drivers/leds/Kconfig b/drivers/leds/Kconfig
+--- a/drivers/leds/Kconfig	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/leds/Kconfig	2014-12-12 01:28:09.555087399 +0000
+@@ -410,7 +410,7 @@
+ config LEDS_NS2
+ 	tristate "LED support for Network Space v2 GPIO LEDs"
+ 	depends on LEDS_CLASS
+-	depends on MACH_KIRKWOOD
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+ 	default y
+ 	help
+ 	  This option enable support for the dual-GPIO LED found on the
+@@ -420,7 +420,7 @@
+ config LEDS_NETXBIG
+ 	tristate "LED support for Big Network series LEDs"
+ 	depends on LEDS_CLASS
+-	depends on MACH_KIRKWOOD
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+ 	default y
+ 	help
+ 	  This option enable support for LEDs found on the LaCie 2Big
 diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
--- a/drivers/leds/trigger/Kconfig	2014-10-30 16:43:25.000000000 +0000
-+++ b/drivers/leds/trigger/Kconfig	2014-11-04 01:44:25.686637233 +0000
+--- a/drivers/leds/trigger/Kconfig	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/leds/trigger/Kconfig	2014-12-12 01:25:02.022863959 +0000
@@ -35,7 +35,6 @@
 
 config LEDS_TRIGGER_IDE_DISK
@ -9043,8 +9100,8 @@ diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
 	help
 	  This allows LEDs to be controlled by IDE disk activity.
 diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/core.c	2014-10-30 16:43:25.000000000 +0000
-+++ b/drivers/mmc/core/core.c	2014-11-04 01:44:25.690637516 +0000
+--- a/drivers/mmc/core/core.c	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/mmc/core/core.c	2014-12-12 01:25:02.026864241 +0000
@@ -791,7 +791,7 @@
 			 */
 			limit_us = 3000000;
@ -9055,8 +9112,8 @@ diff -ruN a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
 		/*
 		 * SDHC cards always use these fixed values.
 diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
--- a/drivers/mmc/core/sd.c	2014-10-30 16:43:25.000000000 +0000
-+++ b/drivers/mmc/core/sd.c	2014-11-04 01:44:25.692637658 +0000
+--- a/drivers/mmc/core/sd.c	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/mmc/core/sd.c	2014-12-12 01:25:02.028864382 +0000
@@ -366,6 +366,15 @@
 		return -ENOMEM;
 	}
@ -9074,8 +9131,8 @@ diff -ruN a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
 	if (err)
 		goto out;
 diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
--- a/drivers/mmc/host/mvsdio.c	2014-10-30 16:43:25.000000000 +0000
-+++ b/drivers/mmc/host/mvsdio.c	2014-11-04 01:44:25.694637800 +0000
+--- a/drivers/mmc/host/mvsdio.c	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/mmc/host/mvsdio.c	2014-12-12 01:25:02.030864523 +0000
@@ -25,6 +25,7 @@
 #include <linux/of_irq.h>
 #include <linux/mmc/host.h>
@ -9092,9 +9149,45 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
 
 	cmdreg = MVSD_CMD_INDEX(cmd->opcode);
 
+diff -ruN a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
+--- a/drivers/rtc/Kconfig	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/rtc/Kconfig	2014-12-12 01:27:40.764054174 +0000
+@@ -1235,7 +1235,7 @@
+ 
+ config RTC_DRV_MV
+ 	tristate "Marvell SoC RTC"
+-	depends on ARCH_DOVE || ARCH_MVEBU
+	depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
+ 	help
+ 	  If you say yes here you will get support for the in-chip RTC
+ 	  that can be found in some of Marvell's SoC devices, such as
+diff -ruN a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
+--- a/drivers/thermal/Kconfig	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/thermal/Kconfig	2014-12-12 01:29:06.189080397 +0000
+@@ -153,7 +153,7 @@
+ 
+ config KIRKWOOD_THERMAL
+ 	tristate "Temperature sensor on Marvell Kirkwood SoCs"
+-	depends on MACH_KIRKWOOD
+	depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+ 	depends on OF
+ 	help
+ 	  Support for the Kirkwood thermal sensor driver into the Linux thermal
+diff -ruN a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
+--- a/drivers/watchdog/Kconfig	2014-12-07 22:21:05.000000000 +0000
+++ b/drivers/watchdog/Kconfig	2014-12-12 01:27:08.170761622 +0000
+@@ -329,7 +329,7 @@
+ 
+ config ORION_WATCHDOG
+ 	tristate "Orion watchdog"
+-	depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
+	depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
+ 	select WATCHDOG_CORE
+ 	help
+ 	  Say Y here if to include support for the watchdog timer
 diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
 --- a/include/linux/bubba3.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/include/linux/bubba3.h	2014-11-04 01:44:25.695637871 +0000
+++ b/include/linux/bubba3.h	2014-12-12 01:25:02.031864594 +0000
@@ -0,0 +1,41 @@
 +/*
 + * (C) Copyright 2010
@ -9139,7 +9232,7 @@ diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h
 +#endif
 diff -ruN a/include/linux/nsa3xx-hwmon.h b/include/linux/nsa3xx-hwmon.h
 --- a/include/linux/nsa3xx-hwmon.h	1970-01-01 00:00:00.000000000 +0000
-+++ b/include/linux/nsa3xx-hwmon.h	2014-11-04 01:44:25.696637942 +0000
+++ b/include/linux/nsa3xx-hwmon.h	2014-12-12 01:25:02.032864664 +0000
@@ -0,0 +1,21 @@
 +/*
 + * include/linux/nsa3xx.hwmon.h
--- a/core/linux-kirkwood/config
+++ b/core/linux-kirkwood/config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.0-1 Kernel Configuration
+# Linux/arm 3.18.0-2 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -518,7 +518,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 #
 # ARM CPU frequency scaling drivers
 #
-# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
+CONFIG_ARM_KIRKWOOD_CPUFREQ=y

 #
 # CPU Idle
@ -530,6 +530,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
 #
 # ARM CPU Idle Drivers
 #
+CONFIG_ARM_KIRKWOOD_CPUIDLE=y
 # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set

 #
@ -2739,6 +2740,7 @@ CONFIG_SOFT_WATCHDOG=m
 # CONFIG_XILINX_WATCHDOG is not set
 # CONFIG_CADENCE_WATCHDOG is not set
 # CONFIG_DW_WATCHDOG is not set
+CONFIG_ORION_WATCHDOG=y
 # CONFIG_MAX63XX_WATCHDOG is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_I6300ESB_WDT is not set
@ -3996,6 +3998,8 @@ CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
+CONFIG_LEDS_NS2=y
+CONFIG_LEDS_NETXBIG=y
 # CONFIG_LEDS_TCA6507 is not set
 # CONFIG_LEDS_LM355x is not set

@ -4106,6 +4110,7 @@ CONFIG_RTC_DRV_S35390A=y
 #
 # on-CPU RTC drivers
 #
+CONFIG_RTC_DRV_MV=y
 # CONFIG_RTC_DRV_XGENE is not set

 #
--- a/core/linux-kirkwood/linux-kirkwood.install
+++ b/core/linux-kirkwood/linux-kirkwood.install
@ -2,7 +2,7 @@
 # arg 2:  the old package version

 KERNEL_NAME=-kirkwood
-KERNEL_VERSION=3.18.0-1-ARCH
+KERNEL_VERSION=3.18.0-2-ARCH

 post_install () {
  # updating module dependencies