Loading MAINTAINERS +6 −6 Original line number Original line Diff line number Diff line Loading @@ -781,11 +781,10 @@ M: Philipp Zabel <philipp.zabel@gmail.com> S: Maintained S: Maintained ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support M: Lennert Buytenhek <buytenh@marvell.com> M: Lennert Buytenhek <kernel@wantstofly.org> M: Nicolas Pitre <nico@marvell.com> M: Nicolas Pitre <nico@fluxnic.net> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://git.marvell.com/orion S: Odd Fixes S: Maintained F: arch/arm/mach-loki/ F: arch/arm/mach-loki/ F: arch/arm/mach-kirkwood/ F: arch/arm/mach-kirkwood/ F: arch/arm/mach-mv78xx0/ F: arch/arm/mach-mv78xx0/ Loading Loading @@ -3644,7 +3643,8 @@ F: drivers/net/wireless/mwl8k.c MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER M: Nicolas Pitre <nico@fluxnic.net> M: Nicolas Pitre <nico@fluxnic.net> S: Maintained S: Odd Fixes F: drivers/mmc/host/mvsdio.* MARVELL YUKON / SYSKONNECT DRIVER MARVELL YUKON / SYSKONNECT DRIVER M: Mirko Lindner <mlindner@syskonnect.de> M: Mirko Lindner <mlindner@syskonnect.de> Loading Loading @@ -5141,7 +5141,7 @@ F: mm/sl?b.c SMC91x ETHERNET DRIVER SMC91x ETHERNET DRIVER M: Nicolas Pitre <nico@fluxnic.net> M: Nicolas Pitre <nico@fluxnic.net> S: Maintained S: Odd Fixes F: drivers/net/smc91x.* F: drivers/net/smc91x.* SMSC47B397 HARDWARE MONITOR DRIVER SMSC47B397 HARDWARE MONITOR DRIVER Loading arch/arm/mach-kirkwood/Kconfig +18 −0 Original line number Original line Diff line number Diff line Loading @@ -38,6 +38,12 @@ config MACH_ESATA_SHEEVAPLUG Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the Marvell eSATA SheevaPlug Reference Board. Marvell eSATA SheevaPlug Reference Board. config MACH_GURUPLUG bool "Marvell GuruPlug Reference Board" help Say 'Y' here if you want your kernel to support the Marvell GuruPlug Reference Board. config MACH_TS219 config MACH_TS219 bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS" bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS" help help Loading Loading @@ -81,6 +87,18 @@ config MACH_INETSPACE_V2 Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the LaCie Internet Space v2 NAS. LaCie Internet Space v2 NAS. config MACH_NET2BIG_V2 bool "LaCie 2Big Network v2 NAS Board" help Say 'Y' here if you want your kernel to support the LaCie 2Big Network v2 NAS. config MACH_NET5BIG_V2 bool "LaCie 5Big Network v2 NAS Board" help Say 'Y' here if you want your kernel to support the LaCie 5Big Network v2 NAS. endmenu endmenu endif endif arch/arm/mach-kirkwood/Makefile +3 −0 Original line number Original line Diff line number Diff line Loading @@ -6,10 +6,13 @@ obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o arch/arm/mach-kirkwood/guruplug-setup.c 0 → 100644 +131 −0 Original line number Original line Diff line number Diff line /* * 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 <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/mtd/partitions.h> #include <linux/ata_platform.h> #include <linux/mv643xx_eth.h> #include <linux/gpio.h> #include <linux/leds.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <mach/kirkwood.h> #include <plat/mvsdio.h> #include "common.h" #include "mpp.h" 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 */ }; static struct gpio_led guruplug_led_pins[] = { { .name = "guruplug:red:health", .gpio = 46, .active_low = 1, }, { .name = "guruplug:green:health", .gpio = 47, .active_low = 1, }, { .name = "guruplug:red:wmode", .gpio = 48, .active_low = 1, }, { .name = "guruplug:green:wmode", .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 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(); kirkwood_mpp_conf(guruplug_mpp_config); kirkwood_uart0_init(); kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25); 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); } MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board") /* Maintainer: Siddarth Gore <gores@marvell.com> */ .phys_io = KIRKWOOD_REGS_PHYS_BASE, .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, .boot_params = 0x00000100, .init_machine = guruplug_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, .timer = &kirkwood_timer, MACHINE_END arch/arm/mach-kirkwood/netxbig_v2-setup.c 0 → 100644 +415 −0 Original line number Original line Diff line number Diff line /* * arch/arm/mach-kirkwood/netxbig_v2-setup.c * * LaCie 2Big and 5Big Network v2 board setup * * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com> * * 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 <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/mtd/physmap.h> #include <linux/spi/flash.h> #include <linux/spi/spi.h> #include <linux/ata_platform.h> #include <linux/mv643xx_eth.h> #include <linux/i2c.h> #include <linux/i2c/at24.h> #include <linux/input.h> #include <linux/gpio.h> #include <linux/gpio_keys.h> #include <linux/leds.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <mach/kirkwood.h> #include <plat/time.h> #include "common.h" #include "mpp.h" /***************************************************************************** * 512KB SPI Flash on Boot Device (MACRONIX MX25L4005) ****************************************************************************/ static struct mtd_partition netxbig_v2_flash_parts[] = { { .name = "u-boot", .size = MTDPART_SIZ_FULL, .offset = 0, .mask_flags = MTD_WRITEABLE, /* force read-only */ }, }; static const struct flash_platform_data netxbig_v2_flash = { .type = "mx25l4005a", .name = "spi_flash", .parts = netxbig_v2_flash_parts, .nr_parts = ARRAY_SIZE(netxbig_v2_flash_parts), }; static struct spi_board_info __initdata netxbig_v2_spi_slave_info[] = { { .modalias = "m25p80", .platform_data = &netxbig_v2_flash, .irq = -1, .max_speed_hz = 20000000, .bus_num = 0, .chip_select = 0, }, }; /***************************************************************************** * Ethernet ****************************************************************************/ static struct mv643xx_eth_platform_data netxbig_v2_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(8), }; static struct mv643xx_eth_platform_data netxbig_v2_ge01_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(0), }; /***************************************************************************** * I2C devices ****************************************************************************/ static struct at24_platform_data at24c04 = { .byte_len = SZ_4K / 8, .page_size = 16, }; /* * i2c addr | chip | description * 0x50 | HT24LC04 | eeprom (512B) */ static struct i2c_board_info __initdata netxbig_v2_i2c_info[] = { { I2C_BOARD_INFO("24c04", 0x50), .platform_data = &at24c04, } }; /***************************************************************************** * SATA ****************************************************************************/ static struct mv_sata_platform_data netxbig_v2_sata_data = { .n_ports = 2, }; static int __initdata netxbig_v2_gpio_hdd_power[] = { 16, 17, 41, 42, 43 }; static void __init netxbig_v2_sata_power_init(void) { int i; int err; int hdd_nb; if (machine_is_net2big_v2()) hdd_nb = 2; else hdd_nb = 5; /* Power up all hard disks. */ for (i = 0; i < hdd_nb; i++) { err = gpio_request(netxbig_v2_gpio_hdd_power[i], NULL); if (err == 0) { err = gpio_direction_output( netxbig_v2_gpio_hdd_power[i], 1); /* Free the HDD power GPIOs. This allow user-space to * configure them via the gpiolib sysfs interface. */ gpio_free(netxbig_v2_gpio_hdd_power[i]); } if (err) pr_err("netxbig_v2: failed to power up HDD%d\n", i + 1); } } /***************************************************************************** * GPIO keys ****************************************************************************/ #define NETXBIG_V2_GPIO_SWITCH_POWER_ON 13 #define NETXBIG_V2_GPIO_SWITCH_POWER_OFF 15 #define NETXBIG_V2_GPIO_FUNC_BUTTON 34 #define NETXBIG_V2_SWITCH_POWER_ON 0x1 #define NETXBIG_V2_SWITCH_POWER_OFF 0x2 static struct gpio_keys_button netxbig_v2_buttons[] = { [0] = { .type = EV_SW, .code = NETXBIG_V2_SWITCH_POWER_ON, .gpio = NETXBIG_V2_GPIO_SWITCH_POWER_ON, .desc = "Back power switch (on|auto)", .active_low = 1, }, [1] = { .type = EV_SW, .code = NETXBIG_V2_SWITCH_POWER_OFF, .gpio = NETXBIG_V2_GPIO_SWITCH_POWER_OFF, .desc = "Back power switch (auto|off)", .active_low = 1, }, [2] = { .code = KEY_OPTION, .gpio = NETXBIG_V2_GPIO_FUNC_BUTTON, .desc = "Function button", .active_low = 1, }, }; static struct gpio_keys_platform_data netxbig_v2_button_data = { .buttons = netxbig_v2_buttons, .nbuttons = ARRAY_SIZE(netxbig_v2_buttons), }; static struct platform_device netxbig_v2_gpio_buttons = { .name = "gpio-keys", .id = -1, .dev = { .platform_data = &netxbig_v2_button_data, }, }; /***************************************************************************** * GPIO LEDs ****************************************************************************/ /* * The LEDs are controlled by a CPLD and can be configured through a GPIO * extension bus: * * - address register : bit [0-2] -> GPIO [47-49] * - data register : bit [0-2] -> GPIO [44-46] * - enable register : GPIO 29 * * Address register selection: * * addr | register * ---------------------------- * 0 | front LED * 1 | front LED brightness * 2 | HDD LED brightness * 3 | HDD1 LED * 4 | HDD2 LED * 5 | HDD3 LED * 6 | HDD4 LED * 7 | HDD5 LED * * Data register configuration: * * data | LED brightness * ------------------------------------------------- * 0 | min (off) * - | - * 7 | max * * data | front LED mode * ------------------------------------------------- * 0 | fix off * 1 | fix blue on * 2 | fix red on * 3 | blink blue on=1 sec and blue off=1 sec * 4 | blink red on=1 sec and red off=1 sec * 5 | blink blue on=2.5 sec and red on=0.5 sec * 6 | blink blue on=1 sec and red on=1 sec * 7 | blink blue on=0.5 sec and blue off=2.5 sec * * data | HDD LED mode * ------------------------------------------------- * 0 | fix blue on * 1 | SATA activity blink * 2 | fix red on * 3 | blink blue on=1 sec and blue off=1 sec * 4 | blink red on=1 sec and red off=1 sec * 5 | blink blue on=2.5 sec and red on=0.5 sec * 6 | blink blue on=1 sec and red on=1 sec * 7 | blink blue on=0.5 sec and blue off=2.5 sec */ /***************************************************************************** * Timer ****************************************************************************/ static void netxbig_v2_timer_init(void) { kirkwood_tclk = 166666667; orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk); } struct sys_timer netxbig_v2_timer = { .init = netxbig_v2_timer_init, }; /***************************************************************************** * General Setup ****************************************************************************/ static unsigned int net2big_v2_mpp_config[] __initdata = { MPP0_SPI_SCn, MPP1_SPI_MOSI, MPP2_SPI_SCK, MPP3_SPI_MISO, MPP6_SYSRST_OUTn, MPP7_GPO, /* Request power-off */ MPP8_TW_SDA, MPP9_TW_SCK, MPP10_UART0_TXD, MPP11_UART0_RXD, MPP13_GPIO, /* Rear power switch (on|auto) */ MPP14_GPIO, /* USB fuse alarm */ MPP15_GPIO, /* Rear power switch (auto|off) */ MPP16_GPIO, /* SATA HDD1 power */ MPP17_GPIO, /* SATA HDD2 power */ MPP20_SATA1_ACTn, MPP21_SATA0_ACTn, MPP24_GPIO, /* USB mode select */ MPP26_GPIO, /* USB device vbus */ MPP28_GPIO, /* USB enable host vbus */ MPP29_GPIO, /* CPLD extension ALE */ MPP34_GPIO, /* Rear Push button */ MPP35_GPIO, /* Inhibit switch power-off */ MPP36_GPIO, /* SATA HDD1 presence */ MPP37_GPIO, /* SATA HDD2 presence */ MPP40_GPIO, /* eSATA presence */ MPP44_GPIO, /* CPLD extension (data 0) */ MPP45_GPIO, /* CPLD extension (data 1) */ MPP46_GPIO, /* CPLD extension (data 2) */ MPP47_GPIO, /* CPLD extension (addr 0) */ MPP48_GPIO, /* CPLD extension (addr 1) */ MPP49_GPIO, /* CPLD extension (addr 2) */ 0 }; static unsigned int net5big_v2_mpp_config[] __initdata = { MPP0_SPI_SCn, MPP1_SPI_MOSI, MPP2_SPI_SCK, MPP3_SPI_MISO, MPP6_SYSRST_OUTn, MPP7_GPO, /* Request power-off */ MPP8_TW_SDA, MPP9_TW_SCK, MPP10_UART0_TXD, MPP11_UART0_RXD, MPP13_GPIO, /* Rear power switch (on|auto) */ MPP14_GPIO, /* USB fuse alarm */ MPP15_GPIO, /* Rear power switch (auto|off) */ MPP16_GPIO, /* SATA HDD1 power */ MPP17_GPIO, /* SATA HDD2 power */ MPP20_GE1_0, MPP21_GE1_1, MPP22_GE1_2, MPP23_GE1_3, MPP24_GE1_4, MPP25_GE1_5, MPP26_GE1_6, MPP27_GE1_7, MPP28_GPIO, /* USB enable host vbus */ MPP29_GPIO, /* CPLD extension ALE */ MPP30_GE1_10, MPP31_GE1_11, MPP32_GE1_12, MPP33_GE1_13, MPP34_GPIO, /* Rear Push button */ MPP35_GPIO, /* Inhibit switch power-off */ MPP36_GPIO, /* SATA HDD1 presence */ MPP37_GPIO, /* SATA HDD2 presence */ MPP38_GPIO, /* SATA HDD3 presence */ MPP39_GPIO, /* SATA HDD4 presence */ MPP40_GPIO, /* SATA HDD5 presence */ MPP41_GPIO, /* SATA HDD3 power */ MPP42_GPIO, /* SATA HDD4 power */ MPP43_GPIO, /* SATA HDD5 power */ MPP44_GPIO, /* CPLD extension (data 0) */ MPP45_GPIO, /* CPLD extension (data 1) */ MPP46_GPIO, /* CPLD extension (data 2) */ MPP47_GPIO, /* CPLD extension (addr 0) */ MPP48_GPIO, /* CPLD extension (addr 1) */ MPP49_GPIO, /* CPLD extension (addr 2) */ 0 }; #define NETXBIG_V2_GPIO_POWER_OFF 7 static void netxbig_v2_power_off(void) { gpio_set_value(NETXBIG_V2_GPIO_POWER_OFF, 1); } static void __init netxbig_v2_init(void) { /* * Basic setup. Needs to be called early. */ kirkwood_init(); if (machine_is_net2big_v2()) kirkwood_mpp_conf(net2big_v2_mpp_config); else kirkwood_mpp_conf(net5big_v2_mpp_config); netxbig_v2_sata_power_init(); kirkwood_ehci_init(); kirkwood_ge00_init(&netxbig_v2_ge00_data); if (machine_is_net5big_v2()) kirkwood_ge01_init(&netxbig_v2_ge01_data); kirkwood_sata_init(&netxbig_v2_sata_data); kirkwood_uart0_init(); spi_register_board_info(netxbig_v2_spi_slave_info, ARRAY_SIZE(netxbig_v2_spi_slave_info)); kirkwood_spi_init(); kirkwood_i2c_init(); i2c_register_board_info(0, netxbig_v2_i2c_info, ARRAY_SIZE(netxbig_v2_i2c_info)); platform_device_register(&netxbig_v2_gpio_buttons); if (gpio_request(NETXBIG_V2_GPIO_POWER_OFF, "power-off") == 0 && gpio_direction_output(NETXBIG_V2_GPIO_POWER_OFF, 0) == 0) pm_power_off = netxbig_v2_power_off; else pr_err("netxbig_v2: failed to configure power-off GPIO\n"); } #ifdef CONFIG_MACH_NET2BIG_V2 MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2") .phys_io = KIRKWOOD_REGS_PHYS_BASE, .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, .boot_params = 0x00000100, .init_machine = netxbig_v2_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, .timer = &netxbig_v2_timer, MACHINE_END #endif #ifdef CONFIG_MACH_NET5BIG_V2 MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2") .phys_io = KIRKWOOD_REGS_PHYS_BASE, .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, .boot_params = 0x00000100, .init_machine = netxbig_v2_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, .timer = &netxbig_v2_timer, MACHINE_END #endif Loading
MAINTAINERS +6 −6 Original line number Original line Diff line number Diff line Loading @@ -781,11 +781,10 @@ M: Philipp Zabel <philipp.zabel@gmail.com> S: Maintained S: Maintained ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support M: Lennert Buytenhek <buytenh@marvell.com> M: Lennert Buytenhek <kernel@wantstofly.org> M: Nicolas Pitre <nico@marvell.com> M: Nicolas Pitre <nico@fluxnic.net> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://git.marvell.com/orion S: Odd Fixes S: Maintained F: arch/arm/mach-loki/ F: arch/arm/mach-loki/ F: arch/arm/mach-kirkwood/ F: arch/arm/mach-kirkwood/ F: arch/arm/mach-mv78xx0/ F: arch/arm/mach-mv78xx0/ Loading Loading @@ -3644,7 +3643,8 @@ F: drivers/net/wireless/mwl8k.c MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER M: Nicolas Pitre <nico@fluxnic.net> M: Nicolas Pitre <nico@fluxnic.net> S: Maintained S: Odd Fixes F: drivers/mmc/host/mvsdio.* MARVELL YUKON / SYSKONNECT DRIVER MARVELL YUKON / SYSKONNECT DRIVER M: Mirko Lindner <mlindner@syskonnect.de> M: Mirko Lindner <mlindner@syskonnect.de> Loading Loading @@ -5141,7 +5141,7 @@ F: mm/sl?b.c SMC91x ETHERNET DRIVER SMC91x ETHERNET DRIVER M: Nicolas Pitre <nico@fluxnic.net> M: Nicolas Pitre <nico@fluxnic.net> S: Maintained S: Odd Fixes F: drivers/net/smc91x.* F: drivers/net/smc91x.* SMSC47B397 HARDWARE MONITOR DRIVER SMSC47B397 HARDWARE MONITOR DRIVER Loading
arch/arm/mach-kirkwood/Kconfig +18 −0 Original line number Original line Diff line number Diff line Loading @@ -38,6 +38,12 @@ config MACH_ESATA_SHEEVAPLUG Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the Marvell eSATA SheevaPlug Reference Board. Marvell eSATA SheevaPlug Reference Board. config MACH_GURUPLUG bool "Marvell GuruPlug Reference Board" help Say 'Y' here if you want your kernel to support the Marvell GuruPlug Reference Board. config MACH_TS219 config MACH_TS219 bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS" bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS" help help Loading Loading @@ -81,6 +87,18 @@ config MACH_INETSPACE_V2 Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the LaCie Internet Space v2 NAS. LaCie Internet Space v2 NAS. config MACH_NET2BIG_V2 bool "LaCie 2Big Network v2 NAS Board" help Say 'Y' here if you want your kernel to support the LaCie 2Big Network v2 NAS. config MACH_NET5BIG_V2 bool "LaCie 5Big Network v2 NAS Board" help Say 'Y' here if you want your kernel to support the LaCie 5Big Network v2 NAS. endmenu endmenu endif endif
arch/arm/mach-kirkwood/Makefile +3 −0 Original line number Original line Diff line number Diff line Loading @@ -6,10 +6,13 @@ obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o
arch/arm/mach-kirkwood/guruplug-setup.c 0 → 100644 +131 −0 Original line number Original line Diff line number Diff line /* * 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 <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/mtd/partitions.h> #include <linux/ata_platform.h> #include <linux/mv643xx_eth.h> #include <linux/gpio.h> #include <linux/leds.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <mach/kirkwood.h> #include <plat/mvsdio.h> #include "common.h" #include "mpp.h" 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 */ }; static struct gpio_led guruplug_led_pins[] = { { .name = "guruplug:red:health", .gpio = 46, .active_low = 1, }, { .name = "guruplug:green:health", .gpio = 47, .active_low = 1, }, { .name = "guruplug:red:wmode", .gpio = 48, .active_low = 1, }, { .name = "guruplug:green:wmode", .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 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(); kirkwood_mpp_conf(guruplug_mpp_config); kirkwood_uart0_init(); kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25); 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); } MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board") /* Maintainer: Siddarth Gore <gores@marvell.com> */ .phys_io = KIRKWOOD_REGS_PHYS_BASE, .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, .boot_params = 0x00000100, .init_machine = guruplug_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, .timer = &kirkwood_timer, MACHINE_END
arch/arm/mach-kirkwood/netxbig_v2-setup.c 0 → 100644 +415 −0 Original line number Original line Diff line number Diff line /* * arch/arm/mach-kirkwood/netxbig_v2-setup.c * * LaCie 2Big and 5Big Network v2 board setup * * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com> * * 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 <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> #include <linux/mtd/physmap.h> #include <linux/spi/flash.h> #include <linux/spi/spi.h> #include <linux/ata_platform.h> #include <linux/mv643xx_eth.h> #include <linux/i2c.h> #include <linux/i2c/at24.h> #include <linux/input.h> #include <linux/gpio.h> #include <linux/gpio_keys.h> #include <linux/leds.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/time.h> #include <mach/kirkwood.h> #include <plat/time.h> #include "common.h" #include "mpp.h" /***************************************************************************** * 512KB SPI Flash on Boot Device (MACRONIX MX25L4005) ****************************************************************************/ static struct mtd_partition netxbig_v2_flash_parts[] = { { .name = "u-boot", .size = MTDPART_SIZ_FULL, .offset = 0, .mask_flags = MTD_WRITEABLE, /* force read-only */ }, }; static const struct flash_platform_data netxbig_v2_flash = { .type = "mx25l4005a", .name = "spi_flash", .parts = netxbig_v2_flash_parts, .nr_parts = ARRAY_SIZE(netxbig_v2_flash_parts), }; static struct spi_board_info __initdata netxbig_v2_spi_slave_info[] = { { .modalias = "m25p80", .platform_data = &netxbig_v2_flash, .irq = -1, .max_speed_hz = 20000000, .bus_num = 0, .chip_select = 0, }, }; /***************************************************************************** * Ethernet ****************************************************************************/ static struct mv643xx_eth_platform_data netxbig_v2_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(8), }; static struct mv643xx_eth_platform_data netxbig_v2_ge01_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(0), }; /***************************************************************************** * I2C devices ****************************************************************************/ static struct at24_platform_data at24c04 = { .byte_len = SZ_4K / 8, .page_size = 16, }; /* * i2c addr | chip | description * 0x50 | HT24LC04 | eeprom (512B) */ static struct i2c_board_info __initdata netxbig_v2_i2c_info[] = { { I2C_BOARD_INFO("24c04", 0x50), .platform_data = &at24c04, } }; /***************************************************************************** * SATA ****************************************************************************/ static struct mv_sata_platform_data netxbig_v2_sata_data = { .n_ports = 2, }; static int __initdata netxbig_v2_gpio_hdd_power[] = { 16, 17, 41, 42, 43 }; static void __init netxbig_v2_sata_power_init(void) { int i; int err; int hdd_nb; if (machine_is_net2big_v2()) hdd_nb = 2; else hdd_nb = 5; /* Power up all hard disks. */ for (i = 0; i < hdd_nb; i++) { err = gpio_request(netxbig_v2_gpio_hdd_power[i], NULL); if (err == 0) { err = gpio_direction_output( netxbig_v2_gpio_hdd_power[i], 1); /* Free the HDD power GPIOs. This allow user-space to * configure them via the gpiolib sysfs interface. */ gpio_free(netxbig_v2_gpio_hdd_power[i]); } if (err) pr_err("netxbig_v2: failed to power up HDD%d\n", i + 1); } } /***************************************************************************** * GPIO keys ****************************************************************************/ #define NETXBIG_V2_GPIO_SWITCH_POWER_ON 13 #define NETXBIG_V2_GPIO_SWITCH_POWER_OFF 15 #define NETXBIG_V2_GPIO_FUNC_BUTTON 34 #define NETXBIG_V2_SWITCH_POWER_ON 0x1 #define NETXBIG_V2_SWITCH_POWER_OFF 0x2 static struct gpio_keys_button netxbig_v2_buttons[] = { [0] = { .type = EV_SW, .code = NETXBIG_V2_SWITCH_POWER_ON, .gpio = NETXBIG_V2_GPIO_SWITCH_POWER_ON, .desc = "Back power switch (on|auto)", .active_low = 1, }, [1] = { .type = EV_SW, .code = NETXBIG_V2_SWITCH_POWER_OFF, .gpio = NETXBIG_V2_GPIO_SWITCH_POWER_OFF, .desc = "Back power switch (auto|off)", .active_low = 1, }, [2] = { .code = KEY_OPTION, .gpio = NETXBIG_V2_GPIO_FUNC_BUTTON, .desc = "Function button", .active_low = 1, }, }; static struct gpio_keys_platform_data netxbig_v2_button_data = { .buttons = netxbig_v2_buttons, .nbuttons = ARRAY_SIZE(netxbig_v2_buttons), }; static struct platform_device netxbig_v2_gpio_buttons = { .name = "gpio-keys", .id = -1, .dev = { .platform_data = &netxbig_v2_button_data, }, }; /***************************************************************************** * GPIO LEDs ****************************************************************************/ /* * The LEDs are controlled by a CPLD and can be configured through a GPIO * extension bus: * * - address register : bit [0-2] -> GPIO [47-49] * - data register : bit [0-2] -> GPIO [44-46] * - enable register : GPIO 29 * * Address register selection: * * addr | register * ---------------------------- * 0 | front LED * 1 | front LED brightness * 2 | HDD LED brightness * 3 | HDD1 LED * 4 | HDD2 LED * 5 | HDD3 LED * 6 | HDD4 LED * 7 | HDD5 LED * * Data register configuration: * * data | LED brightness * ------------------------------------------------- * 0 | min (off) * - | - * 7 | max * * data | front LED mode * ------------------------------------------------- * 0 | fix off * 1 | fix blue on * 2 | fix red on * 3 | blink blue on=1 sec and blue off=1 sec * 4 | blink red on=1 sec and red off=1 sec * 5 | blink blue on=2.5 sec and red on=0.5 sec * 6 | blink blue on=1 sec and red on=1 sec * 7 | blink blue on=0.5 sec and blue off=2.5 sec * * data | HDD LED mode * ------------------------------------------------- * 0 | fix blue on * 1 | SATA activity blink * 2 | fix red on * 3 | blink blue on=1 sec and blue off=1 sec * 4 | blink red on=1 sec and red off=1 sec * 5 | blink blue on=2.5 sec and red on=0.5 sec * 6 | blink blue on=1 sec and red on=1 sec * 7 | blink blue on=0.5 sec and blue off=2.5 sec */ /***************************************************************************** * Timer ****************************************************************************/ static void netxbig_v2_timer_init(void) { kirkwood_tclk = 166666667; orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk); } struct sys_timer netxbig_v2_timer = { .init = netxbig_v2_timer_init, }; /***************************************************************************** * General Setup ****************************************************************************/ static unsigned int net2big_v2_mpp_config[] __initdata = { MPP0_SPI_SCn, MPP1_SPI_MOSI, MPP2_SPI_SCK, MPP3_SPI_MISO, MPP6_SYSRST_OUTn, MPP7_GPO, /* Request power-off */ MPP8_TW_SDA, MPP9_TW_SCK, MPP10_UART0_TXD, MPP11_UART0_RXD, MPP13_GPIO, /* Rear power switch (on|auto) */ MPP14_GPIO, /* USB fuse alarm */ MPP15_GPIO, /* Rear power switch (auto|off) */ MPP16_GPIO, /* SATA HDD1 power */ MPP17_GPIO, /* SATA HDD2 power */ MPP20_SATA1_ACTn, MPP21_SATA0_ACTn, MPP24_GPIO, /* USB mode select */ MPP26_GPIO, /* USB device vbus */ MPP28_GPIO, /* USB enable host vbus */ MPP29_GPIO, /* CPLD extension ALE */ MPP34_GPIO, /* Rear Push button */ MPP35_GPIO, /* Inhibit switch power-off */ MPP36_GPIO, /* SATA HDD1 presence */ MPP37_GPIO, /* SATA HDD2 presence */ MPP40_GPIO, /* eSATA presence */ MPP44_GPIO, /* CPLD extension (data 0) */ MPP45_GPIO, /* CPLD extension (data 1) */ MPP46_GPIO, /* CPLD extension (data 2) */ MPP47_GPIO, /* CPLD extension (addr 0) */ MPP48_GPIO, /* CPLD extension (addr 1) */ MPP49_GPIO, /* CPLD extension (addr 2) */ 0 }; static unsigned int net5big_v2_mpp_config[] __initdata = { MPP0_SPI_SCn, MPP1_SPI_MOSI, MPP2_SPI_SCK, MPP3_SPI_MISO, MPP6_SYSRST_OUTn, MPP7_GPO, /* Request power-off */ MPP8_TW_SDA, MPP9_TW_SCK, MPP10_UART0_TXD, MPP11_UART0_RXD, MPP13_GPIO, /* Rear power switch (on|auto) */ MPP14_GPIO, /* USB fuse alarm */ MPP15_GPIO, /* Rear power switch (auto|off) */ MPP16_GPIO, /* SATA HDD1 power */ MPP17_GPIO, /* SATA HDD2 power */ MPP20_GE1_0, MPP21_GE1_1, MPP22_GE1_2, MPP23_GE1_3, MPP24_GE1_4, MPP25_GE1_5, MPP26_GE1_6, MPP27_GE1_7, MPP28_GPIO, /* USB enable host vbus */ MPP29_GPIO, /* CPLD extension ALE */ MPP30_GE1_10, MPP31_GE1_11, MPP32_GE1_12, MPP33_GE1_13, MPP34_GPIO, /* Rear Push button */ MPP35_GPIO, /* Inhibit switch power-off */ MPP36_GPIO, /* SATA HDD1 presence */ MPP37_GPIO, /* SATA HDD2 presence */ MPP38_GPIO, /* SATA HDD3 presence */ MPP39_GPIO, /* SATA HDD4 presence */ MPP40_GPIO, /* SATA HDD5 presence */ MPP41_GPIO, /* SATA HDD3 power */ MPP42_GPIO, /* SATA HDD4 power */ MPP43_GPIO, /* SATA HDD5 power */ MPP44_GPIO, /* CPLD extension (data 0) */ MPP45_GPIO, /* CPLD extension (data 1) */ MPP46_GPIO, /* CPLD extension (data 2) */ MPP47_GPIO, /* CPLD extension (addr 0) */ MPP48_GPIO, /* CPLD extension (addr 1) */ MPP49_GPIO, /* CPLD extension (addr 2) */ 0 }; #define NETXBIG_V2_GPIO_POWER_OFF 7 static void netxbig_v2_power_off(void) { gpio_set_value(NETXBIG_V2_GPIO_POWER_OFF, 1); } static void __init netxbig_v2_init(void) { /* * Basic setup. Needs to be called early. */ kirkwood_init(); if (machine_is_net2big_v2()) kirkwood_mpp_conf(net2big_v2_mpp_config); else kirkwood_mpp_conf(net5big_v2_mpp_config); netxbig_v2_sata_power_init(); kirkwood_ehci_init(); kirkwood_ge00_init(&netxbig_v2_ge00_data); if (machine_is_net5big_v2()) kirkwood_ge01_init(&netxbig_v2_ge01_data); kirkwood_sata_init(&netxbig_v2_sata_data); kirkwood_uart0_init(); spi_register_board_info(netxbig_v2_spi_slave_info, ARRAY_SIZE(netxbig_v2_spi_slave_info)); kirkwood_spi_init(); kirkwood_i2c_init(); i2c_register_board_info(0, netxbig_v2_i2c_info, ARRAY_SIZE(netxbig_v2_i2c_info)); platform_device_register(&netxbig_v2_gpio_buttons); if (gpio_request(NETXBIG_V2_GPIO_POWER_OFF, "power-off") == 0 && gpio_direction_output(NETXBIG_V2_GPIO_POWER_OFF, 0) == 0) pm_power_off = netxbig_v2_power_off; else pr_err("netxbig_v2: failed to configure power-off GPIO\n"); } #ifdef CONFIG_MACH_NET2BIG_V2 MACHINE_START(NET2BIG_V2, "LaCie 2Big Network v2") .phys_io = KIRKWOOD_REGS_PHYS_BASE, .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, .boot_params = 0x00000100, .init_machine = netxbig_v2_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, .timer = &netxbig_v2_timer, MACHINE_END #endif #ifdef CONFIG_MACH_NET5BIG_V2 MACHINE_START(NET5BIG_V2, "LaCie 5Big Network v2") .phys_io = KIRKWOOD_REGS_PHYS_BASE, .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, .boot_params = 0x00000100, .init_machine = netxbig_v2_init, .map_io = kirkwood_map_io, .init_irq = kirkwood_init_irq, .timer = &netxbig_v2_timer, MACHINE_END #endif
