Merge branch 'for-rmk' of git://git.marvell.com/orion
This commit is contained in:
Russell King
commit
1cc76b5ee0
|
|
@ -52,6 +52,12 @@ config MACH_OPENRD_BASE
|
||||||
Say 'Y' here if you want your kernel to support the
|
Say 'Y' here if you want your kernel to support the
|
||||||
Marvell OpenRD Base Board.
|
Marvell OpenRD Base Board.
|
||||||
|
|
||||||
|
config MACH_NETSPACE_V2
|
||||||
|
bool "LaCie Network Space v2 NAS Board"
|
||||||
|
help
|
||||||
|
Say 'Y' here if you want your kernel to support the
|
||||||
|
LaCie Network Space v2 NAS.
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
||||||
|
|
@ -8,5 +8,6 @@ obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-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_BASE) += openrd_base-setup.o
|
obj-$(CONFIG_MACH_OPENRD_BASE) += openrd_base-setup.o
|
||||||
|
obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o
|
||||||
|
|
||||||
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
|
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,325 @@
|
||||||
|
/*
|
||||||
|
* arch/arm/mach-kirkwood/netspace_v2-setup.c
|
||||||
|
*
|
||||||
|
* LaCie Network Space v2 board setup
|
||||||
|
*
|
||||||
|
* Copyright (C) 2009 Simon Guinot <sguinot@lacie.com>
|
||||||
|
* Copyright (C) 2009 Benoît Canet <benoit.canet@gmail.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 netspace_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 netspace_v2_flash = {
|
||||||
|
.type = "mx25l4005a",
|
||||||
|
.name = "spi_flash",
|
||||||
|
.parts = netspace_v2_flash_parts,
|
||||||
|
.nr_parts = ARRAY_SIZE(netspace_v2_flash_parts),
|
||||||
|
};
|
||||||
|
|
||||||
|
static struct spi_board_info __initdata netspace_v2_spi_slave_info[] = {
|
||||||
|
{
|
||||||
|
.modalias = "m25p80",
|
||||||
|
.platform_data = &netspace_v2_flash,
|
||||||
|
.irq = -1,
|
||||||
|
.max_speed_hz = 20000000,
|
||||||
|
.bus_num = 0,
|
||||||
|
.chip_select = 0,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* Ethernet
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
static struct mv643xx_eth_platform_data netspace_v2_ge00_data = {
|
||||||
|
.phy_addr = MV643XX_ETH_PHY_ADDR(8),
|
||||||
|
};
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* 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 netspace_v2_i2c_info[] = {
|
||||||
|
{
|
||||||
|
I2C_BOARD_INFO("24c04", 0x50),
|
||||||
|
.platform_data = &at24c04,
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* SATA
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
static struct mv_sata_platform_data netspace_v2_sata_data = {
|
||||||
|
.n_ports = 2,
|
||||||
|
};
|
||||||
|
|
||||||
|
#define NETSPACE_V2_GPIO_SATA0_POWER 16
|
||||||
|
#define NETSPACE_V2_GPIO_SATA1_POWER 17
|
||||||
|
|
||||||
|
static void __init netspace_v2_sata_power_init(void)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
err = gpio_request(NETSPACE_V2_GPIO_SATA0_POWER, "SATA0 power");
|
||||||
|
if (err == 0) {
|
||||||
|
err = gpio_direction_output(NETSPACE_V2_GPIO_SATA0_POWER, 1);
|
||||||
|
if (err)
|
||||||
|
gpio_free(NETSPACE_V2_GPIO_SATA0_POWER);
|
||||||
|
}
|
||||||
|
if (err)
|
||||||
|
pr_err("netspace_v2: failed to setup SATA0 power\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* 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
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The blue front LED is wired to a CPLD and can blink in relation with the
|
||||||
|
* SATA activity.
|
||||||
|
*
|
||||||
|
* The following array detail the different LED registers and the combination
|
||||||
|
* of their possible values:
|
||||||
|
*
|
||||||
|
* cmd_led | slow_led | /SATA active | LED state
|
||||||
|
* | | |
|
||||||
|
* 1 | 0 | x | off
|
||||||
|
* - | 1 | x | on
|
||||||
|
* 0 | 0 | 1 | on
|
||||||
|
* 0 | 0 | 0 | blink (rate 300ms)
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define NETSPACE_V2_GPIO_RED_LED 12
|
||||||
|
#define NETSPACE_V2_GPIO_BLUE_LED_SLOW 29
|
||||||
|
#define NETSPACE_V2_GPIO_BLUE_LED_CMD 30
|
||||||
|
|
||||||
|
|
||||||
|
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,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static void __init netspace_v2_gpio_leds_init(void)
|
||||||
|
{
|
||||||
|
platform_device_register(&netspace_v2_gpio_leds);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Configure the front blue LED to blink in relation with the SATA
|
||||||
|
* activity.
|
||||||
|
*/
|
||||||
|
if (gpio_request(NETSPACE_V2_GPIO_BLUE_LED_SLOW,
|
||||||
|
"SATA blue LED slow") != 0)
|
||||||
|
return;
|
||||||
|
if (gpio_direction_output(NETSPACE_V2_GPIO_BLUE_LED_SLOW, 0) != 0)
|
||||||
|
goto err_free_1;
|
||||||
|
if (gpio_request(NETSPACE_V2_GPIO_BLUE_LED_CMD,
|
||||||
|
"SATA blue LED command") != 0)
|
||||||
|
goto err_free_1;
|
||||||
|
if (gpio_direction_output(NETSPACE_V2_GPIO_BLUE_LED_CMD, 0) != 0)
|
||||||
|
goto err_free_2;
|
||||||
|
|
||||||
|
return;
|
||||||
|
|
||||||
|
err_free_2:
|
||||||
|
gpio_free(NETSPACE_V2_GPIO_BLUE_LED_CMD);
|
||||||
|
err_free_1:
|
||||||
|
gpio_free(NETSPACE_V2_GPIO_BLUE_LED_SLOW);
|
||||||
|
pr_err("netspace_v2: failed to configure SATA blue LED\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* Timer
|
||||||
|
****************************************************************************/
|
||||||
|
|
||||||
|
static void netspace_v2_timer_init(void)
|
||||||
|
{
|
||||||
|
kirkwood_tclk = 166666667;
|
||||||
|
orion_time_init(IRQ_KIRKWOOD_BRIDGE, kirkwood_tclk);
|
||||||
|
}
|
||||||
|
|
||||||
|
struct sys_timer netspace_v2_timer = {
|
||||||
|
.init = netspace_v2_timer_init,
|
||||||
|
};
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
* 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,
|
||||||
|
MPP8_TW_SDA,
|
||||||
|
MPP9_TW_SCK,
|
||||||
|
MPP10_UART0_TXD,
|
||||||
|
MPP11_UART0_RXD,
|
||||||
|
MPP12_GPO, /* Red led */
|
||||||
|
MPP14_GPIO, /* USB fuse */
|
||||||
|
MPP16_GPIO, /* SATA 0 power */
|
||||||
|
MPP18_NF_IO0,
|
||||||
|
MPP19_NF_IO1,
|
||||||
|
MPP20_SATA1_ACTn,
|
||||||
|
MPP21_SATA0_ACTn,
|
||||||
|
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) */
|
||||||
|
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);
|
||||||
|
|
||||||
|
netspace_v2_sata_power_init();
|
||||||
|
|
||||||
|
kirkwood_ehci_init();
|
||||||
|
kirkwood_ge00_init(&netspace_v2_ge00_data);
|
||||||
|
kirkwood_sata_init(&netspace_v2_sata_data);
|
||||||
|
kirkwood_uart0_init();
|
||||||
|
spi_register_board_info(netspace_v2_spi_slave_info,
|
||||||
|
ARRAY_SIZE(netspace_v2_spi_slave_info));
|
||||||
|
kirkwood_spi_init();
|
||||||
|
kirkwood_i2c_init();
|
||||||
|
i2c_register_board_info(0, netspace_v2_i2c_info,
|
||||||
|
ARRAY_SIZE(netspace_v2_i2c_info));
|
||||||
|
|
||||||
|
netspace_v2_gpio_leds_init();
|
||||||
|
platform_device_register(&netspace_v2_gpio_buttons);
|
||||||
|
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
|
||||||
|
MACHINE_START(NETSPACE_V2, "LaCie Network Space v2")
|
||||||
|
.phys_io = KIRKWOOD_REGS_PHYS_BASE,
|
||||||
|
.io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc,
|
||||||
|
.boot_params = 0x00000100,
|
||||||
|
.init_machine = netspace_v2_init,
|
||||||
|
.map_io = kirkwood_map_io,
|
||||||
|
.init_irq = kirkwood_init_irq,
|
||||||
|
.timer = &netspace_v2_timer,
|
||||||
|
MACHINE_END
|
||||||
|
|
@ -254,10 +254,9 @@ __pj4_v6_proc_info:
|
||||||
.long 0x560f5810
|
.long 0x560f5810
|
||||||
.long 0xff0ffff0
|
.long 0xff0ffff0
|
||||||
.long PMD_TYPE_SECT | \
|
.long PMD_TYPE_SECT | \
|
||||||
PMD_SECT_BUFFERABLE | \
|
|
||||||
PMD_SECT_CACHEABLE | \
|
|
||||||
PMD_SECT_AP_WRITE | \
|
PMD_SECT_AP_WRITE | \
|
||||||
PMD_SECT_AP_READ
|
PMD_SECT_AP_READ | \
|
||||||
|
PMD_FLAGS
|
||||||
.long PMD_TYPE_SECT | \
|
.long PMD_TYPE_SECT | \
|
||||||
PMD_SECT_XN | \
|
PMD_SECT_XN | \
|
||||||
PMD_SECT_AP_WRITE | \
|
PMD_SECT_AP_WRITE | \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue