mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 05:41:55 +00:00
fb09bafda6
Here is the big staging tree pull request for the 3.5-rc1 merge window. Loads of changes here, and we just narrowly added more lines than we added: 622 files changed, 28356 insertions(+), 26059 deletions(-) But, good news is that there is a number of subsystems that moved out of the staging tree, to their respective "real" portions of the kernel. Code that moved out was: - iio core code - mei driver - vme core and bridge drivers There was one broken network driver that moved into staging as a step before it is removed from the tree (pc300), and there was a few new drivers added to the tree: - new iio drivers - gdm72xx wimax USB driver - ipack subsystem and 2 drivers All of the movements around have acks from the various subsystem maintainers, and all of this has been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk+7q8MACgkQMUfUDdst+ymjogCguo8fANFVlPWeZGeoBTL+aQfQ yTkAoLE0codmh+2SvhulYgyU1Wh6ZDK2 =nJ2F -----END PGP SIGNATURE----- Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging tree changes from Greg Kroah-Hartman: "Here is the big staging tree pull request for the 3.5-rc1 merge window. Loads of changes here, and we just narrowly added more lines than we added: 622 files changed, 28356 insertions(+), 26059 deletions(-) But, good news is that there is a number of subsystems that moved out of the staging tree, to their respective "real" portions of the kernel. Code that moved out was: - iio core code - mei driver - vme core and bridge drivers There was one broken network driver that moved into staging as a step before it is removed from the tree (pc300), and there was a few new drivers added to the tree: - new iio drivers - gdm72xx wimax USB driver - ipack subsystem and 2 drivers All of the movements around have acks from the various subsystem maintainers, and all of this has been in the linux-next tree for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up various trivial conflicts, along with a non-trivial one found in -next and pointed out by Olof Johanssen: a clean - but incorrect - merge of the arch/arm/boot/dts/at91sam9g20.dtsi file. Fix up manually as per Stephen Rothwell. * tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits) Staging: bcm: Remove two unused variables from Adapter.h Staging: bcm: Removes the volatile type definition from Adapter.h Staging: bcm: Rename all "INT" to "int" in Adapter.h Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h Staging: bcm: Correctly format all comments in Adapter.h Staging: bcm: Fix all whitespace issues in Adapter.h Staging: bcm: Properly format braces in Adapter.h Staging: ipack/bridges/tpci200: remove unneeded casts Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant Staging: ipack: remove board_name and bus_name fields from struct ipack_device Staging: ipack: improve the register of a bus and a device in the bus. staging: comedi: cleanup all the comedi_driver 'detach' functions staging: comedi: remove all 'default N' in Kconfig staging: line6/config.h: Delete unused header staging: gdm72xx depends on NET staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices staging: drm/omap: initial dmabuf/prime import support staging: drm/omap: dmabuf/prime mmap support pstore/ram: Add ECC support pstore/ram: Switch to persistent_ram routines ...
429 lines
9.7 KiB
C
429 lines
9.7 KiB
C
/*
|
|
* Copyright (C) 2005 SAN People
|
|
* Copyright (C) 2008 Atmel
|
|
*
|
|
* 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/types.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/init.h>
|
|
#include <linux/mm.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/spi/at73c213.h>
|
|
#include <linux/gpio_keys.h>
|
|
#include <linux/input.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/regulator/fixed.h>
|
|
#include <linux/regulator/consumer.h>
|
|
|
|
#include <linux/platform_data/at91_adc.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/irq.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/irq.h>
|
|
|
|
#include <mach/board.h>
|
|
#include <mach/at91sam9_smc.h>
|
|
#include <mach/system_rev.h>
|
|
|
|
#include "sam9_smc.h"
|
|
#include "generic.h"
|
|
|
|
/*
|
|
* board revision encoding
|
|
* bit 0:
|
|
* 0 => 1 sd/mmc slot
|
|
* 1 => 2 sd/mmc slots connectors (board from revision C)
|
|
*/
|
|
#define HAVE_2MMC (1 << 0)
|
|
static int inline ek_have_2mmc(void)
|
|
{
|
|
return machine_is_at91sam9g20ek_2mmc() || (system_rev & HAVE_2MMC);
|
|
}
|
|
|
|
|
|
static void __init ek_init_early(void)
|
|
{
|
|
/* Initialize processor: 18.432 MHz crystal */
|
|
at91_initialize(18432000);
|
|
}
|
|
|
|
/*
|
|
* USB Host port
|
|
*/
|
|
static struct at91_usbh_data __initdata ek_usbh_data = {
|
|
.ports = 2,
|
|
.vbus_pin = {-EINVAL, -EINVAL},
|
|
.overcurrent_pin= {-EINVAL, -EINVAL},
|
|
};
|
|
|
|
/*
|
|
* USB Device port
|
|
*/
|
|
static struct at91_udc_data __initdata ek_udc_data = {
|
|
.vbus_pin = AT91_PIN_PC5,
|
|
.pullup_pin = -EINVAL, /* pull-up driven by UDC */
|
|
};
|
|
|
|
|
|
/*
|
|
* SPI devices.
|
|
*/
|
|
static struct spi_board_info ek_spi_devices[] = {
|
|
#if !(defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_AT91))
|
|
{ /* DataFlash chip */
|
|
.modalias = "mtd_dataflash",
|
|
.chip_select = 1,
|
|
.max_speed_hz = 15 * 1000 * 1000,
|
|
.bus_num = 0,
|
|
},
|
|
#if defined(CONFIG_MTD_AT91_DATAFLASH_CARD)
|
|
{ /* DataFlash card */
|
|
.modalias = "mtd_dataflash",
|
|
.chip_select = 0,
|
|
.max_speed_hz = 15 * 1000 * 1000,
|
|
.bus_num = 0,
|
|
},
|
|
#endif
|
|
#endif
|
|
};
|
|
|
|
|
|
/*
|
|
* MACB Ethernet device
|
|
*/
|
|
static struct macb_platform_data __initdata ek_macb_data = {
|
|
.phy_irq_pin = AT91_PIN_PA7,
|
|
.is_rmii = 1,
|
|
};
|
|
|
|
static void __init ek_add_device_macb(void)
|
|
{
|
|
if (ek_have_2mmc())
|
|
ek_macb_data.phy_irq_pin = AT91_PIN_PB0;
|
|
|
|
at91_add_device_eth(&ek_macb_data);
|
|
}
|
|
|
|
/*
|
|
* NAND flash
|
|
*/
|
|
static struct mtd_partition __initdata ek_nand_partition[] = {
|
|
{
|
|
.name = "Bootstrap",
|
|
.offset = 0,
|
|
.size = 4 * SZ_1M,
|
|
},
|
|
{
|
|
.name = "Partition 1",
|
|
.offset = MTDPART_OFS_NXTBLK,
|
|
.size = 60 * SZ_1M,
|
|
},
|
|
{
|
|
.name = "Partition 2",
|
|
.offset = MTDPART_OFS_NXTBLK,
|
|
.size = MTDPART_SIZ_FULL,
|
|
},
|
|
};
|
|
|
|
/* det_pin is not connected */
|
|
static struct atmel_nand_data __initdata ek_nand_data = {
|
|
.ale = 21,
|
|
.cle = 22,
|
|
.rdy_pin = AT91_PIN_PC13,
|
|
.enable_pin = AT91_PIN_PC14,
|
|
.det_pin = -EINVAL,
|
|
.ecc_mode = NAND_ECC_SOFT,
|
|
.on_flash_bbt = 1,
|
|
.parts = ek_nand_partition,
|
|
.num_parts = ARRAY_SIZE(ek_nand_partition),
|
|
};
|
|
|
|
static struct sam9_smc_config __initdata ek_nand_smc_config = {
|
|
.ncs_read_setup = 0,
|
|
.nrd_setup = 2,
|
|
.ncs_write_setup = 0,
|
|
.nwe_setup = 2,
|
|
|
|
.ncs_read_pulse = 4,
|
|
.nrd_pulse = 4,
|
|
.ncs_write_pulse = 4,
|
|
.nwe_pulse = 4,
|
|
|
|
.read_cycle = 7,
|
|
.write_cycle = 7,
|
|
|
|
.mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE,
|
|
.tdf_cycles = 3,
|
|
};
|
|
|
|
static void __init ek_add_device_nand(void)
|
|
{
|
|
ek_nand_data.bus_width_16 = board_have_nand_16bit();
|
|
/* setup bus-width (8 or 16) */
|
|
if (ek_nand_data.bus_width_16)
|
|
ek_nand_smc_config.mode |= AT91_SMC_DBW_16;
|
|
else
|
|
ek_nand_smc_config.mode |= AT91_SMC_DBW_8;
|
|
|
|
/* configure chip-select 3 (NAND) */
|
|
sam9_smc_configure(0, 3, &ek_nand_smc_config);
|
|
|
|
at91_add_device_nand(&ek_nand_data);
|
|
}
|
|
|
|
|
|
/*
|
|
* MCI (SD/MMC)
|
|
* wp_pin and vcc_pin are not connected
|
|
*/
|
|
#if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE)
|
|
static struct mci_platform_data __initdata ek_mmc_data = {
|
|
.slot[1] = {
|
|
.bus_width = 4,
|
|
.detect_pin = AT91_PIN_PC9,
|
|
.wp_pin = -EINVAL,
|
|
},
|
|
|
|
};
|
|
#else
|
|
static struct at91_mmc_data __initdata ek_mmc_data = {
|
|
.slot_b = 1, /* Only one slot so use slot B */
|
|
.wire4 = 1,
|
|
.det_pin = AT91_PIN_PC9,
|
|
.wp_pin = -EINVAL,
|
|
.vcc_pin = -EINVAL,
|
|
};
|
|
#endif
|
|
|
|
static void __init ek_add_device_mmc(void)
|
|
{
|
|
#if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE)
|
|
if (ek_have_2mmc()) {
|
|
ek_mmc_data.slot[0].bus_width = 4;
|
|
ek_mmc_data.slot[0].detect_pin = AT91_PIN_PC2;
|
|
ek_mmc_data.slot[0].wp_pin = -1;
|
|
}
|
|
at91_add_device_mci(0, &ek_mmc_data);
|
|
#else
|
|
at91_add_device_mmc(0, &ek_mmc_data);
|
|
#endif
|
|
}
|
|
|
|
/*
|
|
* LEDs
|
|
*/
|
|
static struct gpio_led ek_leds[] = {
|
|
{ /* "bottom" led, green, userled1 to be defined */
|
|
.name = "ds5",
|
|
.gpio = AT91_PIN_PA6,
|
|
.active_low = 1,
|
|
.default_trigger = "none",
|
|
},
|
|
{ /* "power" led, yellow */
|
|
.name = "ds1",
|
|
.gpio = AT91_PIN_PA9,
|
|
.default_trigger = "heartbeat",
|
|
}
|
|
};
|
|
|
|
static void __init ek_add_device_gpio_leds(void)
|
|
{
|
|
if (ek_have_2mmc()) {
|
|
ek_leds[0].gpio = AT91_PIN_PB8;
|
|
ek_leds[1].gpio = AT91_PIN_PB9;
|
|
}
|
|
|
|
at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
|
|
}
|
|
|
|
/*
|
|
* GPIO Buttons
|
|
*/
|
|
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
|
|
static struct gpio_keys_button ek_buttons[] = {
|
|
{
|
|
.gpio = AT91_PIN_PA30,
|
|
.code = BTN_3,
|
|
.desc = "Button 3",
|
|
.active_low = 1,
|
|
.wakeup = 1,
|
|
},
|
|
{
|
|
.gpio = AT91_PIN_PA31,
|
|
.code = BTN_4,
|
|
.desc = "Button 4",
|
|
.active_low = 1,
|
|
.wakeup = 1,
|
|
}
|
|
};
|
|
|
|
static struct gpio_keys_platform_data ek_button_data = {
|
|
.buttons = ek_buttons,
|
|
.nbuttons = ARRAY_SIZE(ek_buttons),
|
|
};
|
|
|
|
static struct platform_device ek_button_device = {
|
|
.name = "gpio-keys",
|
|
.id = -1,
|
|
.num_resources = 0,
|
|
.dev = {
|
|
.platform_data = &ek_button_data,
|
|
}
|
|
};
|
|
|
|
static void __init ek_add_device_buttons(void)
|
|
{
|
|
at91_set_gpio_input(AT91_PIN_PA30, 1); /* btn3 */
|
|
at91_set_deglitch(AT91_PIN_PA30, 1);
|
|
at91_set_gpio_input(AT91_PIN_PA31, 1); /* btn4 */
|
|
at91_set_deglitch(AT91_PIN_PA31, 1);
|
|
|
|
platform_device_register(&ek_button_device);
|
|
}
|
|
#else
|
|
static void __init ek_add_device_buttons(void) {}
|
|
#endif
|
|
|
|
/*
|
|
* ADCs
|
|
*/
|
|
|
|
static struct at91_adc_data ek_adc_data = {
|
|
.channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3),
|
|
.use_external_triggers = true,
|
|
.vref = 3300,
|
|
};
|
|
|
|
#if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)
|
|
static struct regulator_consumer_supply ek_audio_consumer_supplies[] = {
|
|
REGULATOR_SUPPLY("AVDD", "0-001b"),
|
|
REGULATOR_SUPPLY("HPVDD", "0-001b"),
|
|
REGULATOR_SUPPLY("DBVDD", "0-001b"),
|
|
REGULATOR_SUPPLY("DCVDD", "0-001b"),
|
|
};
|
|
|
|
static struct regulator_init_data ek_avdd_reg_init_data = {
|
|
.constraints = {
|
|
.name = "3V3",
|
|
.valid_ops_mask = REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.consumer_supplies = ek_audio_consumer_supplies,
|
|
.num_consumer_supplies = ARRAY_SIZE(ek_audio_consumer_supplies),
|
|
};
|
|
|
|
static struct fixed_voltage_config ek_vdd_pdata = {
|
|
.supply_name = "board-3V3",
|
|
.microvolts = 3300000,
|
|
.gpio = -EINVAL,
|
|
.enabled_at_boot = 0,
|
|
.init_data = &ek_avdd_reg_init_data,
|
|
};
|
|
static struct platform_device ek_voltage_regulator = {
|
|
.name = "reg-fixed-voltage",
|
|
.id = -1,
|
|
.num_resources = 0,
|
|
.dev = {
|
|
.platform_data = &ek_vdd_pdata,
|
|
},
|
|
};
|
|
static void __init ek_add_regulators(void)
|
|
{
|
|
platform_device_register(&ek_voltage_regulator);
|
|
}
|
|
#else
|
|
static void __init ek_add_regulators(void) {}
|
|
#endif
|
|
|
|
|
|
static struct i2c_board_info __initdata ek_i2c_devices[] = {
|
|
{
|
|
I2C_BOARD_INFO("24c512", 0x50)
|
|
},
|
|
{
|
|
I2C_BOARD_INFO("wm8731", 0x1b)
|
|
},
|
|
};
|
|
|
|
|
|
static void __init ek_board_init(void)
|
|
{
|
|
/* Serial */
|
|
/* DBGU on ttyS0. (Rx & Tx only) */
|
|
at91_register_uart(0, 0, 0);
|
|
|
|
/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
|
|
at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
|
|
| ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
|
|
| ATMEL_UART_RI);
|
|
|
|
/* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */
|
|
at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS);
|
|
at91_add_device_serial();
|
|
/* USB Host */
|
|
at91_add_device_usbh(&ek_usbh_data);
|
|
/* USB Device */
|
|
at91_add_device_udc(&ek_udc_data);
|
|
/* SPI */
|
|
at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices));
|
|
/* NAND */
|
|
ek_add_device_nand();
|
|
/* Ethernet */
|
|
ek_add_device_macb();
|
|
/* Regulators */
|
|
ek_add_regulators();
|
|
/* MMC */
|
|
ek_add_device_mmc();
|
|
/* I2C */
|
|
at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices));
|
|
/* LEDs */
|
|
ek_add_device_gpio_leds();
|
|
/* Push Buttons */
|
|
ek_add_device_buttons();
|
|
/* ADCs */
|
|
at91_add_device_adc(&ek_adc_data);
|
|
/* PCK0 provides MCLK to the WM8731 */
|
|
at91_set_B_periph(AT91_PIN_PC1, 0);
|
|
/* SSC (for WM8731) */
|
|
at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX);
|
|
}
|
|
|
|
MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK")
|
|
/* Maintainer: Atmel */
|
|
.timer = &at91sam926x_timer,
|
|
.map_io = at91_map_io,
|
|
.init_early = ek_init_early,
|
|
.init_irq = at91_init_irq_default,
|
|
.init_machine = ek_board_init,
|
|
MACHINE_END
|
|
|
|
MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod")
|
|
/* Maintainer: Atmel */
|
|
.timer = &at91sam926x_timer,
|
|
.map_io = at91_map_io,
|
|
.init_early = ek_init_early,
|
|
.init_irq = at91_init_irq_default,
|
|
.init_machine = ek_board_init,
|
|
MACHINE_END
|