From d411d1e539721c4f743e0dd5ee63f38e545f508f Mon Sep 17 00:00:00 2001 From: moonman Date: Mon, 11 Nov 2013 22:55:23 -0700 Subject: [PATCH] core/linux-kirkwood to 3.12 --- core/linux-kirkwood/PKGBUILD | 18 +- core/linux-kirkwood/archlinuxarm.patch | 1422 +++++++++++++++----- core/linux-kirkwood/config | 201 +-- core/linux-kirkwood/linux-kirkwood.install | 2 +- 4 files changed, 1190 insertions(+), 453 deletions(-) diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD index 7de870e60..60e2faad1 100644 --- a/core/linux-kirkwood/PKGBUILD +++ b/core/linux-kirkwood/PKGBUILD @@ -7,13 +7,13 @@ pkgbase=linux-kirkwood pkgname=('linux-kirkwood' 'linux-headers-kirkwood') #pkgname=linux-test # Build kernel with a different name _kernelname=${pkgname#linux} -_basekernel=3.11.7 +_basekernel=3.12 pkgver=${_basekernel} pkgrel=1 cryptover=1.6 bfqver=v6r2 uksmver="0.1.2.2" -uksmname="v3.10" +uksmname="v3.12" arch=('arm') url="http://www.kernel.org/" @@ -32,17 +32,17 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-$(echo $_basekernel |cut -c 1-4).patch" "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/$(echo $_basekernel |cut -c 1-4).0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-$(echo $_basekernel |cut -c 1-4).0.patch") -md5sums=('8cb19b6a65c225d3cde05918c97a5052' - '00837ef51c35627274d6d07bf8c43b4e' - 'e59583f2dcf84b6570681ea69e35de10' +md5sums=('cc6ee608854e0da4b64f6c1ff8b6398c' + '1c87cbbc3355eb8741143b4595d0bb5e' + 'f7a4e67288ff6d2148bc8175a0a18ac3' 'SKIP' '65d5a4f313310bb2a732d022d51ea7e7' '9b5a265440abf57d2052838f31486a3a' 'eade38998313c25fd7934719cdf8a2ea' - '4089a51c706f1ca00acfc55829b4dffb' - '0f8ad72666ad5e94b50df49f79d36021' - 'c92242aebf31b636ba897f95aa7a0179' - 'dcd7dba7d106429f05446e5f906efcbb') + '57cbf7fa8220461f8a052ea0eb9af779' + '2d39966d14fdad1e05679232f97fdb3c' + '2965641038a5aae263722b1ba16b971b' + '9a55951ee4c3741b61e2e159631b5cf2') build() { msg "Patches" diff --git a/core/linux-kirkwood/archlinuxarm.patch b/core/linux-kirkwood/archlinuxarm.patch index 8082de7b6..2806dd253 100644 --- a/core/linux-kirkwood/archlinuxarm.patch +++ b/core/linux-kirkwood/archlinuxarm.patch @@ -1,6 +1,6 @@ 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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/bubba3-gpio.c 2013-09-07 00:15:20.242275253 -0600 ++++ b/arch/arm/mach-kirkwood/bubba3-gpio.c 2013-11-08 01:39:48.648006378 -0700 @@ -0,0 +1,392 @@ +/* + * Excito BUBBA|3 led driver. @@ -396,7 +396,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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/bubba3-setup.c 2013-09-07 00:15:20.242275253 -0600 ++++ b/arch/arm/mach-kirkwood/bubba3-setup.c 2013-11-08 01:39:48.648006378 -0700 @@ -0,0 +1,234 @@ +/* + * arch/arm/mach-kirkwood/bubba3-setup.c @@ -633,83 +633,144 @@ diff -ruN a/arch/arm/mach-kirkwood/bubba3-setup.c b/arch/arm/mach-kirkwood/bubba + .restart = kirkwood_restart, +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h ---- a/arch/arm/mach-kirkwood/common.h 2013-09-02 14:46:10.000000000 -0600 -+++ b/arch/arm/mach-kirkwood/common.h 2013-09-07 00:15:20.252274282 -0600 -@@ -86,12 +86,6 @@ - static inline void dnskw_init(void) {}; - #endif +--- a/arch/arm/mach-kirkwood/common.h 2013-11-03 16:41:51.000000000 -0700 ++++ b/arch/arm/mach-kirkwood/common.h 2013-11-08 01:41:40.952365272 -0700 +@@ -58,13 +58,6 @@ + void kirkwood_restart(enum reboot_mode, const char *); + void kirkwood_clk_init(void); --#ifdef CONFIG_MACH_ICONNECT_DT --void iconnect_init(void); +-/* board init functions for boards not fully converted to fdt */ +-#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT +-void mv88f6281gtw_ge_init(void); -#else --static inline void iconnect_init(void) {}; +-static inline void mv88f6281gtw_ge_init(void) {}; -#endif - - #ifdef CONFIG_MACH_IB62X0_DT - void ib62x0_init(void); - #else -@@ -104,12 +98,6 @@ - static inline void dockstar_dt_init(void) {}; - #endif - --#ifdef CONFIG_MACH_GOFLEXNET_DT --void goflexnet_init(void); --#else --static inline void goflexnet_init(void) {}; --#endif -- - #ifdef CONFIG_MACH_LSXL_DT - void lsxl_init(void); - #else + /* early init functions not converted to fdt yet */ + char *kirkwood_id(void); + void kirkwood_l2_init(void); 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 2013-09-02 14:46:10.000000000 -0600 -+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-09-07 00:15:20.262273642 -0600 -@@ -28,6 +28,10 @@ - .offset = 0, - .size = SZ_1M - }, { +--- a/arch/arm/mach-kirkwood/dockstar-setup.c 1969-12-31 17:00:00.000000000 -0700 ++++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2013-11-08 01:39:48.648006378 -0700 +@@ -0,0 +1,115 @@ ++/* ++ * arch/arm/mach-kirkwood/dockstar-setup.c ++ * ++ * Seagate FreeAgent DockStar Setup ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++ ++static struct mtd_partition dockstar_nand_parts[] = { ++ { ++ .name = "u-boot", ++ .offset = 0, ++ .size = SZ_1M ++ }, { + .name = "pogoplug", + .offset = MTDPART_OFS_NXTBLK, + .size = SZ_32M + }, { - .name = "uImage", - .offset = MTDPART_OFS_NXTBLK, - .size = SZ_4M -@@ -44,17 +48,17 @@ - - static struct gpio_led dockstar_led_pins[] = { - { -- .name = "dockstar:green:health", ++ .name = "uImage", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_4M ++ }, { ++ .name = "root", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = MTDPART_SIZ_FULL ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data dockstar_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(0), ++}; ++ ++static struct gpio_led dockstar_led_pins[] = { ++ { + .name = "status:green:health", - .default_trigger = "default-on", - .gpio = 46, - .active_low = 1, - }, - { -- .name = "dockstar:orange:misc", ++ .default_trigger = "default-on", ++ .gpio = 46, ++ .active_low = 1, ++ }, ++ { + .name = "status:orange:fault", - .default_trigger = "none", - .gpio = 47, - .active_low = 1, -- }, ++ .default_trigger = "none", ++ .gpio = 47, ++ .active_low = 1, + } - }; - - static struct gpio_led_platform_data dockstar_led_data = { -@@ -72,8 +76,8 @@ - - static unsigned int dockstar_mpp_config[] __initdata = { - MPP29_GPIO, /* USB Power Enable */ -- MPP46_GPIO, /* LED green */ -- MPP47_GPIO, /* LED orange */ ++}; ++ ++static struct gpio_led_platform_data dockstar_led_data = { ++ .leds = dockstar_led_pins, ++ .num_leds = ARRAY_SIZE(dockstar_led_pins), ++}; ++ ++static struct platform_device dockstar_leds = { ++ .name = "leds-gpio", ++ .id = -1, ++ .dev = { ++ .platform_data = &dockstar_led_data, ++ } ++}; ++ ++static unsigned int dockstar_mpp_config[] __initdata = { ++ MPP29_GPIO, /* USB Power Enable */ + MPP46_GPIO, /* LED Green */ + MPP47_GPIO, /* LED Orange */ - 0 - }; - ++ 0 ++}; ++ ++static void __init dockstar_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ ++ /* setup gpio pin select */ ++ kirkwood_mpp_conf(dockstar_mpp_config); ++ ++ kirkwood_uart0_init(); ++ kirkwood_nand_init(ARRAY_AND_SIZE(dockstar_nand_parts), 25); ++ ++ if (gpio_request(29, "USB Power Enable") != 0 || ++ gpio_direction_output(29, 1) != 0) ++ pr_err("can't set up GPIO 29 (USB Power Enable)\n"); ++ kirkwood_ehci_init(); ++ ++ kirkwood_ge00_init(&dockstar_ge00_data); ++ ++ platform_device_register(&dockstar_leds); ++} ++ ++MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar") ++ .atag_offset = 0x100, ++ .init_machine = dockstar_init, ++ .map_io = kirkwood_map_io, ++ .init_early = kirkwood_init_early, ++ .init_irq = kirkwood_init_irq, ++ .init_time = kirkwood_timer_init, ++ .restart = kirkwood_restart, ++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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2013-09-07 00:15:20.262273642 -0600 ++++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2013-11-08 01:39:48.648006378 -0700 @@ -0,0 +1,124 @@ +/* + * arch/arm/mach-kirkwood/goflexhome-setup.c @@ -837,7 +898,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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2013-09-07 00:15:20.262273642 -0600 ++++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2013-11-08 01:39:48.658006766 -0700 @@ -0,0 +1,177 @@ +/* + * arch/arm/mach-kirkwood/goflexnet-setup.c @@ -1017,21 +1078,36 @@ diff -ruN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go +MACHINE_END + 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 2013-09-11 23:18:35.000000000 -0500 -+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-09-11 23:25:24.000000000 -0500 -@@ -16,6 +16,8 @@ - #include - #include - #include +--- a/arch/arm/mach-kirkwood/guruplug-setup.c 1969-12-31 17:00:00.000000000 -0700 ++++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2013-11-08 01:39:48.658006766 -0700 +@@ -0,0 +1,228 @@ ++/* ++ * arch/arm/mach-kirkwood/guruplug-setup.c ++ * ++ * Marvell GuruPlug Reference Board Setup ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include +#include +#include - #include - #include - #include -@@ -23,6 +25,36 @@ - #include "common.h" - #include "mpp.h" - ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++ +static struct mtd_partition dreamplug_partitions[] = { + { + .name = "u-boot", @@ -1062,42 +1138,78 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur + }, +}; + - static struct mtd_partition guruplug_nand_parts[] = { - { - .name = "u-boot", -@@ -59,22 +91,24 @@ - - static struct gpio_led guruplug_led_pins[] = { - { -- .name = "guruplug:red:health", ++static struct mtd_partition guruplug_nand_parts[] = { ++ { ++ .name = "u-boot", ++ .offset = 0, ++ .size = SZ_1M ++ }, { ++ .name = "uImage", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_4M ++ }, { ++ .name = "root", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = MTDPART_SIZ_FULL ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data guruplug_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(0), ++}; ++ ++static struct mv643xx_eth_platform_data guruplug_ge01_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(1), ++}; ++ ++static struct mv_sata_platform_data guruplug_sata_data = { ++ .n_ports = 1, ++}; ++ ++static struct mvsdio_platform_data guruplug_mvsdio_data = { ++ /* unfortunately the CD signal has not been connected */ ++ .gpio_card_detect = -1, ++ .gpio_write_protect = -1, ++}; ++ ++static struct gpio_led guruplug_led_pins[] = { ++ { + .name = "status:red:fault", + .default_trigger = "none", - .gpio = 46, - .active_low = 1, - }, - { -- .name = "guruplug:green:health", ++ .gpio = 46, ++ .active_low = 1, ++ }, ++ { + .name = "status:green:health", + .default_trigger = "default-on", - .gpio = 47, - .active_low = 1, - }, - { -- .name = "guruplug:red:wmode", ++ .gpio = 47, ++ .active_low = 1, ++ }, ++ { + .name = "status:red:wmode", - .gpio = 48, - .active_low = 1, - }, - { -- .name = "guruplug:green:wmode", ++ .gpio = 48, ++ .active_low = 1, ++ }, ++ { + .name = "status:green:wmode", - .gpio = 49, - .active_low = 1, - }, -@@ -93,6 +127,41 @@ - } - }; - ++ .gpio = 49, ++ .active_low = 1, ++ }, ++}; ++ ++static struct gpio_led_platform_data guruplug_led_data = { ++ .leds = guruplug_led_pins, ++ .num_leds = ARRAY_SIZE(guruplug_led_pins), ++}; ++ ++static struct platform_device guruplug_leds = { ++ .name = "leds-gpio", ++ .id = -1, ++ .dev = { ++ .platform_data = &guruplug_led_data, ++ } ++}; ++ +static struct gpio_led dreamplug_led_pins[] = { + { + .name = "status:blue:bt", @@ -1133,17 +1245,21 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur +}; + + - static unsigned int guruplug_mpp_config[] __initdata = { - MPP46_GPIO, /* M_RLED */ - MPP47_GPIO, /* M_GLED */ -@@ -107,10 +176,21 @@ - * Basic setup. Needs to be called early. - */ - kirkwood_init(); -- kirkwood_mpp_conf(guruplug_mpp_config); - -- kirkwood_uart0_init(); -- kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25); ++static unsigned int guruplug_mpp_config[] __initdata = { ++ MPP46_GPIO, /* M_RLED */ ++ MPP47_GPIO, /* M_GLED */ ++ MPP48_GPIO, /* B_RLED */ ++ MPP49_GPIO, /* B_GLED */ ++ 0 ++}; ++ ++static void __init guruplug_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ + if (machine_is_guruplug()) { + kirkwood_mpp_conf(guruplug_mpp_config); + kirkwood_uart0_init(); @@ -1158,21 +1274,27 @@ diff -ruN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur + kirkwood_spi_init(); + guruplug_leds.dev.platform_data = &dreamplug_led_data; + } - - kirkwood_ehci_init(); - kirkwood_ge00_init(&guruplug_ge00_data); -@@ -121,6 +201,7 @@ - platform_device_register(&guruplug_leds); - } - ++ ++ kirkwood_ehci_init(); ++ kirkwood_ge00_init(&guruplug_ge00_data); ++ kirkwood_ge01_init(&guruplug_ge01_data); ++ kirkwood_sata_init(&guruplug_sata_data); ++ kirkwood_sdio_init(&guruplug_mvsdio_data); ++ ++ platform_device_register(&guruplug_leds); ++} ++ +#ifdef CONFIG_MACH_GURUPLUG - MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board") - /* Maintainer: Siddarth Gore */ - .atag_offset = 0x100, -@@ -131,3 +212,17 @@ - .init_time = kirkwood_timer_init, - .restart = kirkwood_restart, - MACHINE_END ++MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board") ++ /* Maintainer: Siddarth Gore */ ++ .atag_offset = 0x100, ++ .init_machine = guruplug_init, ++ .map_io = kirkwood_map_io, ++ .init_early = kirkwood_init_early, ++ .init_irq = kirkwood_init_irq, ++ .init_time = kirkwood_timer_init, ++ .restart = kirkwood_restart, ++MACHINE_END +#endif + +#ifdef CONFIG_MACH_DREAMPLUG @@ -1189,7 +1311,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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2013-09-07 00:15:20.272273037 -0600 ++++ b/arch/arm/mach-kirkwood/iconnect-setup.c 2013-11-08 01:39:48.658006766 -0700 @@ -0,0 +1,204 @@ +/* + * arch/arm/mach-kirkwood/iconnect-setup.c @@ -1397,7 +1519,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/ionics-stratus-setup.c b/arch/arm/mach-kirkwood/ionics-stratus-setup.c --- a/arch/arm/mach-kirkwood/ionics-stratus-setup.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2013-09-07 00:15:20.272273037 -0600 ++++ b/arch/arm/mach-kirkwood/ionics-stratus-setup.c 2013-11-08 01:39:48.658006766 -0700 @@ -0,0 +1,137 @@ +/* + * arch/arm/mach-kirkwood/ionics-stratus-setup.c @@ -1537,182 +1659,211 @@ diff -ruN a/arch/arm/mach-kirkwood/ionics-stratus-setup.c b/arch/arm/mach-kirkwo + .restart = kirkwood_restart, +MACHINE_END diff -ruN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig ---- a/arch/arm/mach-kirkwood/Kconfig 2013-09-02 14:46:10.000000000 -0600 -+++ b/arch/arm/mach-kirkwood/Kconfig 2013-09-10 02:32:30.313992267 -0600 -@@ -26,6 +26,12 @@ +--- a/arch/arm/mach-kirkwood/Kconfig 2013-11-03 16:41:51.000000000 -0700 ++++ b/arch/arm/mach-kirkwood/Kconfig 2013-11-08 01:39:48.688007930 -0700 +@@ -12,6 +12,48 @@ Say 'Y' here if you want your kernel to support the - Marvell GuruPlug Reference Board. + LaCie d2 Network v2 NAS. ++config MACH_DOCKSTAR ++ bool "Seagate FreeAgent DockStar" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ Seagate FreeAgent DockStar. ++ ++config MACH_ESATA_SHEEVAPLUG ++ bool "Marvell eSATA SheevaPlug Reference Board" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell eSATA SheevaPlug Reference Board. ++ ++config MACH_GURUPLUG ++ bool "Marvell GuruPlug Reference Board" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell GuruPlug Reference Board. ++ +config MACH_DREAMPLUG + bool "Marvell DreamPlug Reference Board" ++ select KIRKWOOD_LEGACY + help + Say 'Y' here if you want your kernel to support the + Marvell DreamPlug Reference Board. + - config MACH_INETSPACE_V2 - bool "LaCie Internet Space v2 NAS Board" - help -@@ -86,6 +92,12 @@ ++config MACH_INETSPACE_V2 ++ bool "LaCie Internet Space v2 NAS Board" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ LaCie Internet Space v2 NAS. ++ ++config MACH_MV88F6281GTW_GE ++ bool "Marvell 88F6281 GTW GE Board" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell 88F6281 GTW GE Board. ++ + config MACH_NET2BIG_V2 + bool "LaCie 2Big Network v2 NAS Board" + select KIRKWOOD_LEGACY +@@ -26,6 +68,20 @@ + Say 'Y' here if you want your kernel to support the + LaCie 5Big Network v2 NAS. + ++config MACH_NETSPACE_MAX_V2 ++ bool "LaCie Network Space Max v2 NAS Board" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ LaCie Network Space Max v2 NAS. ++ ++config MACH_NETSPACE_V2 ++ bool "LaCie Network Space v2 NAS Board" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ LaCie Network Space v2 NAS. ++ + config MACH_OPENRD + select KIRKWOOD_LEGACY + bool +@@ -51,6 +107,13 @@ Say 'Y' here if you want your kernel to support the Marvell OpenRD Ultimate Board. +config MACH_BUBBA3 + bool "Bubba3 miniserver" -+ help ++ select KIRKWOOD_LEGACY ++ help + Say 'Y' here if you want your kernel to support the + Bubba3 miniserver. + config MACH_RD88F6192_NAS bool "Marvell RD-88F6192-NAS Reference Board" - help -@@ -124,6 +136,72 @@ + select KIRKWOOD_LEGACY +@@ -65,6 +128,13 @@ + Say 'Y' here if you want your kernel to support the + Marvell RD-88F6281 Reference Board. + ++config MACH_SHEEVAPLUG ++ bool "Marvell SheevaPlug Reference Board" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell SheevaPlug Reference Board. ++ + config MACH_T5325 + bool "HP t5325 Thin Client" + select KIRKWOOD_LEGACY +@@ -88,6 +158,83 @@ QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo NAS devices. +config MACH_GOFLEXNET + bool "Seagate GoFlex Net" ++ select KIRKWOOD_LEGACY + help -+ Say 'Y' here if you want your kernel to support the -+ Seagate GoFlex Net. ++ Say 'Y' here if you want your kernel to support the ++ Seagate GoFlex Net. + +config MACH_GOFLEXHOME + bool "Seagate GoFlex Home" ++ select KIRKWOOD_LEGACY + help -+ Say 'Y' here if you want your kernel to support the -+ Seagate GoFlex Home. ++ Say 'Y' here if you want your kernel to support the ++ Seagate GoFlex Home. + +config MACH_ICONNECT + bool "Iomega iConnect Wireless" ++ select KIRKWOOD_LEGACY + help -+ Say 'Y' here if you want your kernel to support the -+ Iomega iConnect Wireless. ++ Say 'Y' here if you want your kernel to support the ++ Iomega iConnect Wireless. + +config MACH_POGOPLUGV4 + bool "Pogoplug Series 4" ++ select KIRKWOOD_LEGACY + help -+ Say 'Y' here if you want your kernel to support the -+ Pogoplug Series 4. ++ Say 'Y' here if you want your kernel to support the ++ Pogoplug Series 4. + +config MACH_POGO_E02 + bool "CE Pogoplug E02" ++ select KIRKWOOD_LEGACY + help -+ Say 'Y' here if you want your kernel to support the -+ CloudEngines Pogoplug e02. ++ Say 'Y' here if you want your kernel to support the ++ CloudEngines Pogoplug e02. + +config MACH_NAS6210 + bool "RaidSonic ICY BOX IB-NAS6210" ++ select KIRKWOOD_LEGACY + help -+ Say 'Y' here if you want your kernel to support the -+ RaidSonic ICY BOX IB-NAS6210 device. ++ Say 'Y' here if you want your kernel to support the ++ RaidSonic ICY BOX IB-NAS6210 device. + +config MACH_TOPKICK + bool "USI Topkick" ++ select KIRKWOOD_LEGACY + help -+ Say 'Y' here if you want your kernel to support the -+ USI Topkick. ++ Say 'Y' here if you want your kernel to support the ++ USI Topkick. + +config MACH_IONICS_STRATUS + bool "Ionics Stratus" ++ select KIRKWOOD_LEGACY + help -+ Say 'Y' here if you want your kernel to support the -+ Ionics Stratus. ++ Say 'Y' here if you want your kernel to support the ++ Ionics Stratus. + +config MACH_NSA310 -+ bool "ZyXEL NSA310 1-Bay Power Media Server" -+ help -+ Say 'Y' here if you want your kernel to support the -+ ZyXEL NSA310. ++ bool "ZyXEL NSA310 1-Bay Power Media Server" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ ZyXEL NSA310. + +config MACH_NSA320 -+ bool "ZyXEL NSA320 2-Bay Power Media Server" -+ help -+ Say 'Y' here if you want your kernel to support the -+ ZyXel NSA320. ++ bool "ZyXEL NSA320 2-Bay Power Media Server" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ ZyXel NSA320. + +config MACH_NSA325 -+ bool "ZyXEL NSA325 2-Bay Power Media Server" -+ help -+ Say 'Y' here if you want your kernel to support the -+ ZyXel NSA325. ++ bool "ZyXEL NSA325 2-Bay Power Media Server" ++ select KIRKWOOD_LEGACY ++ help ++ Say 'Y' here if you want your kernel to support the ++ ZyXel NSA325. + comment "Device tree entries" config ARCH_KIRKWOOD_DT -@@ -161,13 +233,6 @@ - Kirkwood-based D-Link NASes such as DNS-320 & DNS-325, - using Flattened Device Tree. - --config MACH_DOCKSTAR_DT -- bool "Seagate FreeAgent Dockstar (Flattened Device Tree)" -- select ARCH_KIRKWOOD_DT -- help -- Say 'Y' here if you want your kernel to support the -- Seagate FreeAgent Dockstar (Flattened Device Tree). -- - config MACH_DREAMPLUG_DT - bool "Marvell DreamPlug (Flattened Device Tree)" - select ARCH_KIRKWOOD_DT -@@ -175,13 +240,6 @@ - Say 'Y' here if you want your kernel to support the - Marvell DreamPlug (Flattened Device Tree). - --config MACH_GOFLEXNET_DT -- bool "Seagate GoFlex Net (Flattened Device Tree)" -- select ARCH_KIRKWOOD_DT -- help -- Say 'Y' here if you want your kernel to support the -- Seagate GoFlex Net (Flattened Device Tree). -- - config MACH_GURUPLUG_DT - bool "Marvell GuruPlug Reference Board (Flattened Device Tree)" - select ARCH_KIRKWOOD_DT -@@ -197,12 +255,6 @@ - RaidSonic IB-NAS6210 & IB-NAS6220 devices, using - Flattened Device Tree. - --config MACH_ICONNECT_DT -- bool "Iomega Iconnect (Flattened Device Tree)" -- select ARCH_KIRKWOOD_DT -- help -- Say 'Y' here to enable Iomega Iconnect support. -- - config MACH_INETSPACE_V2_DT - bool "LaCie Internet Space v2 NAS (Flattened Device Tree)" - select ARCH_KIRKWOOD_DT -@@ -303,21 +355,6 @@ - Say 'Y' here if you want your kernel to support the - USI Topkick, using Flattened Device Tree - --config MACH_TS219_DT -- bool "Device Tree for QNAP TS-11X, TS-21X NAS" -- select ARCH_KIRKWOOD_DT -- select ARM_APPENDED_DTB -- select ARM_ATAG_DTB_COMPAT -- select POWER_RESET_QNAP -- help -- Say 'Y' here if you want your kernel to support the QNAP -- TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and -- TS-219P+ Turbo NAS devices using Fattened Device Tree. -- There are two different Device Tree descriptions, depending -- on if the device is based on an if the board uses the MV6281 -- or MV6282. If you have the wrong one, the buttons will not -- work. -- - endmenu - - endif diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile ---- a/arch/arm/mach-kirkwood/Makefile 2013-09-02 14:46:10.000000000 -0600 -+++ b/arch/arm/mach-kirkwood/Makefile 2013-09-10 02:33:17.173140672 -0600 -@@ -4,6 +4,7 @@ - obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o - obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o - obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o +--- a/arch/arm/mach-kirkwood/Makefile 2013-11-03 16:41:51.000000000 -0700 ++++ b/arch/arm/mach-kirkwood/Makefile 2013-11-08 01:39:48.698008319 -0700 +@@ -1,14 +1,35 @@ + obj-y += common.o pcie.o + obj-$(CONFIG_KIRKWOOD_LEGACY) += irq.o mpp.o + obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o ++obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o ++obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o ++obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o +obj-$(CONFIG_MACH_DREAMPLUG) += guruplug-setup.o - obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o - obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o ++obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o ++obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o -@@ -17,6 +18,18 @@ + obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o + obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o ++obj-$(CONFIG_MACH_NETSPACE_MAX_V2) += netspace_v2-setup.o lacie_v2-common.o ++obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o + obj-$(CONFIG_MACH_RD88F6192_NAS) += rd88f6192-nas-setup.o + obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o ++obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_T5325) += t5325-setup.o obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o @@ -1730,26 +1881,186 @@ diff -ruN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile +obj-$(CONFIG_MACH_NSA325) += nsa325-setup.o obj-$(CONFIG_ARCH_KIRKWOOD_DT) += board-dt.o - obj-$(CONFIG_MACH_CLOUDBOX_DT) += board-ns2.o -@@ -24,10 +36,8 @@ - obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += board-dnskw.o - obj-$(CONFIG_MACH_DOCKSTAR_DT) += board-dockstar.o - obj-$(CONFIG_MACH_DREAMPLUG_DT) += board-dreamplug.o --obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o - obj-$(CONFIG_MACH_GURUPLUG_DT) += board-guruplug.o - obj-$(CONFIG_MACH_IB62X0_DT) += board-ib62x0.o --obj-$(CONFIG_MACH_ICONNECT_DT) += board-iconnect.o - obj-$(CONFIG_MACH_INETSPACE_V2_DT) += board-ns2.o - obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT) += board-iomega_ix2_200.o - obj-$(CONFIG_MACH_KM_KIRKWOOD_DT) += board-km_kirkwood.o -@@ -41,4 +51,3 @@ - obj-$(CONFIG_MACH_READYNAS_DT) += board-readynas.o - obj-$(CONFIG_MACH_SHEEVAPLUG_DT) += board-sheevaplug.o - obj-$(CONFIG_MACH_TOPKICK_DT) += board-usi_topkick.o --obj-$(CONFIG_MACH_TS219_DT) += board-ts219.o tsx1x-common.o + obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o +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 1969-12-31 17:00:00.000000000 -0700 ++++ b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c 2013-11-08 01:39:48.698008319 -0700 +@@ -0,0 +1,172 @@ ++/* ++ * arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c ++ * ++ * Marvell 88F6281 GTW GE Board Setup ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++ ++static struct mv643xx_eth_platform_data mv88f6281gtw_ge_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_NONE, ++ .speed = SPEED_1000, ++ .duplex = DUPLEX_FULL, ++}; ++ ++static struct dsa_chip_data mv88f6281gtw_ge_switch_chip_data = { ++ .port_names[0] = "lan1", ++ .port_names[1] = "lan2", ++ .port_names[2] = "lan3", ++ .port_names[3] = "lan4", ++ .port_names[4] = "wan", ++ .port_names[5] = "cpu", ++}; ++ ++static struct dsa_platform_data mv88f6281gtw_ge_switch_plat_data = { ++ .nr_chips = 1, ++ .chip = &mv88f6281gtw_ge_switch_chip_data, ++}; ++ ++static const struct flash_platform_data mv88f6281gtw_ge_spi_slave_data = { ++ .type = "mx25l12805d", ++}; ++ ++static struct spi_board_info __initdata mv88f6281gtw_ge_spi_slave_info[] = { ++ { ++ .modalias = "m25p80", ++ .platform_data = &mv88f6281gtw_ge_spi_slave_data, ++ .irq = -1, ++ .max_speed_hz = 50000000, ++ .bus_num = 0, ++ .chip_select = 0, ++ }, ++}; ++ ++static struct gpio_keys_button mv88f6281gtw_ge_button_pins[] = { ++ { ++ .code = KEY_RESTART, ++ .gpio = 47, ++ .desc = "SWR Button", ++ .active_low = 1, ++ }, { ++ .code = KEY_WPS_BUTTON, ++ .gpio = 46, ++ .desc = "WPS Button", ++ .active_low = 1, ++ }, ++}; ++ ++static struct gpio_keys_platform_data mv88f6281gtw_ge_button_data = { ++ .buttons = mv88f6281gtw_ge_button_pins, ++ .nbuttons = ARRAY_SIZE(mv88f6281gtw_ge_button_pins), ++}; ++ ++static struct platform_device mv88f6281gtw_ge_buttons = { ++ .name = "gpio-keys", ++ .id = -1, ++ .num_resources = 0, ++ .dev = { ++ .platform_data = &mv88f6281gtw_ge_button_data, ++ }, ++}; ++ ++static struct gpio_led mv88f6281gtw_ge_led_pins[] = { ++ { ++ .name = "gtw:green:Status", ++ .gpio = 20, ++ .active_low = 0, ++ }, { ++ .name = "gtw:red:Status", ++ .gpio = 21, ++ .active_low = 0, ++ }, { ++ .name = "gtw:green:USB", ++ .gpio = 12, ++ .active_low = 0, ++ }, ++}; ++ ++static struct gpio_led_platform_data mv88f6281gtw_ge_led_data = { ++ .leds = mv88f6281gtw_ge_led_pins, ++ .num_leds = ARRAY_SIZE(mv88f6281gtw_ge_led_pins), ++}; ++ ++static struct platform_device mv88f6281gtw_ge_leds = { ++ .name = "leds-gpio", ++ .id = -1, ++ .dev = { ++ .platform_data = &mv88f6281gtw_ge_led_data, ++ }, ++}; ++ ++static unsigned int mv88f6281gtw_ge_mpp_config[] __initdata = { ++ MPP12_GPO, /* Status#_USB pin */ ++ MPP20_GPIO, /* Status#_GLED pin */ ++ MPP21_GPIO, /* Status#_RLED pin */ ++ MPP46_GPIO, /* WPS_Switch pin */ ++ MPP47_GPIO, /* SW_Init pin */ ++ 0 ++}; ++ ++static void __init mv88f6281gtw_ge_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ kirkwood_mpp_conf(mv88f6281gtw_ge_mpp_config); ++ ++ kirkwood_ehci_init(); ++ kirkwood_ge00_init(&mv88f6281gtw_ge_ge00_data); ++ kirkwood_ge00_switch_init(&mv88f6281gtw_ge_switch_plat_data, NO_IRQ); ++ spi_register_board_info(mv88f6281gtw_ge_spi_slave_info, ++ ARRAY_SIZE(mv88f6281gtw_ge_spi_slave_info)); ++ kirkwood_spi_init(); ++ kirkwood_uart0_init(); ++ platform_device_register(&mv88f6281gtw_ge_leds); ++ platform_device_register(&mv88f6281gtw_ge_buttons); ++} ++ ++static int __init mv88f6281gtw_ge_pci_init(void) ++{ ++ if (machine_is_mv88f6281gtw_ge()) ++ kirkwood_pcie_init(KW_PCIE0); ++ ++ return 0; ++} ++subsys_initcall(mv88f6281gtw_ge_pci_init); ++ ++MACHINE_START(MV88F6281GTW_GE, "Marvell 88F6281 GTW GE Board") ++ /* Maintainer: Lennert Buytenhek */ ++ .atag_offset = 0x100, ++ .init_machine = mv88f6281gtw_ge_init, ++ .map_io = kirkwood_map_io, ++ .init_early = kirkwood_init_early, ++ .init_irq = kirkwood_init_irq, ++ .init_time = kirkwood_timer_init, ++ .restart = kirkwood_restart, ++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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2013-09-07 00:15:20.282272762 -0600 ++++ b/arch/arm/mach-kirkwood/nas6210-setup.c 2013-11-08 01:39:48.708008707 -0700 @@ -0,0 +1,186 @@ +/* + * arch/arm/mach-kirkwood/nas6210-setup.c @@ -1937,9 +2248,306 @@ diff -ruN a/arch/arm/mach-kirkwood/nas6210-setup.c b/arch/arm/mach-kirkwood/nas6 + .init_time = kirkwood_timer_init, + .restart = kirkwood_restart, +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 1969-12-31 17:00:00.000000000 -0700 ++++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c 2013-11-08 01:39:48.708008707 -0700 +@@ -0,0 +1,293 @@ ++/* ++ * arch/arm/mach-kirkwood/netspace_v2-setup.c ++ * ++ * LaCie Network Space v2 board setup ++ * ++ * Copyright (C) 2009 Simon Guinot ++ * Copyright (C) 2009 Benoît Canet ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++#include "lacie_v2-common.h" ++ ++/***************************************************************************** ++ * Ethernet ++ ****************************************************************************/ ++ ++static struct mv643xx_eth_platform_data netspace_v2_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(8), ++}; ++ ++/***************************************************************************** ++ * SATA ++ ****************************************************************************/ ++ ++static struct mv_sata_platform_data netspace_v2_sata_data = { ++ .n_ports = 2, ++}; ++ ++/***************************************************************************** ++ * GPIO keys ++ ****************************************************************************/ ++ ++#define NETSPACE_V2_PUSH_BUTTON 32 ++ ++static struct gpio_keys_button netspace_v2_buttons[] = { ++ [0] = { ++ .code = KEY_POWER, ++ .gpio = NETSPACE_V2_PUSH_BUTTON, ++ .desc = "Power push button", ++ .active_low = 0, ++ }, ++}; ++ ++static struct gpio_keys_platform_data netspace_v2_button_data = { ++ .buttons = netspace_v2_buttons, ++ .nbuttons = ARRAY_SIZE(netspace_v2_buttons), ++}; ++ ++static struct platform_device netspace_v2_gpio_buttons = { ++ .name = "gpio-keys", ++ .id = -1, ++ .dev = { ++ .platform_data = &netspace_v2_button_data, ++ }, ++}; ++ ++/***************************************************************************** ++ * GPIO LEDs ++ ****************************************************************************/ ++ ++#define NETSPACE_V2_GPIO_RED_LED 12 ++ ++static struct gpio_led netspace_v2_gpio_led_pins[] = { ++ { ++ .name = "ns_v2:red:fail", ++ .gpio = NETSPACE_V2_GPIO_RED_LED, ++ }, ++}; ++ ++static struct gpio_led_platform_data netspace_v2_gpio_leds_data = { ++ .num_leds = ARRAY_SIZE(netspace_v2_gpio_led_pins), ++ .leds = netspace_v2_gpio_led_pins, ++}; ++ ++static struct platform_device netspace_v2_gpio_leds = { ++ .name = "leds-gpio", ++ .id = -1, ++ .dev = { ++ .platform_data = &netspace_v2_gpio_leds_data, ++ }, ++}; ++ ++/***************************************************************************** ++ * Dual-GPIO CPLD LEDs ++ ****************************************************************************/ ++ ++#define NETSPACE_V2_GPIO_BLUE_LED_SLOW 29 ++#define NETSPACE_V2_GPIO_BLUE_LED_CMD 30 ++ ++static struct ns2_led netspace_v2_led_pins[] = { ++ { ++ .name = "ns_v2:blue:sata", ++ .cmd = NETSPACE_V2_GPIO_BLUE_LED_CMD, ++ .slow = NETSPACE_V2_GPIO_BLUE_LED_SLOW, ++ }, ++}; ++ ++static struct ns2_led_platform_data netspace_v2_leds_data = { ++ .num_leds = ARRAY_SIZE(netspace_v2_led_pins), ++ .leds = netspace_v2_led_pins, ++}; ++ ++static struct platform_device netspace_v2_leds = { ++ .name = "leds-ns2", ++ .id = -1, ++ .dev = { ++ .platform_data = &netspace_v2_leds_data, ++ }, ++}; ++ ++/***************************************************************************** ++ * GPIO fan ++ ****************************************************************************/ ++ ++/* Designed for fan 40x40x16: ADDA AD0412LB-D50 6000rpm@12v */ ++static struct gpio_fan_speed netspace_max_v2_fan_speed[] = { ++ { 0, 0 }, ++ { 1500, 15 }, ++ { 1700, 14 }, ++ { 1800, 13 }, ++ { 2100, 12 }, ++ { 3100, 11 }, ++ { 3300, 10 }, ++ { 4300, 9 }, ++ { 5500, 8 }, ++}; ++ ++static unsigned netspace_max_v2_fan_ctrl[] = { 22, 7, 33, 23 }; ++ ++static struct gpio_fan_alarm netspace_max_v2_fan_alarm = { ++ .gpio = 25, ++ .active_low = 1, ++}; ++ ++static struct gpio_fan_platform_data netspace_max_v2_fan_data = { ++ .num_ctrl = ARRAY_SIZE(netspace_max_v2_fan_ctrl), ++ .ctrl = netspace_max_v2_fan_ctrl, ++ .alarm = &netspace_max_v2_fan_alarm, ++ .num_speed = ARRAY_SIZE(netspace_max_v2_fan_speed), ++ .speed = netspace_max_v2_fan_speed, ++}; ++ ++static struct platform_device netspace_max_v2_gpio_fan = { ++ .name = "gpio-fan", ++ .id = -1, ++ .dev = { ++ .platform_data = &netspace_max_v2_fan_data, ++ }, ++}; ++ ++/***************************************************************************** ++ * General Setup ++ ****************************************************************************/ ++ ++static unsigned int netspace_v2_mpp_config[] __initdata = { ++ MPP0_SPI_SCn, ++ MPP1_SPI_MOSI, ++ MPP2_SPI_SCK, ++ MPP3_SPI_MISO, ++ MPP4_NF_IO6, ++ MPP5_NF_IO7, ++ MPP6_SYSRST_OUTn, ++ MPP7_GPO, /* Fan speed (bit 1) */ ++ MPP8_TW0_SDA, ++ MPP9_TW0_SCK, ++ MPP10_UART0_TXD, ++ MPP11_UART0_RXD, ++ MPP12_GPO, /* Red led */ ++ MPP14_GPIO, /* USB fuse */ ++ MPP16_GPIO, /* SATA 0 power */ ++ MPP17_GPIO, /* SATA 1 power */ ++ MPP18_NF_IO0, ++ MPP19_NF_IO1, ++ MPP20_SATA1_ACTn, ++ MPP21_SATA0_ACTn, ++ MPP22_GPIO, /* Fan speed (bit 0) */ ++ MPP23_GPIO, /* Fan power */ ++ MPP24_GPIO, /* USB mode select */ ++ MPP25_GPIO, /* Fan rotation fail */ ++ MPP26_GPIO, /* USB device vbus */ ++ MPP28_GPIO, /* USB enable host vbus */ ++ MPP29_GPIO, /* Blue led (slow register) */ ++ MPP30_GPIO, /* Blue led (command register) */ ++ MPP31_GPIO, /* Board power off */ ++ MPP32_GPIO, /* Power button (0 = Released, 1 = Pushed) */ ++ MPP33_GPO, /* Fan speed (bit 2) */ ++ 0 ++}; ++ ++#define NETSPACE_V2_GPIO_POWER_OFF 31 ++ ++static void netspace_v2_power_off(void) ++{ ++ gpio_set_value(NETSPACE_V2_GPIO_POWER_OFF, 1); ++} ++ ++static void __init netspace_v2_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ kirkwood_mpp_conf(netspace_v2_mpp_config); ++ ++ if (machine_is_netspace_max_v2()) ++ lacie_v2_hdd_power_init(2); ++ else ++ lacie_v2_hdd_power_init(1); ++ ++ kirkwood_ehci_init(); ++ kirkwood_ge00_init(&netspace_v2_ge00_data); ++ kirkwood_sata_init(&netspace_v2_sata_data); ++ kirkwood_uart0_init(); ++ lacie_v2_register_flash(); ++ lacie_v2_register_i2c_devices(); ++ ++ platform_device_register(&netspace_v2_leds); ++ platform_device_register(&netspace_v2_gpio_leds); ++ platform_device_register(&netspace_v2_gpio_buttons); ++ if (machine_is_netspace_max_v2()) ++ platform_device_register(&netspace_max_v2_gpio_fan); ++ ++ if (gpio_request(NETSPACE_V2_GPIO_POWER_OFF, "power-off") == 0 && ++ gpio_direction_output(NETSPACE_V2_GPIO_POWER_OFF, 0) == 0) ++ pm_power_off = netspace_v2_power_off; ++ else ++ pr_err("netspace_v2: failed to configure power-off GPIO\n"); ++} ++ ++#ifdef CONFIG_MACH_NETSPACE_V2 ++MACHINE_START(NETSPACE_V2, "LaCie Network Space v2") ++ .atag_offset = 0x100, ++ .init_machine = netspace_v2_init, ++ .map_io = kirkwood_map_io, ++ .init_early = kirkwood_init_early, ++ .init_irq = kirkwood_init_irq, ++ .init_time = kirkwood_timer_init, ++ .restart = kirkwood_restart, ++MACHINE_END ++#endif ++ ++#ifdef CONFIG_MACH_INETSPACE_V2 ++MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2") ++ .atag_offset = 0x100, ++ .init_machine = netspace_v2_init, ++ .map_io = kirkwood_map_io, ++ .init_early = kirkwood_init_early, ++ .init_irq = kirkwood_init_irq, ++ .init_time = kirkwood_timer_init, ++ .restart = kirkwood_restart, ++MACHINE_END ++#endif ++ ++#ifdef CONFIG_MACH_NETSPACE_MAX_V2 ++MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2") ++ .atag_offset = 0x100, ++ .init_machine = netspace_v2_init, ++ .map_io = kirkwood_map_io, ++ .init_early = kirkwood_init_early, ++ .init_irq = kirkwood_init_irq, ++ .init_time = kirkwood_timer_init, ++ .restart = kirkwood_restart, ++MACHINE_END ++#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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2013-09-07 00:15:20.292272610 -0600 ++++ b/arch/arm/mach-kirkwood/nsa310-setup.c 2013-11-08 01:39:48.708008707 -0700 @@ -0,0 +1,359 @@ +/* + * arch/arm/mach-kirkwood/nsa310-setup.c @@ -2302,7 +2910,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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2013-09-07 00:15:20.292272610 -0600 ++++ b/arch/arm/mach-kirkwood/nsa320-setup.c 2013-11-08 01:39:48.718009095 -0700 @@ -0,0 +1,305 @@ +/* + * arch/arm/mach-kirkwood/nsa320-setup.c @@ -2609,9 +3217,9 @@ diff -ruN a/arch/arm/mach-kirkwood/nsa320-setup.c b/arch/arm/mach-kirkwood/nsa32 + .init_time = kirkwood_timer_init, + .restart = kirkwood_restart, +MACHINE_END -diff -rupN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa325-setup.c ---- a/arch/arm/mach-kirkwood/nsa325-setup.c 1969-12-31 19:00:00.000000000 -0500 -+++ b/arch/arm/mach-kirkwood/nsa325-setup.c 2013-10-03 23:36:55.430043273 -0400 +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 1969-12-31 17:00:00.000000000 -0700 ++++ b/arch/arm/mach-kirkwood/nsa325-setup.c 2013-11-08 01:39:48.718009095 -0700 @@ -0,0 +1,359 @@ +/* + * arch/arm/mach-kirkwood/nsa325-setup.c @@ -2974,7 +3582,7 @@ diff -rupN a/arch/arm/mach-kirkwood/nsa325-setup.c b/arch/arm/mach-kirkwood/nsa3 +MACHINE_END 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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2013-09-07 00:15:20.292272610 -0600 ++++ b/arch/arm/mach-kirkwood/pogo_e02-setup.c 2013-11-08 01:39:48.718009095 -0700 @@ -0,0 +1,115 @@ +/* + * arch/arm/mach-kirkwood/pogo_e02-setup.c @@ -3093,7 +3701,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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2013-09-07 00:15:20.292272610 -0600 ++++ b/arch/arm/mach-kirkwood/pogoplugv4-setup.c 2013-11-08 01:39:48.718009095 -0700 @@ -0,0 +1,195 @@ +/* + * arch/arm/mach-kirkwood/pogoplugv4-setup.c @@ -3291,33 +3899,75 @@ diff -ruN a/arch/arm/mach-kirkwood/pogoplugv4-setup.c b/arch/arm/mach-kirkwood/p + .restart = kirkwood_restart, +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 2013-09-02 14:46:10.000000000 -0600 -+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-09-07 00:15:20.302272754 -0600 -@@ -43,7 +43,7 @@ - .phy_addr = MV643XX_ETH_PHY_ADDR(0), - }; - --static struct mv_sata_platform_data sheeva_esata_sata_data = { +--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 1969-12-31 17:00:00.000000000 -0700 ++++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2013-11-08 01:39:48.728009483 -0700 +@@ -0,0 +1,170 @@ ++/* ++ * arch/arm/mach-kirkwood/sheevaplug-setup.c ++ * ++ * Marvell SheevaPlug Reference Board Setup ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++ ++static struct mtd_partition sheevaplug_nand_parts[] = { ++ { ++ .name = "u-boot", ++ .offset = 0, ++ .size = SZ_1M ++ }, { ++ .name = "uImage", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_4M ++ }, { ++ .name = "root", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = MTDPART_SIZ_FULL ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data sheevaplug_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(0), ++}; ++ +static struct mv_sata_platform_data esata_sheevaplug_sata_data = { - .n_ports = 2, - }; - -@@ -51,8 +51,8 @@ - /* unfortunately the CD signal has not been connected */ - }; - --static struct mvsdio_platform_data sheeva_esata_mvsdio_data = { -- .gpio_write_protect = 44, /* MPP44 used as SD write protect */ ++ .n_ports = 2, ++}; ++ ++static struct mvsdio_platform_data sheevaplug_mvsdio_data = { ++ /* unfortunately the CD signal has not been connected */ ++}; ++ +static struct mvsdio_platform_data esata_sheevaplug_mvsdio_data = { + .gpio_write_protect = -1, /* (disable - does not work on 3.9+) MPP44 used as SD write protect */ - .gpio_card_detect = 47, /* MPP47 used as SD card detect */ - }; - -@@ -64,7 +64,13 @@ - .active_low = 1, - }, - { -- .name = "plug:green:health", ++ .gpio_card_detect = 47, /* MPP47 used as SD card detect */ ++}; ++ ++static struct gpio_led sheevaplug_led_pins[] = { ++ { ++ .name = "plug:red:misc", ++ .default_trigger = "none", ++ .gpio = 46, ++ .active_low = 1, ++ }, ++ { + .name = "status:green:health", + .default_trigger = "none", + .gpio = 48, @@ -3325,58 +3975,106 @@ diff -ruN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s + }, + { + .name = "status:blue:health", - .default_trigger = "default-on", - .gpio = 49, - .active_low = 1, -@@ -87,15 +93,18 @@ - static unsigned int sheevaplug_mpp_config[] __initdata = { - MPP29_GPIO, /* USB Power Enable */ - MPP46_GPIO, /* LED Red */ -- MPP49_GPIO, /* LED */ -+ MPP48_GPIO, /* LED Green */ -+ MPP49_GPIO, /* LED Blue */ - 0 - }; - --static unsigned int sheeva_esata_mpp_config[] __initdata = { -+static unsigned int esata_sheevaplug_mpp_config[] __initdata = { - MPP29_GPIO, /* USB Power Enable */ -- MPP44_GPIO, /* SD Write Protect */ -+ //MPP44_GPIO, /* SD Write Protect */ - MPP47_GPIO, /* SD Card Detect */ -- MPP49_GPIO, /* LED Green */ ++ .default_trigger = "default-on", ++ .gpio = 49, ++ .active_low = 1, ++ }, ++}; ++ ++static struct gpio_led_platform_data sheevaplug_led_data = { ++ .leds = sheevaplug_led_pins, ++ .num_leds = ARRAY_SIZE(sheevaplug_led_pins), ++}; ++ ++static struct platform_device sheevaplug_leds = { ++ .name = "leds-gpio", ++ .id = -1, ++ .dev = { ++ .platform_data = &sheevaplug_led_data, ++ } ++}; ++ ++static unsigned int sheevaplug_mpp_config[] __initdata = { ++ MPP29_GPIO, /* USB Power Enable */ + MPP46_GPIO, /* LED Red */ + MPP48_GPIO, /* LED Green */ + MPP49_GPIO, /* LED Blue */ - 0 - }; - -@@ -108,7 +117,7 @@ - - /* setup gpio pin select */ - if (machine_is_esata_sheevaplug()) -- kirkwood_mpp_conf(sheeva_esata_mpp_config); ++ 0 ++}; ++ ++static unsigned int esata_sheevaplug_mpp_config[] __initdata = { ++ MPP29_GPIO, /* USB Power Enable */ ++ //MPP44_GPIO, /* SD Write Protect */ ++ MPP47_GPIO, /* SD Card Detect */ ++ MPP46_GPIO, /* LED Red */ ++ MPP48_GPIO, /* LED Green */ ++ MPP49_GPIO, /* LED Blue */ ++ 0 ++}; ++ ++static void __init sheevaplug_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ ++ /* setup gpio pin select */ ++ if (machine_is_esata_sheevaplug()) + kirkwood_mpp_conf(esata_sheevaplug_mpp_config); - else - kirkwood_mpp_conf(sheevaplug_mpp_config); - -@@ -124,11 +133,11 @@ - - /* honor lower power consumption for plugs with out eSATA */ - if (machine_is_esata_sheevaplug()) -- kirkwood_sata_init(&sheeva_esata_sata_data); ++ else ++ kirkwood_mpp_conf(sheevaplug_mpp_config); ++ ++ kirkwood_uart0_init(); ++ kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25); ++ ++ if (gpio_request(29, "USB Power Enable") != 0 || ++ gpio_direction_output(29, 1) != 0) ++ pr_err("can't set up GPIO 29 (USB Power Enable)\n"); ++ kirkwood_ehci_init(); ++ ++ kirkwood_ge00_init(&sheevaplug_ge00_data); ++ ++ /* honor lower power consumption for plugs with out eSATA */ ++ if (machine_is_esata_sheevaplug()) + kirkwood_sata_init(&esata_sheevaplug_sata_data); - - /* enable sd wp and sd cd on plugs with esata */ - if (machine_is_esata_sheevaplug()) -- kirkwood_sdio_init(&sheeva_esata_mvsdio_data); ++ ++ /* enable sd wp and sd cd on plugs with esata */ ++ if (machine_is_esata_sheevaplug()) + kirkwood_sdio_init(&esata_sheevaplug_mvsdio_data); - else - kirkwood_sdio_init(&sheevaplug_mvsdio_data); - ++ else ++ kirkwood_sdio_init(&sheevaplug_mvsdio_data); ++ ++ platform_device_register(&sheevaplug_leds); ++} ++ ++#ifdef CONFIG_MACH_SHEEVAPLUG ++MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board") ++ /* Maintainer: shadi Ammouri */ ++ .atag_offset = 0x100, ++ .init_machine = sheevaplug_init, ++ .map_io = kirkwood_map_io, ++ .init_early = kirkwood_init_early, ++ .init_irq = kirkwood_init_irq, ++ .init_time = kirkwood_timer_init, ++ .restart = kirkwood_restart, ++MACHINE_END ++#endif ++ ++#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG ++MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board") ++ .atag_offset = 0x100, ++ .init_machine = sheevaplug_init, ++ .map_io = kirkwood_map_io, ++ .init_early = kirkwood_init_early, ++ .init_irq = kirkwood_init_irq, ++ .init_time = kirkwood_timer_init, ++ .restart = kirkwood_restart, ++MACHINE_END ++#endif 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 1969-12-31 17:00:00.000000000 -0700 -+++ b/arch/arm/mach-kirkwood/topkick-setup.c 2013-09-07 00:15:20.302272754 -0600 ++++ b/arch/arm/mach-kirkwood/topkick-setup.c 2013-11-08 01:39:48.728009483 -0700 @@ -0,0 +1,165 @@ +/* + * arch/arm/mach-kirkwood/topkick-setup.c @@ -3544,8 +4242,8 @@ diff -ruN a/arch/arm/mach-kirkwood/topkick-setup.c b/arch/arm/mach-kirkwood/topk + .restart = kirkwood_restart, +MACHINE_END diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c ---- a/arch/arm/plat-orion/common.c 2013-09-02 14:46:10.000000000 -0600 -+++ b/arch/arm/plat-orion/common.c 2013-09-07 00:15:20.312272775 -0600 +--- a/arch/arm/plat-orion/common.c 2013-11-03 16:41:51.000000000 -0700 ++++ b/arch/arm/plat-orion/common.c 2013-11-08 01:39:48.788011812 -0700 @@ -256,7 +256,9 @@ /***************************************************************************** * GE00 @@ -3558,8 +4256,8 @@ diff -ruN a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c static struct resource orion_ge00_shared_resources[] = { { diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c ---- a/drivers/ata/sata_mv.c 2013-09-02 14:46:10.000000000 -0600 -+++ b/drivers/ata/sata_mv.c 2013-09-07 00:15:20.322272610 -0600 +--- a/drivers/ata/sata_mv.c 2013-11-03 16:41:51.000000000 -0700 ++++ b/drivers/ata/sata_mv.c 2013-11-08 01:39:48.868014917 -0700 @@ -71,6 +71,7 @@ #include #include @@ -3568,7 +4266,7 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c #define DRV_NAME "sata_mv" #define DRV_VERSION "1.28" -@@ -1156,6 +1157,8 @@ +@@ -1161,6 +1162,8 @@ { int want_ncq = (protocol == ATA_PROT_NCQ); @@ -3578,9 +4276,9 @@ diff -ruN a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c int using_ncq = ((pp->pp_flags & MV_PP_FLAG_NCQ_EN) != 0); if (want_ncq != using_ncq) diff -ruN a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig ---- a/drivers/hwmon/Kconfig 2013-09-02 14:46:10.000000000 -0600 -+++ b/drivers/hwmon/Kconfig 2013-09-07 00:15:20.332272397 -0600 -@@ -1543,6 +1543,19 @@ +--- a/drivers/hwmon/Kconfig 2013-11-03 16:41:51.000000000 -0700 ++++ b/drivers/hwmon/Kconfig 2013-11-08 01:39:48.928017246 -0700 +@@ -1553,6 +1553,19 @@ help Support for the A/D converter on MC13783 and MC13892 PMIC. @@ -3601,9 +4299,9 @@ 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 2013-09-02 14:46:10.000000000 -0600 -+++ b/drivers/hwmon/Makefile 2013-09-07 00:15:20.342272161 -0600 -@@ -108,6 +108,7 @@ +--- a/drivers/hwmon/Makefile 2013-11-03 16:41:51.000000000 -0700 ++++ b/drivers/hwmon/Makefile 2013-11-08 01:39:48.928017246 -0700 +@@ -109,6 +109,7 @@ obj-$(CONFIG_SENSORS_MAX6650) += max6650.o obj-$(CONFIG_SENSORS_MAX6697) += max6697.o obj-$(CONFIG_SENSORS_MC13783_ADC)+= mc13783-adc.o @@ -3613,7 +4311,7 @@ diff -ruN a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile obj-$(CONFIG_SENSORS_NTC_THERMISTOR) += ntc_thermistor.o diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c --- a/drivers/hwmon/nsa3xx-hwmon.c 1969-12-31 17:00:00.000000000 -0700 -+++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-09-07 00:15:20.342272161 -0600 ++++ b/drivers/hwmon/nsa3xx-hwmon.c 2013-11-08 01:39:48.928017246 -0700 @@ -0,0 +1,251 @@ +/* + * drivers/hwmon/nsa3xx-hwmon.c @@ -3867,8 +4565,8 @@ diff -ruN a/drivers/hwmon/nsa3xx-hwmon.c b/drivers/hwmon/nsa3xx-hwmon.c +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:nsa3xx-hwmon"); diff -ruN a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig ---- a/drivers/leds/trigger/Kconfig 2013-09-02 14:46:10.000000000 -0600 -+++ b/drivers/leds/trigger/Kconfig 2013-09-07 00:15:20.352271939 -0600 +--- a/drivers/leds/trigger/Kconfig 2013-11-03 16:41:51.000000000 -0700 ++++ b/drivers/leds/trigger/Kconfig 2013-11-08 01:39:48.958018410 -0700 @@ -35,7 +35,6 @@ config LEDS_TRIGGER_IDE_DISK @@ -3878,9 +4576,9 @@ 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 2013-09-02 14:46:10.000000000 -0600 -+++ b/drivers/mmc/core/core.c 2013-09-07 00:15:20.352271939 -0600 -@@ -804,7 +804,7 @@ +--- a/drivers/mmc/core/core.c 2013-11-03 16:41:51.000000000 -0700 ++++ b/drivers/mmc/core/core.c 2013-11-08 01:39:49.008020351 -0700 +@@ -805,7 +805,7 @@ */ limit_us = 3000000; else @@ -3890,9 +4588,9 @@ 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 2013-09-02 14:46:10.000000000 -0600 -+++ b/drivers/mmc/core/sd.c 2013-09-07 00:15:20.362271734 -0600 -@@ -355,6 +355,15 @@ +--- a/drivers/mmc/core/sd.c 2013-11-03 16:41:51.000000000 -0700 ++++ b/drivers/mmc/core/sd.c 2013-11-08 01:39:49.008020351 -0700 +@@ -358,6 +358,15 @@ return -ENOMEM; } @@ -3909,8 +4607,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 2013-09-02 14:46:10.000000000 -0600 -+++ b/drivers/mmc/host/mvsdio.c 2013-09-07 00:15:20.362271734 -0600 +--- a/drivers/mmc/host/mvsdio.c 2013-11-03 16:41:51.000000000 -0700 ++++ b/drivers/mmc/host/mvsdio.c 2013-11-08 01:39:49.028021127 -0700 @@ -25,6 +25,7 @@ #include #include @@ -3929,7 +4627,7 @@ diff -ruN a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c diff -ruN a/include/linux/bubba3.h b/include/linux/bubba3.h --- a/include/linux/bubba3.h 1969-12-31 17:00:00.000000000 -0700 -+++ b/include/linux/bubba3.h 2013-09-07 00:15:20.372271543 -0600 ++++ b/include/linux/bubba3.h 2013-11-08 01:39:49.028021127 -0700 @@ -0,0 +1,41 @@ +/* + * (C) Copyright 2010 @@ -3974,7 +4672,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 1969-12-31 17:00:00.000000000 -0700 -+++ b/include/linux/nsa3xx-hwmon.h 2013-09-07 00:15:20.372271543 -0600 ++++ b/include/linux/nsa3xx-hwmon.h 2013-11-08 01:39:49.028021127 -0700 @@ -0,0 +1,21 @@ +/* + * include/linux/nsa3xx.hwmon.h diff --git a/core/linux-kirkwood/config b/core/linux-kirkwood/config index 896b50dad..6a7727874 100644 --- a/core/linux-kirkwood/config +++ b/core/linux-kirkwood/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.11.4-1 Kernel Configuration +# Linux/arm 3.12.0-1 Kernel Configuration # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -50,18 +50,17 @@ CONFIG_FHANDLE=y CONFIG_AUDIT=y # CONFIG_AUDITSYSCALL is not set # CONFIG_AUDIT_LOGINUID_IMMUTABLE is not set -CONFIG_HAVE_GENERIC_HARDIRQS=y # # IRQ subsystem # -CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_HARDIRQS_SW_RESEND=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_IRQ_DOMAIN=y # CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y CONFIG_KTIME_SCALAR=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y @@ -124,8 +123,10 @@ CONFIG_BLK_CGROUP=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y +# CONFIG_USER_NS is not set CONFIG_PID_NS=y CONFIG_NET_NS=y +# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set # CONFIG_SCHED_AUTOGROUP is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_RELAY is not set @@ -172,7 +173,6 @@ CONFIG_SLUB_DEBUG=y CONFIG_COMPAT_BRK=y # CONFIG_SLAB is not set CONFIG_SLUB=y -CONFIG_SLUB_CPU_PARTIAL=y CONFIG_PROFILING=y CONFIG_TRACEPOINTS=y CONFIG_OPROFILE=m @@ -223,6 +223,7 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y # CONFIG_BLK_DEV_INTEGRITY is not set # CONFIG_BLK_DEV_THROTTLING is not set +# CONFIG_BLK_CMDLINE_PARSER is not set # # Partition Types @@ -247,6 +248,7 @@ CONFIG_LDM_PARTITION=y # CONFIG_KARMA_PARTITION is not set CONFIG_EFI_PARTITION=y # CONFIG_SYSV68_PARTITION is not set +# CONFIG_CMDLINE_PARTITION is not set # # IO Schedulers @@ -312,6 +314,7 @@ CONFIG_ARCH_KIRKWOOD=y # # Marvell Kirkwood Implementations # +CONFIG_KIRKWOOD_LEGACY=y CONFIG_MACH_D2NET_V2=y CONFIG_MACH_DOCKSTAR=y CONFIG_MACH_ESATA_SHEEVAPLUG=y @@ -350,38 +353,7 @@ CONFIG_MACH_NSA325=y # Device tree entries # # CONFIG_ARCH_KIRKWOOD_DT is not set -# CONFIG_MACH_CLOUDBOX_DT is not set -# CONFIG_MACH_DB88F628X_BP_DT is not set -# CONFIG_MACH_DLINK_KIRKWOOD_DT is not set -# CONFIG_MACH_DREAMPLUG_DT is not set -# CONFIG_MACH_GURUPLUG_DT is not set -# CONFIG_MACH_IB62X0_DT is not set -# CONFIG_MACH_INETSPACE_V2_DT is not set -# CONFIG_MACH_IOMEGA_IX2_200_DT is not set -# CONFIG_MACH_KM_KIRKWOOD_DT is not set -# CONFIG_MACH_LSXL_DT is not set -# CONFIG_MACH_MPLCEC4_DT is not set -# CONFIG_MACH_NETSPACE_LITE_V2_DT is not set -# CONFIG_MACH_NETSPACE_MAX_V2_DT is not set -# CONFIG_MACH_NETSPACE_MINI_V2_DT is not set -# CONFIG_MACH_NETSPACE_V2_DT is not set -# CONFIG_MACH_OPENBLOCKS_A6_DT is not set -# CONFIG_MACH_READYNAS_DT is not set -# CONFIG_MACH_SHEEVAPLUG_DT is not set -# CONFIG_MACH_TOPKICK_DT is not set # CONFIG_PLAT_SPEAR is not set - -# -# ST-Ericsson AB U300/U335 Platform -# - -# -# ST-Ericsson Mobile Platform Products -# - -# -# ST-Ericsson U300/U335 Feature Selections -# CONFIG_PLAT_ORION=y CONFIG_PLAT_ORION_LEGACY=y @@ -421,6 +393,7 @@ CONFIG_ARM_NR_BANKS=8 # CONFIG_PCI=y CONFIG_PCI_SYSCALL=y +# CONFIG_PCI_MSI is not set # CONFIG_PCI_DEBUG is not set # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set # CONFIG_PCI_STUB is not set @@ -431,7 +404,6 @@ CONFIG_PCI_SYSCALL=y # # PCI host controller drivers # -# CONFIG_PCI_MVEBU is not set # CONFIG_PCIEPORTBUS is not set # CONFIG_PCCARD is not set @@ -447,6 +419,13 @@ CONFIG_ARCH_NR_GPIO=0 # CONFIG_PREEMPT_VOLUNTARY is not set CONFIG_PREEMPT=y CONFIG_PREEMPT_COUNT=y +CONFIG_HZ_FIXED=0 +CONFIG_HZ_100=y +# CONFIG_HZ_200 is not set +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +# CONFIG_HZ_500 is not set +# CONFIG_HZ_1000 is not set CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y CONFIG_AEABI=y @@ -456,6 +435,7 @@ CONFIG_AEABI=y CONFIG_HAVE_ARCH_PFN_VALID=y # CONFIG_HIGHMEM is not set CONFIG_HW_PERF_EVENTS=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_HAVE_MEMBLOCK=y @@ -474,6 +454,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_NEED_PER_CPU_KM=y # CONFIG_CLEANCACHE is not set # CONFIG_FRONTSWAP is not set +# CONFIG_CMA is not set # CONFIG_ZBUD is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_ALIGNMENT_TRAP=y @@ -521,14 +502,20 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # # ARM CPU frequency scaling drivers # -# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set -# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set -# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set + +# +# CPU Idle +# CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y + +# +# ARM CPU Idle Drivers +# +CONFIG_ARM_KIRKWOOD_CPUIDLE=y # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set # @@ -554,15 +541,23 @@ CONFIG_COREDUMP=y # # Power management options # +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_PM_SLEEP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set CONFIG_PM_RUNTIME=y CONFIG_PM=y CONFIG_PM_DEBUG=y CONFIG_PM_ADVANCED_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_PM_SLEEP_DEBUG=y # CONFIG_APM_EMULATION is not set CONFIG_PM_CLK=y # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set CONFIG_CPU_PM=y -# CONFIG_ARM_CPU_SUSPEND is not set +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARM_CPU_SUSPEND=y CONFIG_NET=y # @@ -601,7 +596,6 @@ CONFIG_IP_MROUTE=y CONFIG_IP_MROUTE_MULTIPLE_TABLES=y CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y -CONFIG_ARPD=y CONFIG_SYN_COOKIES=y # CONFIG_NET_IPVTI is not set CONFIG_INET_AH=m @@ -696,7 +690,6 @@ CONFIG_NF_NAT_FTP=m CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m -CONFIG_NETFILTER_TPROXY=m CONFIG_NETFILTER_XTABLES=m # @@ -806,6 +799,7 @@ CONFIG_IP_NF_MATCH_ECN=m CONFIG_IP_NF_MATCH_TTL=m CONFIG_IP_NF_FILTER=m CONFIG_IP_NF_TARGET_REJECT=m +# CONFIG_IP_NF_TARGET_SYNPROXY is not set CONFIG_IP_NF_TARGET_ULOG=m CONFIG_NF_NAT_IPV4=m CONFIG_IP_NF_TARGET_MASQUERADE=m @@ -842,6 +836,7 @@ CONFIG_IP6_NF_MATCH_RT=m CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m +# CONFIG_IP6_NF_TARGET_SYNPROXY is not set CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m # CONFIG_IP6_NF_SECURITY is not set @@ -931,6 +926,7 @@ CONFIG_NET_SCH_CHOKE=m # CONFIG_NET_SCH_QFQ is not set # CONFIG_NET_SCH_CODEL is not set # CONFIG_NET_SCH_FQ_CODEL is not set +CONFIG_NET_SCH_FQ=m # CONFIG_NET_SCH_INGRESS is not set # CONFIG_NET_SCH_PLUG is not set @@ -1158,7 +1154,6 @@ CONFIG_REGMAP=y CONFIG_REGMAP_I2C=m CONFIG_REGMAP_SPI=m CONFIG_DMA_SHARED_BUFFER=y -# CONFIG_CMA is not set # # Bus devices @@ -1257,9 +1252,9 @@ CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_DOCG4 is not set # CONFIG_MTD_NAND_CAFE is not set +# CONFIG_MTD_NAND_PXA3xx is not set # CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set -# CONFIG_MTD_ALAUDA is not set CONFIG_MTD_NAND_ORION=y # CONFIG_MTD_ONENAND is not set @@ -1416,6 +1411,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m # CONFIG_SCSI_MVSAS is not set # CONFIG_SCSI_MVUMI is not set # CONFIG_SCSI_ARCMSR is not set +# CONFIG_SCSI_ESAS2R is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_MEGARAID_SAS is not set @@ -1695,6 +1691,7 @@ CONFIG_NET_VENDOR_INTEL=y # CONFIG_IGBVF is not set # CONFIG_IXGB is not set # CONFIG_IXGBE is not set +# CONFIG_I40E is not set CONFIG_NET_VENDOR_I825XX=y # CONFIG_IP1000 is not set # CONFIG_JME is not set @@ -1832,6 +1829,7 @@ CONFIG_USB_NET_CDCETHER=m CONFIG_USB_NET_CDC_NCM=m CONFIG_USB_NET_CDC_MBIM=m CONFIG_USB_NET_DM9601=m +CONFIG_USB_NET_SR9700=m CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m @@ -1885,6 +1883,7 @@ CONFIG_ATH9K_PCI=y CONFIG_ATH9K_AHB=y # CONFIG_ATH9K_DEBUGFS is not set # CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set +CONFIG_ATH9K_RFKILL=y CONFIG_ATH9K_HTC=m # CONFIG_ATH9K_HTC_DEBUGFS is not set CONFIG_CARL9170=m @@ -1973,6 +1972,7 @@ CONFIG_RT73USB=m CONFIG_RT2800USB=m CONFIG_RT2800USB_RT33XX=y CONFIG_RT2800USB_RT35XX=y +CONFIG_RT2800USB_RT3573=y # CONFIG_RT2800USB_RT53XX is not set # CONFIG_RT2800USB_RT55XX is not set CONFIG_RT2800USB_UNKNOWN=y @@ -2168,8 +2168,9 @@ CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y -# CONFIG_VT_HW_CONSOLE_BINDING is not set +CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y CONFIG_DEVPTS_MULTIPLE_INSTANCES=y CONFIG_LEGACY_PTYS=y @@ -2212,6 +2213,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_ARC is not set # CONFIG_SERIAL_RP2 is not set # CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_ST_ASC is not set # CONFIG_HVC_DCC is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_HW_RANDOM is not set @@ -2258,7 +2260,7 @@ CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_DESIGNWARE_PCI is not set # CONFIG_I2C_EG20T is not set # CONFIG_I2C_GPIO is not set -CONFIG_I2C_MV64XXX=y +CONFIG_I2C_MV64XXX=m # CONFIG_I2C_OCORES is not set # CONFIG_I2C_PCA_PLATFORM is not set # CONFIG_I2C_PXA_PCI is not set @@ -2290,6 +2292,7 @@ CONFIG_SPI_MASTER=y # CONFIG_SPI_ALTERA is not set # CONFIG_SPI_BITBANG is not set # CONFIG_SPI_GPIO is not set +# CONFIG_SPI_FSL_DSPI is not set # CONFIG_SPI_OC_TINY is not set CONFIG_SPI_ORION=y # CONFIG_SPI_PXA2XX is not set @@ -2386,6 +2389,10 @@ CONFIG_GPIO_SYSFS=y # AC97 GPIO expanders: # +# +# LPC GPIO expanders: +# + # # MODULbus GPIO expanders: # @@ -2433,13 +2440,12 @@ CONFIG_POWER_SUPPLY=y # CONFIG_BATTERY_BQ27x00 is not set # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set -# CONFIG_CHARGER_ISP1704 is not set # CONFIG_CHARGER_MAX8903 is not set # CONFIG_CHARGER_LP8727 is not set # CONFIG_CHARGER_GPIO is not set # CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_BQ24190 is not set # CONFIG_CHARGER_SMB347 is not set -# CONFIG_BATTERY_GOLDFISH is not set # CONFIG_POWER_RESET is not set # CONFIG_POWER_RESET_RESTART is not set # CONFIG_POWER_AVS is not set @@ -2480,6 +2486,7 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_GL520SM is not set # CONFIG_SENSORS_GPIO_FAN is not set # CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_HTU21 is not set # CONFIG_SENSORS_IIO_HWMON is not set # CONFIG_SENSORS_IT87 is not set # CONFIG_SENSORS_JC42 is not set @@ -2768,6 +2775,7 @@ CONFIG_USB_GSPCA_SQ905=m CONFIG_USB_GSPCA_SQ905C=m CONFIG_USB_GSPCA_SQ930X=m CONFIG_USB_GSPCA_STK014=m +# CONFIG_USB_GSPCA_STK1135 is not set CONFIG_USB_GSPCA_STV0680=m CONFIG_USB_GSPCA_SUNPLUS=m CONFIG_USB_GSPCA_T613=m @@ -2797,8 +2805,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_TLG2300=m CONFIG_VIDEO_USBVISION=m -CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_COMMON=m CONFIG_VIDEO_STK1160_AC97=y +CONFIG_VIDEO_STK1160=m # # Analog/digital TV USB devices @@ -2912,6 +2921,7 @@ CONFIG_VIDEO_TIMBERDALE=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_SCALE_CROP=m CONFIG_SOC_CAMERA_PLATFORM=m +# CONFIG_VIDEO_RCAR_VIN is not set CONFIG_VIDEO_SH_MOBILE_CSI2=m CONFIG_VIDEO_SH_MOBILE_CEU=m # CONFIG_V4L_MEM2MEM_DRIVERS is not set @@ -2922,6 +2932,7 @@ CONFIG_VIDEO_SH_MOBILE_CEU=m # CONFIG_SMS_SDIO_DRV=m CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_TEA575X=m # CONFIG_RADIO_SI470X is not set CONFIG_USB_MR800=m CONFIG_USB_DSBR=m @@ -2952,7 +2963,6 @@ CONFIG_CYPRESS_FIRMWARE=m CONFIG_DVB_B2C2_FLEXCOP=m CONFIG_SMS_SIANO_MDTV=m CONFIG_SMS_SIANO_RC=y -# CONFIG_SMS_SIANO_DEBUGFS is not set # # Media ancillary drivers (tuners, sensors, i2c, frontends) @@ -3257,6 +3267,9 @@ CONFIG_BACKLIGHT_GENERIC=m # CONFIG_BACKLIGHT_LM3630 is not set # CONFIG_BACKLIGHT_LM3639 is not set # CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_GPIO is not set +# CONFIG_BACKLIGHT_LV5207LP is not set +# CONFIG_BACKLIGHT_BD6107 is not set # # Console display driver support @@ -3302,7 +3315,6 @@ CONFIG_SND_DRIVERS=y # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set # CONFIG_SND_AC97_POWER_SAVE is not set -CONFIG_SND_TEA575X=m # CONFIG_SND_PCI is not set CONFIG_SND_ARM=y CONFIG_SND_SPI=y @@ -3317,11 +3329,9 @@ CONFIG_SND_SOC=m # CONFIG_SND_ATMEL_SOC is not set # CONFIG_SND_DESIGNWARE_I2S is not set CONFIG_SND_KIRKWOOD_SOC=m -CONFIG_SND_KIRKWOOD_SOC_I2S=m CONFIG_SND_KIRKWOOD_SOC_OPENRD=m CONFIG_SND_KIRKWOOD_SOC_T5325=m CONFIG_SND_SOC_I2C_AND_SPI=m -# CONFIG_SND_SOC_ALL_CODECS is not set CONFIG_SND_SOC_ALC5623=m CONFIG_SND_SOC_CS42L51=m # CONFIG_SND_SIMPLE_CARD is not set @@ -3409,6 +3419,7 @@ CONFIG_HID_THRUSTMASTER=m CONFIG_THRUSTMASTER_FF=y CONFIG_HID_WACOM=m CONFIG_HID_WIIMOTE=m +# CONFIG_HID_XINMO is not set CONFIG_HID_ZEROPLUS=m CONFIG_ZEROPLUS_FF=y CONFIG_HID_ZYDACRON=m @@ -3425,6 +3436,7 @@ CONFIG_USB_HIDDEV=y # I2C HID support # # CONFIG_I2C_HID is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y CONFIG_USB_SUPPORT=y CONFIG_USB_COMMON=y CONFIG_USB_ARCH_HAS_HCD=y @@ -3447,7 +3459,6 @@ CONFIG_USB_WUSB=m # # CONFIG_USB_C67X00_HCD is not set CONFIG_USB_XHCI_HCD=y -# CONFIG_USB_XHCI_HCD_DEBUGGING is not set CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_ROOT_HUB_TT=y CONFIG_USB_EHCI_TT_NEWSCHED=y @@ -3459,6 +3470,7 @@ CONFIG_USB_EHCI_HCD_ORION=y # CONFIG_USB_ISP1760_HCD is not set # CONFIG_USB_ISP1362_HCD is not set # CONFIG_USB_FUSBH200_HCD is not set +# CONFIG_USB_FOTG210_HCD is not set # CONFIG_USB_OHCI_HCD is not set # CONFIG_USB_UHCI_HCD is not set # CONFIG_USB_SL811_HCD is not set @@ -3466,6 +3478,7 @@ CONFIG_USB_EHCI_HCD_ORION=y # CONFIG_USB_WHCI_HCD is not set # CONFIG_USB_HWA_HCD is not set # CONFIG_USB_HCD_SSB is not set +# CONFIG_USB_HCD_TEST_MODE is not set # # USB Device Class drivers @@ -3511,6 +3524,7 @@ CONFIG_USB_MICROTEK=m # CONFIG_USB_SERIAL=m CONFIG_USB_SERIAL_GENERIC=y +# CONFIG_USB_SERIAL_SIMPLE is not set CONFIG_USB_SERIAL_AIRCABLE=m CONFIG_USB_SERIAL_ARK3116=m CONFIG_USB_SERIAL_BELKIN=m @@ -3521,7 +3535,6 @@ CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m -CONFIG_USB_SERIAL_FUNSOFT=m CONFIG_USB_SERIAL_VISOR=m CONFIG_USB_SERIAL_IPAQ=m CONFIG_USB_SERIAL_IR=m @@ -3551,17 +3564,14 @@ CONFIG_USB_SERIAL_MCT_U232=m # CONFIG_USB_SERIAL_METRO is not set CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7840=m -CONFIG_USB_SERIAL_MOTOROLA=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m # CONFIG_USB_SERIAL_QCAUX is not set CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_SPCP8X5=m -CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m # CONFIG_USB_SERIAL_SAFE_PADDED is not set -CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m CONFIG_USB_SERIAL_SYMBOL=m CONFIG_USB_SERIAL_TI=m @@ -3571,15 +3581,11 @@ CONFIG_USB_SERIAL_WWAN=m CONFIG_USB_SERIAL_OPTION=m CONFIG_USB_SERIAL_OMNINET=m CONFIG_USB_SERIAL_OPTICON=m -# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set CONFIG_USB_SERIAL_XSENS_MT=m -# CONFIG_USB_SERIAL_ZIO is not set # CONFIG_USB_SERIAL_WISHBONE is not set CONFIG_USB_SERIAL_ZTE=m # CONFIG_USB_SERIAL_SSU100 is not set # CONFIG_USB_SERIAL_QT2 is not set -# CONFIG_USB_SERIAL_FLASHLOADER is not set -# CONFIG_USB_SERIAL_SUUNTO is not set CONFIG_USB_SERIAL_DEBUG=m # @@ -3604,14 +3610,18 @@ CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set +# CONFIG_USB_EHSET_TEST_FIXTURE is not set CONFIG_USB_ISIGHTFW=m # CONFIG_USB_YUREX is not set CONFIG_USB_EZUSB_FX2=m CONFIG_USB_HSIC_USB3503=m -CONFIG_USB_PHY=y + +# +# USB Physical Layer drivers +# +# CONFIG_USB_PHY is not set # CONFIG_NOP_USB_XCEIV is not set -# CONFIG_OMAP_CONTROL_USB is not set -# CONFIG_OMAP_USB3 is not set +# CONFIG_AM335X_PHY_USB is not set # CONFIG_SAMSUNG_USB2PHY is not set # CONFIG_SAMSUNG_USB3PHY is not set # CONFIG_USB_GPIO_VBUS is not set @@ -3667,14 +3677,14 @@ CONFIG_LEDS_GPIO=y # CONFIG_LEDS_LP5521 is not set # CONFIG_LEDS_LP5523 is not set # CONFIG_LEDS_LP5562 is not set +# CONFIG_LEDS_LP8501 is not set # CONFIG_LEDS_PCA955X is not set -# CONFIG_LEDS_PCA9633 is not set +# CONFIG_LEDS_PCA963X is not set # 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_RENESAS_TPU is not set # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_LM355x is not set # CONFIG_LEDS_OT200 is not set @@ -3731,11 +3741,11 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_X1205 is not set # CONFIG_RTC_DRV_PCF2127 is not set # CONFIG_RTC_DRV_PCF8523 is not set -CONFIG_RTC_DRV_PCF8563=y +CONFIG_RTC_DRV_PCF8563=m # CONFIG_RTC_DRV_PCF8583 is not set # CONFIG_RTC_DRV_M41T80 is not set # CONFIG_RTC_DRV_BQ32K is not set -CONFIG_RTC_DRV_S35390A=y +CONFIG_RTC_DRV_S35390A=m # CONFIG_RTC_DRV_FM3130 is not set # CONFIG_RTC_DRV_RX8581 is not set # CONFIG_RTC_DRV_RX8025 is not set @@ -3778,6 +3788,7 @@ CONFIG_RTC_DRV_S35390A=y # on-CPU RTC drivers # CONFIG_RTC_DRV_MV=y +# CONFIG_RTC_DRV_MOXART is not set # # HID Sensor RTC drivers @@ -3826,11 +3837,13 @@ CONFIG_W35UND=m CONFIG_PRISM2_USB=m # CONFIG_ECHO is not set # CONFIG_COMEDI is not set -CONFIG_ASUS_OLED=m CONFIG_R8187SE=m CONFIG_RTL8192U=m # CONFIG_RTLLIB is not set CONFIG_R8712U=y +CONFIG_R8188EU=m +# CONFIG_88EU_AP_MODE is not set +# CONFIG_88EU_P2P is not set # CONFIG_RTS5139 is not set # CONFIG_TRANZPORT is not set # CONFIG_IDE_PHISON is not set @@ -3893,7 +3906,6 @@ CONFIG_USB_SERIAL_QUATECH2=m # Digital gyroscope sensors # # CONFIG_ADIS16060 is not set -# CONFIG_ADIS16260 is not set # # Network Analyzer, Impedance Converters @@ -3957,12 +3969,18 @@ CONFIG_FB_XGI=m # CONFIG_ANDROID is not set CONFIG_USB_WPAN_HCD=m # CONFIG_WIMAX_GDM72XX is not set +# CONFIG_LTE_GDM724X is not set CONFIG_NET_VENDOR_SILICOM=y # CONFIG_SBYPASS is not set # CONFIG_BPCTL is not set # CONFIG_CED1401 is not set # CONFIG_DGRP is not set +# CONFIG_USB_DWC2 is not set +# CONFIG_LUSTRE_FS is not set CONFIG_USB_BTMTK=m +# CONFIG_XILLYBUS is not set +# CONFIG_DGNC is not set +# CONFIG_DGAP is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_COMMON_CLK=y @@ -3998,22 +4016,24 @@ CONFIG_IIO=m # # Accelerometers # +# CONFIG_BMA180 is not set # CONFIG_HID_SENSOR_ACCEL_3D is not set -# CONFIG_KXSD9 is not set # CONFIG_IIO_ST_ACCEL_3AXIS is not set +# CONFIG_KXSD9 is not set # # Analog to digital converters # # CONFIG_AD7266 is not set # CONFIG_AD7298 is not set -# CONFIG_AD7923 is not set +# CONFIG_AD7476 is not set # CONFIG_AD7791 is not set # CONFIG_AD7793 is not set -# CONFIG_AD7476 is not set # CONFIG_AD7887 is not set +# CONFIG_AD7923 is not set # CONFIG_MAX1363 is not set # CONFIG_MCP320X is not set +# CONFIG_NAU7802 is not set # CONFIG_TI_ADC081C is not set # @@ -4035,14 +4055,14 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # CONFIG_AD5360 is not set # CONFIG_AD5380 is not set # CONFIG_AD5421 is not set -# CONFIG_AD5624R_SPI is not set # CONFIG_AD5446 is not set # CONFIG_AD5449 is not set # CONFIG_AD5504 is not set +# CONFIG_AD5624R_SPI is not set +# CONFIG_AD5686 is not set # CONFIG_AD5755 is not set # CONFIG_AD5764 is not set # CONFIG_AD5791 is not set -# CONFIG_AD5686 is not set # CONFIG_AD7303 is not set # CONFIG_MAX517 is not set # CONFIG_MCP4725 is not set @@ -4067,6 +4087,7 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # CONFIG_ADIS16080 is not set # CONFIG_ADIS16130 is not set # CONFIG_ADIS16136 is not set +# CONFIG_ADIS16260 is not set # CONFIG_ADXRS450 is not set # CONFIG_HID_SENSOR_GYRO_3D is not set # CONFIG_IIO_ST_GYRO_3AXIS is not set @@ -4083,9 +4104,10 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # Light sensors # # CONFIG_ADJD_S311 is not set +# CONFIG_APDS9300 is not set +# CONFIG_HID_SENSOR_ALS is not set # CONFIG_SENSORS_TSL2563 is not set # CONFIG_VCNL4000 is not set -# CONFIG_HID_SENSOR_ALS is not set # # Magnetometer sensors @@ -4095,9 +4117,14 @@ CONFIG_HID_SENSOR_IIO_COMMON=m # CONFIG_IIO_ST_MAGN_3AXIS is not set # -# Pressure Sensors +# Pressure sensors # # CONFIG_IIO_ST_PRESS is not set + +# +# Temperature sensors +# +# CONFIG_TMP006 is not set # CONFIG_VME_BUS is not set # CONFIG_PWM is not set # CONFIG_IPACK_BUS is not set @@ -4150,6 +4177,7 @@ CONFIG_BTRFS_FS=m # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set # CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set # CONFIG_BTRFS_DEBUG is not set +# CONFIG_BTRFS_ASSERT is not set CONFIG_NILFS2_FS=m CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -4222,6 +4250,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_ECRYPT_FS is not set CONFIG_HFS_FS=m CONFIG_HFSPLUS_FS=m +# CONFIG_HFSPLUS_FS_POSIX_ACL is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set @@ -4275,7 +4304,6 @@ CONFIG_AUFS_HNOTIFY=y CONFIG_AUFS_HFSNOTIFY=y CONFIG_AUFS_EXPORT=y CONFIG_AUFS_RDU=y -CONFIG_AUFS_PROC_MAP=y CONFIG_AUFS_SP_IATTR=y CONFIG_AUFS_SHWH=y CONFIG_AUFS_BR_RAMFS=y @@ -4527,7 +4555,16 @@ CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL_UART_NONE=y # CONFIG_DEBUG_ICEDCC is not set # CONFIG_DEBUG_SEMIHOSTING is not set -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +# CONFIG_DEBUG_LL_UART_8250 is not set +# CONFIG_DEBUG_LL_UART_PL01X is not set +CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" +# CONFIG_DEBUG_UART_PL01X is not set +CONFIG_DEBUG_UART_8250=y +CONFIG_DEBUG_UART_PHYS=0xf1012000 +CONFIG_DEBUG_UART_VIRT=0xfed12000 +CONFIG_DEBUG_UART_8250_SHIFT=2 +# CONFIG_DEBUG_UART_8250_WORD is not set +# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h" CONFIG_EARLY_PRINTK=y # CONFIG_ARM_KPROBES_TEST is not set @@ -4554,6 +4591,7 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_APPARMOR_HASH=y # CONFIG_SECURITY_YAMA is not set # CONFIG_IMA is not set # CONFIG_EVM is not set @@ -4626,6 +4664,7 @@ CONFIG_CRYPTO_VMAC=m # CONFIG_CRYPTO_CRC32C=y # CONFIG_CRYPTO_CRC32 is not set +CONFIG_CRYPTO_CRCT10DIF=m CONFIG_CRYPTO_GHASH=m CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y @@ -4634,7 +4673,7 @@ CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_RMD256=m CONFIG_CRYPTO_RMD320=m -CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_SHA256=m CONFIG_CRYPTO_SHA512=m diff --git a/core/linux-kirkwood/linux-kirkwood.install b/core/linux-kirkwood/linux-kirkwood.install index 7d631550f..aa5fa4ed4 100644 --- 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.11.1-2-ARCH +KERNEL_VERSION=3.12.0-1-ARCH post_install () { # updating module dependencies