mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 10:56:40 +00:00
0195c00244
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAT3NKzROxKuMESys7AQKElw/+JyDxJSlj+g+nymkx8IVVuU8CsEwNLgRk 8KEnRfLhGtkXFLSJYWO6jzGo16F8Uqli1PdMFte/wagSv0285/HZaKlkkBVHdJ/m u40oSjgT013bBh6MQ0Oaf8pFezFUiQB5zPOA9QGaLVGDLXCmgqUgd7exaD5wRIwB ZmyItjZeAVnDfk1R+ZiNYytHAi8A5wSB+eFDCIQYgyulA1Igd1UnRtx+dRKbvc/m rWQ6KWbZHIdvP1ksd8wHHkrlUD2pEeJ8glJLsZUhMm/5oMf/8RmOCvmo8rvE/qwl eDQ1h4cGYlfjobxXZMHqAN9m7Jg2bI946HZjdb7/7oCeO6VW3FwPZ/Ic75p+wp45 HXJTItufERYk6QxShiOKvA+QexnYwY0IT5oRP4DrhdVB/X9cl2MoaZHC+RbYLQy+ /5VNZKi38iK4F9AbFamS7kd0i5QszA/ZzEzKZ6VMuOp3W/fagpn4ZJT1LIA3m4A9 Q0cj24mqeyCfjysu0TMbPtaN+Yjeu1o1OFRvM8XffbZsp5bNzuTDEvviJ2NXw4vK 4qUHulhYSEWcu9YgAZXvEWDEM78FXCkg2v/CrZXH5tyc95kUkMPcgG+QZBB5wElR FaOKpiC/BuNIGEf02IZQ4nfDxE90QwnDeoYeV+FvNj9UEOopJ5z5bMPoTHxm4cCD NypQthI85pc= =G9mT -----END PGP SIGNATURE----- Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system Pull "Disintegrate and delete asm/system.h" from David Howells: "Here are a bunch of patches to disintegrate asm/system.h into a set of separate bits to relieve the problem of circular inclusion dependencies. I've built all the working defconfigs from all the arches that I can and made sure that they don't break. The reason for these patches is that I recently encountered a circular dependency problem that came about when I produced some patches to optimise get_order() by rewriting it to use ilog2(). This uses bitops - and on the SH arch asm/bitops.h drags in asm-generic/get_order.h by a circuituous route involving asm/system.h. The main difficulty seems to be asm/system.h. It holds a number of low level bits with no/few dependencies that are commonly used (eg. memory barriers) and a number of bits with more dependencies that aren't used in many places (eg. switch_to()). These patches break asm/system.h up into the following core pieces: (1) asm/barrier.h Move memory barriers here. This already done for MIPS and Alpha. (2) asm/switch_to.h Move switch_to() and related stuff here. (3) asm/exec.h Move arch_align_stack() here. Other process execution related bits could perhaps go here from asm/processor.h. (4) asm/cmpxchg.h Move xchg() and cmpxchg() here as they're full word atomic ops and frequently used by atomic_xchg() and atomic_cmpxchg(). (5) asm/bug.h Move die() and related bits. (6) asm/auxvec.h Move AT_VECTOR_SIZE_ARCH here. Other arch headers are created as needed on a per-arch basis." Fixed up some conflicts from other header file cleanups and moving code around that has happened in the meantime, so David's testing is somewhat weakened by that. We'll find out anything that got broken and fix it.. * tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits) Delete all instances of asm/system.h Remove all #inclusions of asm/system.h Add #includes needed to permit the removal of asm/system.h Move all declarations of free_initmem() to linux/mm.h Disintegrate asm/system.h for OpenRISC Split arch_align_stack() out from asm-generic/system.h Split the switch_to() wrapper out of asm-generic/system.h Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h Create asm-generic/barrier.h Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h Disintegrate asm/system.h for Xtensa Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt] Disintegrate asm/system.h for Tile Disintegrate asm/system.h for Sparc Disintegrate asm/system.h for SH Disintegrate asm/system.h for Score Disintegrate asm/system.h for S390 Disintegrate asm/system.h for PowerPC Disintegrate asm/system.h for PA-RISC Disintegrate asm/system.h for MN10300 ...
393 lines
9.6 KiB
C
393 lines
9.6 KiB
C
/*
|
|
* linux/arch/arm/mach-omap2/board-omap3touchbook.c
|
|
*
|
|
* Copyright (C) 2009 Always Innovating
|
|
*
|
|
* Modified from mach-omap2/board-omap3beagleboard.c
|
|
*
|
|
* Initial code: Grégoire Gentil, Tim Yamin
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/err.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
#include <linux/leds.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/input.h>
|
|
#include <linux/gpio_keys.h>
|
|
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/mtd/nand.h>
|
|
#include <linux/mmc/host.h>
|
|
|
|
#include <plat/mcspi.h>
|
|
#include <linux/spi/spi.h>
|
|
|
|
#include <linux/spi/ads7846.h>
|
|
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/i2c/twl.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/flash.h>
|
|
#include <asm/system_info.h>
|
|
|
|
#include <plat/board.h>
|
|
#include "common.h"
|
|
#include <plat/gpmc.h>
|
|
#include <plat/nand.h>
|
|
#include <plat/usb.h>
|
|
|
|
#include "mux.h"
|
|
#include "hsmmc.h"
|
|
#include "common-board-devices.h"
|
|
|
|
#include <asm/setup.h>
|
|
|
|
#define OMAP3_AC_GPIO 136
|
|
#define OMAP3_TS_GPIO 162
|
|
#define TB_BL_PWM_TIMER 9
|
|
#define TB_KILL_POWER_GPIO 168
|
|
|
|
static unsigned long touchbook_revision;
|
|
|
|
static struct mtd_partition omap3touchbook_nand_partitions[] = {
|
|
/* All the partition sizes are listed in terms of NAND block size */
|
|
{
|
|
.name = "X-Loader",
|
|
.offset = 0,
|
|
.size = 4 * NAND_BLOCK_SIZE,
|
|
.mask_flags = MTD_WRITEABLE, /* force read-only */
|
|
},
|
|
{
|
|
.name = "U-Boot",
|
|
.offset = MTDPART_OFS_APPEND, /* Offset = 0x80000 */
|
|
.size = 15 * NAND_BLOCK_SIZE,
|
|
.mask_flags = MTD_WRITEABLE, /* force read-only */
|
|
},
|
|
{
|
|
.name = "U-Boot Env",
|
|
.offset = MTDPART_OFS_APPEND, /* Offset = 0x260000 */
|
|
.size = 1 * NAND_BLOCK_SIZE,
|
|
},
|
|
{
|
|
.name = "Kernel",
|
|
.offset = MTDPART_OFS_APPEND, /* Offset = 0x280000 */
|
|
.size = 32 * NAND_BLOCK_SIZE,
|
|
},
|
|
{
|
|
.name = "File System",
|
|
.offset = MTDPART_OFS_APPEND, /* Offset = 0x680000 */
|
|
.size = MTDPART_SIZ_FULL,
|
|
},
|
|
};
|
|
|
|
#include "sdram-micron-mt46h32m32lf-6.h"
|
|
|
|
static struct omap2_hsmmc_info mmc[] = {
|
|
{
|
|
.mmc = 1,
|
|
.caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
|
|
.gpio_wp = 29,
|
|
.deferred = true,
|
|
},
|
|
{} /* Terminator */
|
|
};
|
|
|
|
static struct regulator_consumer_supply touchbook_vmmc1_supply[] = {
|
|
REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"),
|
|
};
|
|
|
|
static struct regulator_consumer_supply touchbook_vsim_supply[] = {
|
|
REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"),
|
|
};
|
|
|
|
static struct gpio_led gpio_leds[];
|
|
|
|
static int touchbook_twl_gpio_setup(struct device *dev,
|
|
unsigned gpio, unsigned ngpio)
|
|
{
|
|
/* gpio + 0 is "mmc0_cd" (input/IRQ) */
|
|
mmc[0].gpio_cd = gpio + 0;
|
|
omap_hsmmc_late_init(mmc);
|
|
|
|
/* REVISIT: need ehci-omap hooks for external VBUS
|
|
* power switch and overcurrent detect
|
|
*/
|
|
gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC");
|
|
|
|
/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
|
|
gpio_request_one(gpio + TWL4030_GPIO_MAX, GPIOF_OUT_INIT_LOW,
|
|
"nEN_USB_PWR");
|
|
|
|
/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
|
|
gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct twl4030_gpio_platform_data touchbook_gpio_data = {
|
|
.gpio_base = OMAP_MAX_GPIO_LINES,
|
|
.irq_base = TWL4030_GPIO_IRQ_BASE,
|
|
.irq_end = TWL4030_GPIO_IRQ_END,
|
|
.use_leds = true,
|
|
.pullups = BIT(1),
|
|
.pulldowns = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13)
|
|
| BIT(15) | BIT(16) | BIT(17),
|
|
.setup = touchbook_twl_gpio_setup,
|
|
};
|
|
|
|
static struct regulator_consumer_supply touchbook_vdac_supply[] = {
|
|
{
|
|
.supply = "vdac",
|
|
},
|
|
};
|
|
|
|
static struct regulator_consumer_supply touchbook_vdvi_supply[] = {
|
|
{
|
|
.supply = "vdvi",
|
|
},
|
|
};
|
|
|
|
/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
|
|
static struct regulator_init_data touchbook_vmmc1 = {
|
|
.constraints = {
|
|
.min_uV = 1850000,
|
|
.max_uV = 3150000,
|
|
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
|
| REGULATOR_MODE_STANDBY,
|
|
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
|
|
| REGULATOR_CHANGE_MODE
|
|
| REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.num_consumer_supplies = ARRAY_SIZE(touchbook_vmmc1_supply),
|
|
.consumer_supplies = touchbook_vmmc1_supply,
|
|
};
|
|
|
|
/* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */
|
|
static struct regulator_init_data touchbook_vsim = {
|
|
.constraints = {
|
|
.min_uV = 1800000,
|
|
.max_uV = 3000000,
|
|
.valid_modes_mask = REGULATOR_MODE_NORMAL
|
|
| REGULATOR_MODE_STANDBY,
|
|
.valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
|
|
| REGULATOR_CHANGE_MODE
|
|
| REGULATOR_CHANGE_STATUS,
|
|
},
|
|
.num_consumer_supplies = ARRAY_SIZE(touchbook_vsim_supply),
|
|
.consumer_supplies = touchbook_vsim_supply,
|
|
};
|
|
|
|
static struct twl4030_platform_data touchbook_twldata = {
|
|
/* platform_data for children goes here */
|
|
.gpio = &touchbook_gpio_data,
|
|
.vmmc1 = &touchbook_vmmc1,
|
|
.vsim = &touchbook_vsim,
|
|
};
|
|
|
|
static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = {
|
|
{
|
|
I2C_BOARD_INFO("bq27200", 0x55),
|
|
},
|
|
};
|
|
|
|
static int __init omap3_touchbook_i2c_init(void)
|
|
{
|
|
/* Standard TouchBook bus */
|
|
omap3_pmic_get_config(&touchbook_twldata,
|
|
TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_AUDIO,
|
|
TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);
|
|
|
|
touchbook_twldata.vdac->num_consumer_supplies =
|
|
ARRAY_SIZE(touchbook_vdac_supply);
|
|
touchbook_twldata.vdac->consumer_supplies = touchbook_vdac_supply;
|
|
|
|
touchbook_twldata.vpll2->constraints.name = "VDVI";
|
|
touchbook_twldata.vpll2->num_consumer_supplies =
|
|
ARRAY_SIZE(touchbook_vdvi_supply);
|
|
touchbook_twldata.vpll2->consumer_supplies = touchbook_vdvi_supply;
|
|
|
|
omap3_pmic_init("twl4030", &touchbook_twldata);
|
|
/* Additional TouchBook bus */
|
|
omap_register_i2c_bus(3, 100, touchBook_i2c_boardinfo,
|
|
ARRAY_SIZE(touchBook_i2c_boardinfo));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct ads7846_platform_data ads7846_pdata = {
|
|
.x_min = 100,
|
|
.y_min = 265,
|
|
.x_max = 3950,
|
|
.y_max = 3750,
|
|
.x_plate_ohms = 40,
|
|
.pressure_max = 255,
|
|
.debounce_max = 10,
|
|
.debounce_tol = 5,
|
|
.debounce_rep = 1,
|
|
.gpio_pendown = OMAP3_TS_GPIO,
|
|
.keep_vref_on = 1,
|
|
};
|
|
|
|
static struct gpio_led gpio_leds[] = {
|
|
{
|
|
.name = "touchbook::usr0",
|
|
.default_trigger = "heartbeat",
|
|
.gpio = 150,
|
|
},
|
|
{
|
|
.name = "touchbook::usr1",
|
|
.default_trigger = "mmc0",
|
|
.gpio = 149,
|
|
},
|
|
{
|
|
.name = "touchbook::pmu_stat",
|
|
.gpio = -EINVAL, /* gets replaced */
|
|
.active_low = true,
|
|
},
|
|
};
|
|
|
|
static struct gpio_led_platform_data gpio_led_info = {
|
|
.leds = gpio_leds,
|
|
.num_leds = ARRAY_SIZE(gpio_leds),
|
|
};
|
|
|
|
static struct platform_device leds_gpio = {
|
|
.name = "leds-gpio",
|
|
.id = -1,
|
|
.dev = {
|
|
.platform_data = &gpio_led_info,
|
|
},
|
|
};
|
|
|
|
static struct gpio_keys_button gpio_buttons[] = {
|
|
{
|
|
.code = BTN_EXTRA,
|
|
.gpio = 7,
|
|
.desc = "user",
|
|
.wakeup = 1,
|
|
},
|
|
{
|
|
.code = KEY_POWER,
|
|
.gpio = 183,
|
|
.desc = "power",
|
|
.wakeup = 1,
|
|
},
|
|
};
|
|
|
|
static struct gpio_keys_platform_data gpio_key_info = {
|
|
.buttons = gpio_buttons,
|
|
.nbuttons = ARRAY_SIZE(gpio_buttons),
|
|
};
|
|
|
|
static struct platform_device keys_gpio = {
|
|
.name = "gpio-keys",
|
|
.id = -1,
|
|
.dev = {
|
|
.platform_data = &gpio_key_info,
|
|
},
|
|
};
|
|
|
|
#ifdef CONFIG_OMAP_MUX
|
|
static struct omap_board_mux board_mux[] __initdata = {
|
|
{ .reg_offset = OMAP_MUX_TERMINATOR },
|
|
};
|
|
#endif
|
|
|
|
static struct platform_device *omap3_touchbook_devices[] __initdata = {
|
|
&leds_gpio,
|
|
&keys_gpio,
|
|
};
|
|
|
|
static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
|
|
|
|
.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
|
|
.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
|
|
.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
|
|
|
|
.phy_reset = true,
|
|
.reset_gpio_port[0] = -EINVAL,
|
|
.reset_gpio_port[1] = 147,
|
|
.reset_gpio_port[2] = -EINVAL
|
|
};
|
|
|
|
static void omap3_touchbook_poweroff(void)
|
|
{
|
|
int pwr_off = TB_KILL_POWER_GPIO;
|
|
|
|
if (gpio_request_one(pwr_off, GPIOF_OUT_INIT_LOW, "DVI reset") < 0)
|
|
printk(KERN_ERR "Unable to get kill power GPIO\n");
|
|
}
|
|
|
|
static int __init early_touchbook_revision(char *p)
|
|
{
|
|
if (!p)
|
|
return 0;
|
|
|
|
return strict_strtoul(p, 10, &touchbook_revision);
|
|
}
|
|
early_param("tbr", early_touchbook_revision);
|
|
|
|
static void __init omap3_touchbook_init(void)
|
|
{
|
|
omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
|
|
|
|
pm_power_off = omap3_touchbook_poweroff;
|
|
|
|
if (system_rev >= 0x20 && system_rev <= 0x34301000) {
|
|
omap_mux_init_gpio(23, OMAP_PIN_INPUT);
|
|
mmc[0].gpio_wp = 23;
|
|
} else {
|
|
omap_mux_init_gpio(29, OMAP_PIN_INPUT);
|
|
}
|
|
omap_hsmmc_init(mmc);
|
|
|
|
omap3_touchbook_i2c_init();
|
|
platform_add_devices(omap3_touchbook_devices,
|
|
ARRAY_SIZE(omap3_touchbook_devices));
|
|
omap_serial_init();
|
|
omap_sdrc_init(mt46h32m32lf6_sdrc_params,
|
|
mt46h32m32lf6_sdrc_params);
|
|
|
|
omap_mux_init_gpio(170, OMAP_PIN_INPUT);
|
|
/* REVISIT leave DVI powered down until it's needed ... */
|
|
gpio_request_one(176, GPIOF_OUT_INIT_HIGH, "DVI_nPD");
|
|
|
|
/* Touchscreen and accelerometer */
|
|
omap_ads7846_init(4, OMAP3_TS_GPIO, 310, &ads7846_pdata);
|
|
usb_musb_init(NULL);
|
|
usbhs_init(&usbhs_bdata);
|
|
omap_nand_flash_init(NAND_BUSWIDTH_16, omap3touchbook_nand_partitions,
|
|
ARRAY_SIZE(omap3touchbook_nand_partitions));
|
|
|
|
/* Ensure SDRC pins are mux'd for self-refresh */
|
|
omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
|
|
omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
|
|
}
|
|
|
|
MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board")
|
|
/* Maintainer: Gregoire Gentil - http://www.alwaysinnovating.com */
|
|
.atag_offset = 0x100,
|
|
.reserve = omap_reserve,
|
|
.map_io = omap3_map_io,
|
|
.init_early = omap3430_init_early,
|
|
.init_irq = omap3_init_irq,
|
|
.handle_irq = omap3_intc_handle_irq,
|
|
.init_machine = omap3_touchbook_init,
|
|
.timer = &omap3_secure_timer,
|
|
.restart = omap_prcm_restart,
|
|
MACHINE_END
|