Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable (4af8f24d) · Commits · EulixOS / Software / Kernel

arch/arm/configs/kirkwood_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ CONFIG_MACH_MV88F6281GTW_GE=y
		CONFIG_MACH_SHEEVAPLUG=y
		CONFIG_MACH_ESATA_SHEEVAPLUG=y
		CONFIG_MACH_GURUPLUG=y
		CONFIG_MACH_DOCKSTAR=y
		CONFIG_MACH_TS219=y
		CONFIG_MACH_TS41X=y
		CONFIG_MACH_OPENRD_BASE=y

arch/arm/mach-kirkwood/Kconfig

+12 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,12 @@ config MACH_TS41X
		QNAP TS-410, TS-410U, TS-419P and TS-419U Turbo NAS
		devices.

		config MACH_DOCKSTAR
		bool "Seagate FreeAgent DockStar"
		help
		Say 'Y' here if you want your kernel to support the
		Seagate FreeAgent DockStar.

		config MACH_OPENRD
		bool

		@@ -100,6 +106,12 @@ config MACH_NETSPACE_MAX_V2
		Say 'Y' here if you want your kernel to support the
		LaCie Network Space Max v2 NAS.

		config MACH_D2NET_V2
		bool "LaCie d2 Network v2 NAS Board"
		help
		Say 'Y' here if you want your kernel to support the
		LaCie d2 Network v2 NAS.

		config MACH_NET2BIG_V2
		bool "LaCie 2Big Network v2 NAS Board"
		help

arch/arm/mach-kirkwood/Makefile

+7 −5

