32aaeffbd4
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits) Revert "tracing: Include module.h in define_trace.h" irq: don't put module.h into irq.h for tracking irqgen modules. bluetooth: macroize two small inlines to avoid module.h ip_vs.h: fix implicit use of module_get/module_put from module.h nf_conntrack.h: fix up fallout from implicit moduleparam.h presence include: replace linux/module.h with "struct module" wherever possible include: convert various register fcns to macros to avoid include chaining crypto.h: remove unused crypto_tfm_alg_modname() inline uwb.h: fix implicit use of asm/page.h for PAGE_SIZE pm_runtime.h: explicitly requires notifier.h linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h miscdevice.h: fix up implicit use of lists and types stop_machine.h: fix implicit use of smp.h for smp_processor_id of: fix implicit use of errno.h in include/linux/of.h of_platform.h: delete needless include <linux/module.h> acpi: remove module.h include from platform/aclinux.h miscdevice.h: delete unnecessary inclusion of module.h device_cgroup.h: delete needless include <linux/module.h> net: sch_generic remove redundant use of <linux/module.h> net: inet_timewait_sock doesnt need <linux/module.h> ... Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in - drivers/media/dvb/frontends/dibx000_common.c - drivers/media/video/{mt9m111.c,ov6650.c} - drivers/mfd/ab3550-core.c - include/linux/dmaengine.h
389 lines
9.4 KiB
C
389 lines
9.4 KiB
C
/*
|
|
* linux/arch/arm/mach-omap1/board-ams-delta.c
|
|
*
|
|
* Modified from board-generic.c
|
|
*
|
|
* Board specific inits for the Amstrad E3 (codename Delta) videophone
|
|
*
|
|
* Copyright (C) 2006 Jonathan McDowell <noodles@earth.li>
|
|
*
|
|
* 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/gpio.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/input.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/leds.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/serial_8250.h>
|
|
#include <linux/export.h>
|
|
|
|
#include <media/soc_camera.h>
|
|
|
|
#include <asm/serial.h>
|
|
#include <mach/hardware.h>
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <plat/io.h>
|
|
#include <plat/board-ams-delta.h>
|
|
#include <plat/keypad.h>
|
|
#include <plat/mux.h>
|
|
#include <plat/usb.h>
|
|
#include <plat/board.h>
|
|
#include <plat/common.h>
|
|
#include <mach/camera.h>
|
|
|
|
#include <mach/ams-delta-fiq.h>
|
|
|
|
static u8 ams_delta_latch1_reg;
|
|
static u16 ams_delta_latch2_reg;
|
|
|
|
static const unsigned int ams_delta_keymap[] = {
|
|
KEY(0, 0, KEY_F1), /* Advert */
|
|
|
|
KEY(0, 3, KEY_COFFEE), /* Games */
|
|
KEY(0, 2, KEY_QUESTION), /* Directory */
|
|
KEY(2, 3, KEY_CONNECT), /* Internet */
|
|
KEY(1, 2, KEY_SHOP), /* Services */
|
|
KEY(1, 1, KEY_PHONE), /* VoiceMail */
|
|
|
|
KEY(0, 1, KEY_DELETE), /* Delete */
|
|
KEY(2, 2, KEY_PLAY), /* Play */
|
|
KEY(1, 0, KEY_PAGEUP), /* Up */
|
|
KEY(1, 3, KEY_PAGEDOWN), /* Down */
|
|
KEY(2, 0, KEY_EMAIL), /* ReadEmail */
|
|
KEY(2, 1, KEY_STOP), /* Stop */
|
|
|
|
/* Numeric keypad portion */
|
|
KEY(0, 7, KEY_KP1),
|
|
KEY(0, 6, KEY_KP2),
|
|
KEY(0, 5, KEY_KP3),
|
|
KEY(1, 7, KEY_KP4),
|
|
KEY(1, 6, KEY_KP5),
|
|
KEY(1, 5, KEY_KP6),
|
|
KEY(2, 7, KEY_KP7),
|
|
KEY(2, 6, KEY_KP8),
|
|
KEY(2, 5, KEY_KP9),
|
|
KEY(3, 6, KEY_KP0),
|
|
KEY(3, 7, KEY_KPASTERISK),
|
|
KEY(3, 5, KEY_KPDOT), /* # key */
|
|
KEY(7, 2, KEY_NUMLOCK), /* Mute */
|
|
KEY(7, 1, KEY_KPMINUS), /* Recall */
|
|
KEY(6, 1, KEY_KPPLUS), /* Redial */
|
|
KEY(7, 6, KEY_KPSLASH), /* Handsfree */
|
|
KEY(6, 0, KEY_ENTER), /* Video */
|
|
|
|
KEY(7, 4, KEY_CAMERA), /* Photo */
|
|
|
|
KEY(0, 4, KEY_F2), /* Home */
|
|
KEY(1, 4, KEY_F3), /* Office */
|
|
KEY(2, 4, KEY_F4), /* Mobile */
|
|
KEY(7, 7, KEY_F5), /* SMS */
|
|
KEY(7, 5, KEY_F6), /* Email */
|
|
|
|
/* QWERTY portion of keypad */
|
|
KEY(3, 4, KEY_Q),
|
|
KEY(3, 3, KEY_W),
|
|
KEY(3, 2, KEY_E),
|
|
KEY(3, 1, KEY_R),
|
|
KEY(3, 0, KEY_T),
|
|
KEY(4, 7, KEY_Y),
|
|
KEY(4, 6, KEY_U),
|
|
KEY(4, 5, KEY_I),
|
|
KEY(4, 4, KEY_O),
|
|
KEY(4, 3, KEY_P),
|
|
|
|
KEY(4, 2, KEY_A),
|
|
KEY(4, 1, KEY_S),
|
|
KEY(4, 0, KEY_D),
|
|
KEY(5, 7, KEY_F),
|
|
KEY(5, 6, KEY_G),
|
|
KEY(5, 5, KEY_H),
|
|
KEY(5, 4, KEY_J),
|
|
KEY(5, 3, KEY_K),
|
|
KEY(5, 2, KEY_L),
|
|
|
|
KEY(5, 1, KEY_Z),
|
|
KEY(5, 0, KEY_X),
|
|
KEY(6, 7, KEY_C),
|
|
KEY(6, 6, KEY_V),
|
|
KEY(6, 5, KEY_B),
|
|
KEY(6, 4, KEY_N),
|
|
KEY(6, 3, KEY_M),
|
|
KEY(6, 2, KEY_SPACE),
|
|
|
|
KEY(7, 0, KEY_LEFTSHIFT), /* Vol up */
|
|
KEY(7, 3, KEY_LEFTCTRL), /* Vol down */
|
|
};
|
|
|
|
void ams_delta_latch1_write(u8 mask, u8 value)
|
|
{
|
|
ams_delta_latch1_reg &= ~mask;
|
|
ams_delta_latch1_reg |= value;
|
|
*(volatile __u8 *) AMS_DELTA_LATCH1_VIRT = ams_delta_latch1_reg;
|
|
}
|
|
|
|
void ams_delta_latch2_write(u16 mask, u16 value)
|
|
{
|
|
ams_delta_latch2_reg &= ~mask;
|
|
ams_delta_latch2_reg |= value;
|
|
*(volatile __u16 *) AMS_DELTA_LATCH2_VIRT = ams_delta_latch2_reg;
|
|
}
|
|
|
|
static struct map_desc ams_delta_io_desc[] __initdata = {
|
|
/* AMS_DELTA_LATCH1 */
|
|
{
|
|
.virtual = AMS_DELTA_LATCH1_VIRT,
|
|
.pfn = __phys_to_pfn(AMS_DELTA_LATCH1_PHYS),
|
|
.length = 0x01000000,
|
|
.type = MT_DEVICE
|
|
},
|
|
/* AMS_DELTA_LATCH2 */
|
|
{
|
|
.virtual = AMS_DELTA_LATCH2_VIRT,
|
|
.pfn = __phys_to_pfn(AMS_DELTA_LATCH2_PHYS),
|
|
.length = 0x01000000,
|
|
.type = MT_DEVICE
|
|
},
|
|
/* AMS_DELTA_MODEM */
|
|
{
|
|
.virtual = AMS_DELTA_MODEM_VIRT,
|
|
.pfn = __phys_to_pfn(AMS_DELTA_MODEM_PHYS),
|
|
.length = 0x01000000,
|
|
.type = MT_DEVICE
|
|
}
|
|
};
|
|
|
|
static struct omap_lcd_config ams_delta_lcd_config = {
|
|
.ctrl_name = "internal",
|
|
};
|
|
|
|
static struct omap_usb_config ams_delta_usb_config __initdata = {
|
|
.register_host = 1,
|
|
.hmc_mode = 16,
|
|
.pins[0] = 2,
|
|
};
|
|
|
|
static struct omap_board_config_kernel ams_delta_config[] __initdata = {
|
|
{ OMAP_TAG_LCD, &ams_delta_lcd_config },
|
|
};
|
|
|
|
static struct resource ams_delta_nand_resources[] = {
|
|
[0] = {
|
|
.start = OMAP1_MPUIO_BASE,
|
|
.end = OMAP1_MPUIO_BASE +
|
|
OMAP_MPUIO_IO_CNTL + sizeof(u32) - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device ams_delta_nand_device = {
|
|
.name = "ams-delta-nand",
|
|
.id = -1,
|
|
.num_resources = ARRAY_SIZE(ams_delta_nand_resources),
|
|
.resource = ams_delta_nand_resources,
|
|
};
|
|
|
|
static struct resource ams_delta_kp_resources[] = {
|
|
[0] = {
|
|
.start = INT_KEYBOARD,
|
|
.end = INT_KEYBOARD,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static const struct matrix_keymap_data ams_delta_keymap_data = {
|
|
.keymap = ams_delta_keymap,
|
|
.keymap_size = ARRAY_SIZE(ams_delta_keymap),
|
|
};
|
|
|
|
static struct omap_kp_platform_data ams_delta_kp_data __initdata = {
|
|
.rows = 8,
|
|
.cols = 8,
|
|
.keymap_data = &ams_delta_keymap_data,
|
|
.delay = 9,
|
|
};
|
|
|
|
static struct platform_device ams_delta_kp_device = {
|
|
.name = "omap-keypad",
|
|
.id = -1,
|
|
.dev = {
|
|
.platform_data = &ams_delta_kp_data,
|
|
},
|
|
.num_resources = ARRAY_SIZE(ams_delta_kp_resources),
|
|
.resource = ams_delta_kp_resources,
|
|
};
|
|
|
|
static struct platform_device ams_delta_lcd_device = {
|
|
.name = "lcd_ams_delta",
|
|
.id = -1,
|
|
};
|
|
|
|
static struct platform_device ams_delta_led_device = {
|
|
.name = "ams-delta-led",
|
|
.id = -1
|
|
};
|
|
|
|
static struct i2c_board_info ams_delta_camera_board_info[] = {
|
|
{
|
|
I2C_BOARD_INFO("ov6650", 0x60),
|
|
},
|
|
};
|
|
|
|
#ifdef CONFIG_LEDS_TRIGGERS
|
|
DEFINE_LED_TRIGGER(ams_delta_camera_led_trigger);
|
|
|
|
static int ams_delta_camera_power(struct device *dev, int power)
|
|
{
|
|
/*
|
|
* turn on camera LED
|
|
*/
|
|
if (power)
|
|
led_trigger_event(ams_delta_camera_led_trigger, LED_FULL);
|
|
else
|
|
led_trigger_event(ams_delta_camera_led_trigger, LED_OFF);
|
|
return 0;
|
|
}
|
|
#else
|
|
#define ams_delta_camera_power NULL
|
|
#endif
|
|
|
|
static struct soc_camera_link ams_delta_iclink = {
|
|
.bus_id = 0, /* OMAP1 SoC camera bus */
|
|
.i2c_adapter_id = 1,
|
|
.board_info = &ams_delta_camera_board_info[0],
|
|
.module_name = "ov6650",
|
|
.power = ams_delta_camera_power,
|
|
};
|
|
|
|
static struct platform_device ams_delta_camera_device = {
|
|
.name = "soc-camera-pdrv",
|
|
.id = 0,
|
|
.dev = {
|
|
.platform_data = &ams_delta_iclink,
|
|
},
|
|
};
|
|
|
|
static struct omap1_cam_platform_data ams_delta_camera_platform_data = {
|
|
.camexclk_khz = 12000, /* default 12MHz clock, no extra DPLL */
|
|
.lclk_khz_max = 1334, /* results in 5fps CIF, 10fps QCIF */
|
|
};
|
|
|
|
static struct platform_device *ams_delta_devices[] __initdata = {
|
|
&ams_delta_nand_device,
|
|
&ams_delta_kp_device,
|
|
&ams_delta_lcd_device,
|
|
&ams_delta_led_device,
|
|
&ams_delta_camera_device,
|
|
};
|
|
|
|
static void __init ams_delta_init(void)
|
|
{
|
|
/* mux pins for uarts */
|
|
omap_cfg_reg(UART1_TX);
|
|
omap_cfg_reg(UART1_RTS);
|
|
|
|
/* parallel camera interface */
|
|
omap_cfg_reg(H19_1610_CAM_EXCLK);
|
|
omap_cfg_reg(J15_1610_CAM_LCLK);
|
|
omap_cfg_reg(L18_1610_CAM_VS);
|
|
omap_cfg_reg(L15_1610_CAM_HS);
|
|
omap_cfg_reg(L19_1610_CAM_D0);
|
|
omap_cfg_reg(K14_1610_CAM_D1);
|
|
omap_cfg_reg(K15_1610_CAM_D2);
|
|
omap_cfg_reg(K19_1610_CAM_D3);
|
|
omap_cfg_reg(K18_1610_CAM_D4);
|
|
omap_cfg_reg(J14_1610_CAM_D5);
|
|
omap_cfg_reg(J19_1610_CAM_D6);
|
|
omap_cfg_reg(J18_1610_CAM_D7);
|
|
|
|
iotable_init(ams_delta_io_desc, ARRAY_SIZE(ams_delta_io_desc));
|
|
|
|
omap_board_config = ams_delta_config;
|
|
omap_board_config_size = ARRAY_SIZE(ams_delta_config);
|
|
omap_serial_init();
|
|
omap_register_i2c_bus(1, 100, NULL, 0);
|
|
|
|
/* Clear latch2 (NAND, LCD, modem enable) */
|
|
ams_delta_latch2_write(~0, 0);
|
|
|
|
omap1_usb_init(&ams_delta_usb_config);
|
|
omap1_set_camera_info(&ams_delta_camera_platform_data);
|
|
#ifdef CONFIG_LEDS_TRIGGERS
|
|
led_trigger_register_simple("ams_delta_camera",
|
|
&ams_delta_camera_led_trigger);
|
|
#endif
|
|
platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices));
|
|
|
|
ams_delta_init_fiq();
|
|
|
|
omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1);
|
|
}
|
|
|
|
static struct plat_serial8250_port ams_delta_modem_ports[] = {
|
|
{
|
|
.membase = IOMEM(AMS_DELTA_MODEM_VIRT),
|
|
.mapbase = AMS_DELTA_MODEM_PHYS,
|
|
.irq = -EINVAL, /* changed later */
|
|
.flags = UPF_BOOT_AUTOCONF,
|
|
.irqflags = IRQF_TRIGGER_RISING,
|
|
.iotype = UPIO_MEM,
|
|
.regshift = 1,
|
|
.uartclk = BASE_BAUD * 16,
|
|
},
|
|
{ },
|
|
};
|
|
|
|
static struct platform_device ams_delta_modem_device = {
|
|
.name = "serial8250",
|
|
.id = PLAT8250_DEV_PLATFORM1,
|
|
.dev = {
|
|
.platform_data = ams_delta_modem_ports,
|
|
},
|
|
};
|
|
|
|
static int __init ams_delta_modem_init(void)
|
|
{
|
|
int err;
|
|
|
|
if (!machine_is_ams_delta())
|
|
return -ENODEV;
|
|
|
|
omap_cfg_reg(M14_1510_GPIO2);
|
|
ams_delta_modem_ports[0].irq =
|
|
gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
|
|
|
|
err = gpio_request(AMS_DELTA_GPIO_PIN_MODEM_IRQ, "modem");
|
|
if (err) {
|
|
pr_err("Couldn't request gpio pin for modem\n");
|
|
return err;
|
|
}
|
|
gpio_direction_input(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
|
|
|
|
ams_delta_latch2_write(
|
|
AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC,
|
|
AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC);
|
|
|
|
return platform_device_register(&ams_delta_modem_device);
|
|
}
|
|
arch_initcall(ams_delta_modem_init);
|
|
|
|
MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
|
|
/* Maintainer: Jonathan McDowell <noodles@earth.li> */
|
|
.atag_offset = 0x100,
|
|
.map_io = omap15xx_map_io,
|
|
.init_early = omap1_init_early,
|
|
.reserve = omap_reserve,
|
|
.init_irq = omap1_init_irq,
|
|
.init_machine = ams_delta_init,
|
|
.timer = &omap1_timer,
|
|
MACHINE_END
|
|
|
|
EXPORT_SYMBOL(ams_delta_latch1_write);
|
|
EXPORT_SYMBOL(ams_delta_latch2_write);
|