Original line number	Diff line number	Diff line
		@@ -7,14 +7,16 @@ obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o
		obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o
		obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
		obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
		obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
		obj-$(CONFIG_MACH_TS219) += ts219-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_NETSPACE_V2) += netspace_v2-setup.o
		obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o
		obj-$(CONFIG_MACH_NETSPACE_MAX_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_MACH_NETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o
		obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o
		obj-$(CONFIG_MACH_NETSPACE_MAX_V2) += netspace_v2-setup.o lacie_v2-common.o
		obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o
		obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
		obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
		obj-$(CONFIG_MACH_T5325) += t5325-setup.o

		obj-$(CONFIG_CPU_IDLE) += cpuidle.o

arch/arm/mach-kirkwood/d2net_v2-setup.c

0 → 100644

+231 −0

Original line number	Diff line number	Diff line
		/*
		* arch/arm/mach-kirkwood/d2net_v2-setup.c
		*
		* LaCie d2 Network Space 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/ata_platform.h>
		#include <linux/mv643xx_eth.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 <mach/kirkwood.h>
		#include <mach/leds-ns2.h>
		#include "common.h"
		#include "mpp.h"
		#include "lacie_v2-common.h"

		/*****************************************************************************
		* Ethernet
		****************************************************************************/

		static struct mv643xx_eth_platform_data d2net_v2_ge00_data = {
		.phy_addr = MV643XX_ETH_PHY_ADDR(8),
		};

		/*****************************************************************************
		* SATA
		****************************************************************************/

		static struct mv_sata_platform_data d2net_v2_sata_data = {
		.n_ports = 2,
		};

		/*****************************************************************************
		* GPIO keys
		****************************************************************************/

		#define D2NET_V2_GPIO_PUSH_BUTTON 34
		#define D2NET_V2_GPIO_POWER_SWITCH_ON 13
		#define D2NET_V2_GPIO_POWER_SWITCH_OFF 15

		#define D2NET_V2_SWITCH_POWER_ON 0x1
		#define D2NET_V2_SWITCH_POWER_OFF 0x2

		static struct gpio_keys_button d2net_v2_buttons[] = {
		[0] = {
		.type = EV_SW,
		.code = D2NET_V2_SWITCH_POWER_ON,
		.gpio = D2NET_V2_GPIO_POWER_SWITCH_ON,
		.desc = "Back power switch (on\|auto)",
		.active_low = 0,
		},
		[1] = {
		.type = EV_SW,
		.code = D2NET_V2_SWITCH_POWER_OFF,
		.gpio = D2NET_V2_GPIO_POWER_SWITCH_OFF,
		.desc = "Back power switch (auto\|off)",
		.active_low = 0,
		},
		[2] = {
		.code = KEY_POWER,
		.gpio = D2NET_V2_GPIO_PUSH_BUTTON,
		.desc = "Front Push Button",
		.active_low = 1,
		},
		};

		static struct gpio_keys_platform_data d2net_v2_button_data = {
		.buttons = d2net_v2_buttons,
		.nbuttons = ARRAY_SIZE(d2net_v2_buttons),
		};

		static struct platform_device d2net_v2_gpio_buttons = {
		.name = "gpio-keys",
		.id = -1,
		.dev = {
		.platform_data = &d2net_v2_button_data,
		},
		};

		/*****************************************************************************
		* GPIO LEDs
		****************************************************************************/

		#define D2NET_V2_GPIO_RED_LED 12

		static struct gpio_led d2net_v2_gpio_led_pins[] = {
		{
		.name = "d2net_v2:red:fail",
		.gpio = D2NET_V2_GPIO_RED_LED,
		},
		};

		static struct gpio_led_platform_data d2net_v2_gpio_leds_data = {
		.num_leds = ARRAY_SIZE(d2net_v2_gpio_led_pins),
		.leds = d2net_v2_gpio_led_pins,
		};

		static struct platform_device d2net_v2_gpio_leds = {
		.name = "leds-gpio",
		.id = -1,
		.dev = {
		.platform_data = &d2net_v2_gpio_leds_data,
		},
		};

		/*****************************************************************************
		* Dual-GPIO CPLD LEDs
		****************************************************************************/

		#define D2NET_V2_GPIO_BLUE_LED_SLOW 29
		#define D2NET_V2_GPIO_BLUE_LED_CMD 30

		static struct ns2_led d2net_v2_led_pins[] = {
		{
		.name = "d2net_v2:blue:sata",
		.cmd = D2NET_V2_GPIO_BLUE_LED_CMD,
		.slow = D2NET_V2_GPIO_BLUE_LED_SLOW,
		},
		};

		static struct ns2_led_platform_data d2net_v2_leds_data = {
		.num_leds = ARRAY_SIZE(d2net_v2_led_pins),
		.leds = d2net_v2_led_pins,
		};

		static struct platform_device d2net_v2_leds = {
		.name = "leds-ns2",
		.id = -1,
		.dev = {
		.platform_data = &d2net_v2_leds_data,
		},
		};

		/*****************************************************************************
		* General Setup
		****************************************************************************/

		static unsigned int d2net_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_TW0_SDA,
		MPP9_TW0_SCK,
		MPP10_UART0_TXD,
		MPP11_UART0_RXD,
		MPP12_GPO, /* Red led */
		MPP13_GPIO, /* Rear power switch (on\|auto) */
		MPP14_GPIO, /* USB fuse */
		MPP15_GPIO, /* Rear power switch (auto\|off) */
		MPP16_GPIO, /* SATA 0 power */
		MPP21_SATA0_ACTn,
		MPP24_GPIO, /* USB mode select */
		MPP26_GPIO, /* USB device vbus */
		MPP28_GPIO, /* USB enable host vbus */
		MPP29_GPIO, /* Blue led (slow register) */
		MPP30_GPIO, /* Blue led (command register) */
		MPP34_GPIO, /* Power button (1 = Released, 0 = Pushed) */
		MPP35_GPIO, /* Inhibit power-off */
		0
		};

		#define D2NET_V2_GPIO_POWER_OFF 7

		static void d2net_v2_power_off(void)
		{
		gpio_set_value(D2NET_V2_GPIO_POWER_OFF, 1);
		}

		static void __init d2net_v2_init(void)
		{
		/*
		* Basic setup. Needs to be called early.
		*/
		kirkwood_init();
		kirkwood_mpp_conf(d2net_v2_mpp_config);

		lacie_v2_hdd_power_init(1);

		kirkwood_ehci_init();
		kirkwood_ge00_init(&d2net_v2_ge00_data);
		kirkwood_sata_init(&d2net_v2_sata_data);
		kirkwood_uart0_init();
		lacie_v2_register_flash();
		lacie_v2_register_i2c_devices();

		platform_device_register(&d2net_v2_leds);
		platform_device_register(&d2net_v2_gpio_leds);
		platform_device_register(&d2net_v2_gpio_buttons);

		if (gpio_request(D2NET_V2_GPIO_POWER_OFF, "power-off") == 0 &&
		gpio_direction_output(D2NET_V2_GPIO_POWER_OFF, 0) == 0)
		pm_power_off = d2net_v2_power_off;
		else
		pr_err("d2net_v2: failed to configure power-off GPIO\n");
		}

		MACHINE_START(D2NET_V2, "LaCie d2 Network v2")
		.phys_io = KIRKWOOD_REGS_PHYS_BASE,
		.io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
		.boot_params = 0x00000100,
		.init_machine = d2net_v2_init,
		.map_io = kirkwood_map_io,
		.init_irq = kirkwood_init_irq,
		.timer = &lacie_v2_timer,
		MACHINE_END

arch/arm/mach-kirkwood/dockstar-setup.c

0 → 100644

+112 −0

Original line number	Diff line number	Diff line
		/*
		* 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 <linux/kernel.h>
		#include <linux/init.h>
		#include <linux/platform_device.h>
		#include <linux/ata_platform.h>
		#include <linux/mtd/partitions.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 dockstar_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 dockstar_ge00_data = {
		.phy_addr = MV643XX_ETH_PHY_ADDR(0),
		};

		static struct gpio_led dockstar_led_pins[] = {
		{
		.name = "dockstar:green:health",
		.default_trigger = "default-on",
		.gpio = 46,
		.active_low = 1,
		},
		{
		.name = "dockstar:orange:misc",
		.default_trigger = "none",
		.gpio = 47,
		.active_low = 1,
		},
		};

		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
		};

		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)
		printk(KERN_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")
		.phys_io = KIRKWOOD_REGS_PHYS_BASE,
		.io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
		.boot_params = 0x00000100,
		.init_machine = dockstar_init,
		.map_io = kirkwood_map_io,
		.init_irq = kirkwood_init_irq,
		.timer = &kirkwood_timer,
		MACHINE_END