diff -ruN linux-2.6.15-omap1-omap2/arch/arm/configs/E3_defconfig linux-2.6.15-e3/arch/arm/configs/E3_defconfig --- linux-2.6.15-omap1-omap2/arch/arm/configs/E3_defconfig 2006-02-22 16:57:32.238244051 +0000 +++ linux-2.6.15-e3/arch/arm/configs/E3_defconfig 2006-02-27 19:27:21.751557973 +0000 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.15-omap1-omap2 -# Sun Feb 19 11:25:08 2006 +# Mon Feb 27 19:25:28 2006 # CONFIG_ARM=y CONFIG_MMU=y @@ -23,7 +23,7 @@ # CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y -CONFIG_SWAP=y +# CONFIG_SWAP is not set CONFIG_SYSVIPC=y # CONFIG_POSIX_MQUEUE is not set # CONFIG_BSD_PROCESS_ACCT is not set @@ -140,7 +140,8 @@ # CONFIG_MACH_OMAP_INNOVATOR is not set # CONFIG_MACH_VOICEBLUE is not set # CONFIG_MACH_OMAP_PALMTE is not set -CONFIG_MACH_OMAP_GENERIC=y +CONFIG_MACH_AMS_DELTA=y +# CONFIG_MACH_OMAP_GENERIC is not set # # OMAP CPU Speed @@ -329,7 +330,81 @@ # # Memory Technology Devices (MTD) # -# CONFIG_MTD is not set +CONFIG_MTD=y +# CONFIG_MTD_DEBUG is not set +# CONFIG_MTD_CONCAT is not set +CONFIG_MTD_PARTITIONS=y +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_CMDLINE_PARTS is not set +# CONFIG_MTD_AFS_PARTS is not set + +# +# User Modules And Translation Layers +# +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set +# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_CFI_I4 is not set +# CONFIG_MTD_CFI_I8 is not set +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLKMTD is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOC2000 is not set +# CONFIG_MTD_DOC2001 is not set +# CONFIG_MTD_DOC2001PLUS is not set + +# +# NAND Flash Device Drivers +# +CONFIG_MTD_NAND=y +# CONFIG_MTD_NAND_VERIFY_WRITE is not set +CONFIG_MTD_NAND_AMS_DELTA=y +# CONFIG_MTD_NAND_TOTO is not set +CONFIG_MTD_NAND_IDS=y +# CONFIG_MTD_NAND_DISKONCHIP is not set +# CONFIG_MTD_NAND_NANDSIM is not set + +# +# OneNAND Flash Device Drivers +# +# CONFIG_MTD_ONENAND is not set +# CONFIG_MTD_ONENAND_SYNC_READ is not set # # Parallel port support @@ -881,7 +956,7 @@ # CONFIG_PROC_FS=y CONFIG_SYSFS=y -# CONFIG_TMPFS is not set +CONFIG_TMPFS=y # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_RELAYFS_FS is not set @@ -896,6 +971,15 @@ # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set +# CONFIG_JFFS_FS is not set +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_FS_DEBUG=0 +CONFIG_JFFS2_FS_WRITEBUFFER=y +# CONFIG_JFFS2_SUMMARY is not set +# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set +CONFIG_JFFS2_ZLIB=y +CONFIG_JFFS2_RTIME=y +# CONFIG_JFFS2_RUBIN is not set # CONFIG_CRAMFS is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set @@ -1040,3 +1124,5 @@ # CONFIG_CRC16 is not set CONFIG_CRC32=y # CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y diff -ruN linux-2.6.15-omap1-omap2/arch/arm/mach-omap1/board-ams-delta.c linux-2.6.15-e3/arch/arm/mach-omap1/board-ams-delta.c --- linux-2.6.15-omap1-omap2/arch/arm/mach-omap1/board-ams-delta.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.15-e3/arch/arm/mach-omap1/board-ams-delta.c 2006-02-27 12:27:28.935462303 +0000 @@ -0,0 +1,171 @@ +/* + * 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 + * + * 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 +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +static u8 ams_delta_latch1_reg; +static u16 ams_delta_latch2_reg; + +void ams_delta_latch1_write(u8 mask, u8 value) +{ + ams_delta_latch1_reg &= ~mask; + ams_delta_latch1_reg |= value; + *(volatile __u8 *) AMS_DELTA_LATCH1_BASE = 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_BASE = ams_delta_latch2_reg; +} + +static void __init ams_delta_init_irq(void) +{ + printk("ams_delta_init_irq\n"); + omap1_init_common_hw(); + omap_init_irq(); +} + +static struct mtd_partition ams_delta_nor_partitions[] = { + /* The NOR flash just contains PBL */ + { + .name = "pbl", + .offset = 0, + .size = SZ_128K, + .mask_flags = MTD_WRITEABLE, /* force read-only */ + } +}; + +static struct flash_platform_data ams_delta_nor_data = { + .map_name = "jedec_probe", + .width = 2, + .parts = ams_delta_nor_partitions, + .nr_parts = ARRAY_SIZE(ams_delta_nor_partitions) +}; + +static struct resource ams_delta_nor_resource = { + .flags = IORESOURCE_MEM, +}; + +static struct platform_device ams_delta_nor_device = { + .name = "omapflash", + .id = 0, + .dev = { + .platform_data = &ams_delta_nor_data, + }, + .num_resources = 1, + .resource = &ams_delta_nor_resource, +}; + +static struct map_desc ams_delta_io_desc[] __initdata = { + // AMS_DELTA_LATCH1 + { + .virtual = AMS_DELTA_LATCH1_BASE, + .pfn = __phys_to_pfn(0x01000000), + .length = 0x08000000, + .type = MT_DEVICE + }, + // AMS_DELTA_LATCH2 + { + .virtual = AMS_DELTA_LATCH2_BASE, + .pfn = __phys_to_pfn(0x08000000), + .length = 0x08000000, + .type = MT_DEVICE + } +}; + +static struct platform_device *ams_delta_devices[] __initdata = { + &ams_delta_nor_device, +}; + +static struct omap_usb_config ams_delta_usb_config __initdata = { + .register_host = 1, + .register_dev = 1, + .hmc_mode = 16, + .pins[0] = 3, +}; + +static struct omap_uart_config ams_delta_uart_config __initdata = { + .enabled_uarts = 1, +}; + +static struct omap_lcd_config ams_delta_lcd_config __initdata = { + .panel_name = "ams-delta", + .ctrl_name = "internal", +}; + +static struct omap_board_config_kernel ams_delta_config[] = { + { OMAP_TAG_LCD, &ams_delta_lcd_config }, + { OMAP_TAG_USB, &ams_delta_usb_config }, + { OMAP_TAG_UART, &ams_delta_uart_config }, +}; + +static void __init ams_delta_init(void) +{ + ams_delta_nor_resource.end = ams_delta_nor_resource.start = + omap_cs0_phys(); + ams_delta_nor_resource.end += SZ_128K - 1; + + platform_add_devices(ams_delta_devices, ARRAY_SIZE(ams_delta_devices)); + + 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); + + /* Clear latch2 (NAND, LCD, modem enable) */ + ams_delta_latch2_write(~0, 0); + + omap_gpio_init(); + omap_serial_init(); +} + +static void __init ams_delta_map_io(void) +{ + omap1_map_common_io(); +} + +MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") + /* Maintainer: Mark Underwood */ + .phys_ram = 0x10000000, + .phys_io = 0xfff00000, + .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc, + .boot_params = 0x10000100, + .map_io = ams_delta_map_io, + .init_irq = ams_delta_init_irq, + .init_machine = ams_delta_init, + .timer = &omap_timer, +MACHINE_END + +EXPORT_SYMBOL(ams_delta_latch1_write); +EXPORT_SYMBOL(ams_delta_latch2_write); diff -ruN linux-2.6.15-omap1-omap2/arch/arm/mach-omap1/Kconfig linux-2.6.15-e3/arch/arm/mach-omap1/Kconfig --- linux-2.6.15-omap1-omap2/arch/arm/mach-omap1/Kconfig 2006-02-22 16:57:32.322247033 +0000 +++ linux-2.6.15-e3/arch/arm/mach-omap1/Kconfig 2006-02-22 12:57:40.481572898 +0000 @@ -79,6 +79,13 @@ informations. Say Y here if you have such a PDA, say NO otherwise. +config MACH_AMS_DELTA + bool "Amstrad E3 (Delta)" + depends on ARCH_OMAP1 && ARCH_OMAP15XX + help + Support for the Amstrad E3 (codename Delta) videophone. Say Y here + if you have such a device. + config MACH_OMAP_GENERIC bool "Generic OMAP board" depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX) diff -ruN linux-2.6.15-omap1-omap2/arch/arm/mach-omap1/Makefile linux-2.6.15-e3/arch/arm/mach-omap1/Makefile --- linux-2.6.15-omap1-omap2/arch/arm/mach-omap1/Makefile 2006-02-22 16:57:32.322247033 +0000 +++ linux-2.6.15-e3/arch/arm/mach-omap1/Makefile 2006-02-22 12:58:25.163159182 +0000 @@ -20,6 +20,7 @@ obj-$(CONFIG_MACH_OMAP_OSK) += board-osk.o obj-$(CONFIG_MACH_OMAP_H3) += board-h3.o obj-$(CONFIG_MACH_VOICEBLUE) += board-voiceblue.o +obj-$(CONFIG_MACH_AMS_DELTA) += board-ams-delta.o obj-$(CONFIG_MACH_OMAP_PALMTE) += board-palmte.o ifeq ($(CONFIG_ARCH_OMAP15XX),y) diff -ruN linux-2.6.15-omap1-omap2/drivers/input/keyboard/omap-keypad.c linux-2.6.15-e3/drivers/input/keyboard/omap-keypad.c --- linux-2.6.15-omap1-omap2/drivers/input/keyboard/omap-keypad.c 2006-02-22 16:57:32.670259389 +0000 +++ linux-2.6.15-e3/drivers/input/keyboard/omap-keypad.c 2006-02-27 09:35:52.664946399 +0000 @@ -169,6 +169,56 @@ 0 }; +static int ams_delta_keymap[] = { + KEY(7, 0, KEY_1), + KEY(6, 0, KEY_2), + KEY(5, 0, KEY_3), + KEY(7, 1, KEY_4), + KEY(6, 1, KEY_5), + KEY(5, 1, KEY_6), + KEY(7, 2, KEY_7), + KEY(6, 2, KEY_8), + KEY(5, 2, KEY_9), + KEY(6, 3, KEY_0), + KEY(7, 3, KEY_STAR), + KEY(5, 3, KEY_SHARP), + + KEY(4, 3, KEY_Q), + KEY(3, 3, KEY_W), + KEY(2, 3, KEY_E), + KEY(1, 3, KEY_R), + KEY(0, 3, KEY_T), + KEY(7, 4, KEY_Y), + KEY(6, 4, KEY_U), + KEY(5, 4, KEY_I), + KEY(4, 4, KEY_O), + KEY(3, 4, KEY_P), + + KEY(2, 4, KEY_A), + KEY(1, 4, KEY_S), + KEY(0, 4, KEY_D), + KEY(7, 5, KEY_F), + KEY(6, 5, KEY_G), + KEY(5, 5, KEY_H), + KEY(4, 5, KEY_J), + KEY(3, 5, KEY_K), + KEY(2, 5, KEY_L), + + KEY(1, 5, KEY_Z), + KEY(0, 5, KEY_X), + KEY(7, 6, KEY_C), + KEY(6, 6, KEY_V), + KEY(5, 6, KEY_B), + KEY(4, 6, KEY_N), + KEY(3, 6, KEY_M), + + KEY(2, 6, KEY_SPACE), + + KEY(0, 6, KEY_ENTER), /* Video */ + + 0 +}; + static int *keymap; static irqreturn_t omap_kp_interrupt(int irq, void *dev_id, @@ -321,6 +371,8 @@ } else if (machine_is_omap_perseus2()) { keymap = p2_keymap; keypad_irq = INT_730_MPUIO_KEYPAD; + } else if (machine_is_ams_delta()) { + keymap = ams_delta_keymap; } else { keymap = test_keymap; } diff -ruN linux-2.6.15-omap1-omap2/drivers/mtd/chips/jedec_probe.c linux-2.6.15-e3/drivers/mtd/chips/jedec_probe.c --- linux-2.6.15-omap1-omap2/drivers/mtd/chips/jedec_probe.c 2006-01-03 03:21:10.000000000 +0000 +++ linux-2.6.15-e3/drivers/mtd/chips/jedec_probe.c 2006-02-22 15:19:19.648263494 +0000 @@ -63,6 +63,7 @@ /* Atmel */ #define AT49BV512 0x0003 #define AT29LV512 0x003d +#define AT49LV1024 0x0087 #define AT49BV16X 0x00C0 #define AT49BV16XT 0x00C2 #define AT49BV32X 0x00C8 @@ -566,7 +567,22 @@ ERASEINFO(0x80,256), ERASEINFO(0x80,256) } + + }, { + .mfr_id = MANUFACTURER_ATMEL, + .dev_id = AT49LV1024, + .name = "Atmel AT49LV1024", + .uaddr = { + [0] = MTD_UADDR_0x5555_0x2AAA, /* x8 */ + }, + .DevSize = SIZE_128KiB, + .CmdSet = P_ID_AMD_STD, + .NumEraseRegions= 1, + .regions = { + ERASEINFO(0x20000,1) + } }, { + .mfr_id = MANUFACTURER_ATMEL, .dev_id = AT49BV16X, .name = "Atmel AT49BV16X", diff -ruN linux-2.6.15-omap1-omap2/drivers/mtd/nand/ams-delta.c linux-2.6.15-e3/drivers/mtd/nand/ams-delta.c --- linux-2.6.15-omap1-omap2/drivers/mtd/nand/ams-delta.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.15-e3/drivers/mtd/nand/ams-delta.c 2006-02-27 16:28:40.448983485 +0000 @@ -0,0 +1,205 @@ +/* + * drivers/mtd/nand/ams-delta.c + * + * Copyright (C) 2006 Jonathan McDowell + * + * Derived from drivers/mtd/toto.c + * + * 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. + * + * Overview: + * This is a device driver for the NAND flash device found on the + * Amstrad E3 (Delta). + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * MTD structure for E3 (Delta) + */ +static struct mtd_info *ams_delta_mtd = NULL; + +#define NAND_MASK (AMS_DELTA_LATCH2_NAND_NRE | AMS_DELTA_LATCH2_NAND_NWE | AMS_DELTA_LATCH2_NAND_CLE | AMS_DELTA_LATCH2_NAND_ALE | AMS_DELTA_LATCH2_NAND_NCE | AMS_DELTA_LATCH2_NAND_NWP) + +#define T_NAND_CTL_CLRALE(iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_ALE, 0) +#define T_NAND_CTL_SETALE(iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_ALE, AMS_DELTA_LATCH2_NAND_ALE) +#define T_NAND_CTL_CLRCLE(iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_CLE, 0) +#define T_NAND_CTL_SETCLE(iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_CLE, AMS_DELTA_LATCH2_NAND_CLE) +#define T_NAND_CTL_SETNCE(iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NCE, 0) +#define T_NAND_CTL_CLRNCE(iob) ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NCE, AMS_DELTA_LATCH2_NAND_NCE) + +/* + * Define partitions for flash devices + */ + +static struct mtd_partition partition_info[] = { + { .name = "4MB space", + .offset = 0, + .size = 4 * SZ_1M }, + { .name = "Amstrad block", + .offset = 4 * SZ_1M, + .size = 1 * SZ_1M }, + { .name = "E3 kernel partition", + .offset = 5 * SZ_1M, + .size = 2 * SZ_1M }, + { .name = "Space", + .offset = 7 * SZ_1M, + .size = 9 * SZ_1M }, + { .name = "E3 file system partition", + .offset = 16 * SZ_1M, + .size = 15 * SZ_1M }, + { .name = "Bad/Reserved?", + .offset = 31 * SZ_1M, + .size = 1 * SZ_1M }, +}; + +/* + * hardware specific access to control-lines +*/ + +static void ams_delta_hwcontrol(struct mtd_info *mtd, int cmd) +{ + switch(cmd){ + + case NAND_CTL_SETCLE: T_NAND_CTL_SETCLE(cmd); break; + case NAND_CTL_CLRCLE: T_NAND_CTL_CLRCLE(cmd); break; + + case NAND_CTL_SETALE: T_NAND_CTL_SETALE(cmd); break; + case NAND_CTL_CLRALE: T_NAND_CTL_CLRALE(cmd); break; + + case NAND_CTL_SETNCE: T_NAND_CTL_SETNCE(cmd); break; + case NAND_CTL_CLRNCE: T_NAND_CTL_CLRNCE(cmd); break; + } +} + +static void ams_delta_write_byte(struct mtd_info *mtd, u_char byte) +{ + struct nand_chip *this = mtd->priv; + + omap_writew(0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL)); + omap_writew(byte, this->IO_ADDR_W); + ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE, 0); + udelay(10); + ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NWE, + AMS_DELTA_LATCH2_NAND_NWE); +} + +static u_char ams_delta_read_byte(struct mtd_info *mtd) +{ + u_char res; + struct nand_chip *this = mtd->priv; + + ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, 0); + udelay(10); + omap_writew(~0, (OMAP_MPUIO_BASE + OMAP_MPUIO_IO_CNTL)); + res = omap_readw(this->IO_ADDR_R); + ams_delta_latch2_write(AMS_DELTA_LATCH2_NAND_NRE, + AMS_DELTA_LATCH2_NAND_NRE); + + return res; +} + +static int ams_delta_nand_ready(struct mtd_info *mtd) +{ + return omap_get_gpio_datain(AMS_DELTA_NAND_RB_GPIO_PIN); +} + +/* + * Main initialization routine + */ +int __init ams_delta_init (void) +{ + struct nand_chip *this; + int err = 0; + + /* Allocate memory for MTD device structure and private data */ + ams_delta_mtd = kmalloc (sizeof(struct mtd_info) + + sizeof (struct nand_chip), GFP_KERNEL); + if (!ams_delta_mtd) { + printk (KERN_WARNING + "Unable to allocate E3 NAND MTD device structure.\n"); + err = -ENOMEM; + goto out; + } + + /* Get pointer to private data */ + this = (struct nand_chip *) (&ams_delta_mtd[1]); + + /* Initialize structures */ + memset((char *) ams_delta_mtd, 0, sizeof(struct mtd_info)); + memset((char *) this, 0, sizeof(struct nand_chip)); + + /* Link the private data with the MTD structure */ + ams_delta_mtd->priv = this; + + /* Set address of NAND IO lines */ + this->IO_ADDR_R = (OMAP_MPUIO_BASE + OMAP_MPUIO_INPUT_LATCH); + this->IO_ADDR_W = (OMAP_MPUIO_BASE + OMAP_MPUIO_OUTPUT); + this->read_byte = ams_delta_read_byte; + this->write_byte = ams_delta_write_byte; + this->hwcontrol = ams_delta_hwcontrol; + if (!omap_request_gpio(AMS_DELTA_NAND_RB_GPIO_PIN)) { + this->dev_ready = ams_delta_nand_ready; + } else { + this->dev_ready = NULL; + printk(KERN_NOTICE + "Couldn't request gpio for Delta NAND ready.\n"); + } + /* 25 us command delay time */ + this->chip_delay = 30; + this->eccmode = NAND_ECC_SOFT; + + /* Set chip enabled, but */ + ams_delta_latch2_write(NAND_MASK, AMS_DELTA_LATCH2_NAND_NRE | \ + AMS_DELTA_LATCH2_NAND_NWE | \ + AMS_DELTA_LATCH2_NAND_NCE | AMS_DELTA_LATCH2_NAND_NWP); + + /* Scan to find existance of the device */ + if (nand_scan (ams_delta_mtd, 1)) { + err = -ENXIO; + goto out_mtd; + } + + /* Register the partitions */ + add_mtd_partitions(ams_delta_mtd, partition_info, + ARRAY_SIZE(partition_info)); + + goto out; + +out_mtd: + kfree (ams_delta_mtd); +out: + return err; +} + +module_init(ams_delta_init); + +/* + * Clean up routine + */ +static void __exit ams_delta_cleanup (void) +{ + /* Release resources, unregister device */ + nand_release (ams_delta_mtd); + + /* Free the MTD device structure */ + kfree (ams_delta_mtd); +} +module_exit(ams_delta_cleanup); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Jonathan McDowell "); +MODULE_DESCRIPTION("Glue layer for NAND flash on Amstrad E3 (Delta)"); diff -ruN linux-2.6.15-omap1-omap2/drivers/mtd/nand/Kconfig linux-2.6.15-e3/drivers/mtd/nand/Kconfig --- linux-2.6.15-omap1-omap2/drivers/mtd/nand/Kconfig 2006-02-22 16:57:32.734261661 +0000 +++ linux-2.6.15-e3/drivers/mtd/nand/Kconfig 2006-02-23 23:04:15.173362112 +0000 @@ -55,6 +55,12 @@ help Support for NAND flash on Texas Instruments H3/H2/P2 platforms. +config MTD_NAND_AMS_DELTA + tristate "NAND Flash device on Amstrad E3" + depends on ARCH_OMAP && MTD_NAND + help + Support for NAND flash on Amstrad E3 (Delta). + config MTD_NAND_TOTO tristate "NAND Flash device on TOTO board" depends on ARCH_OMAP && MTD_NAND diff -ruN linux-2.6.15-omap1-omap2/drivers/mtd/nand/Makefile linux-2.6.15-e3/drivers/mtd/nand/Makefile --- linux-2.6.15-omap1-omap2/drivers/mtd/nand/Makefile 2006-02-22 16:57:32.738261803 +0000 +++ linux-2.6.15-e3/drivers/mtd/nand/Makefile 2006-02-23 23:04:05.797029234 +0000 @@ -8,6 +8,7 @@ obj-$(CONFIG_MTD_NAND_SPIA) += spia.o obj-$(CONFIG_MTD_NAND_TOTO) += toto.o +obj-$(CONFIG_MTD_NAND_AMS_DELTA) += ams-delta.o obj-$(CONFIG_MTD_NAND_AUTCPU12) += autcpu12.o obj-$(CONFIG_MTD_NAND_EDB7312) += edb7312.o obj-$(CONFIG_MTD_NAND_AU1550) += au1550nd.o diff -ruN linux-2.6.15-omap1-omap2/drivers/mtd/nand/nand_base.c linux-2.6.15-e3/drivers/mtd/nand/nand_base.c --- linux-2.6.15-omap1-omap2/drivers/mtd/nand/nand_base.c 2006-01-03 03:21:10.000000000 +0000 +++ linux-2.6.15-e3/drivers/mtd/nand/nand_base.c 2006-02-24 18:31:32.730363338 +0000 @@ -302,7 +302,7 @@ struct nand_chip *this = mtd->priv; for (i=0; iIO_ADDR_W); + this->write_byte(mtd, buf[i]); } /** @@ -319,7 +319,7 @@ struct nand_chip *this = mtd->priv; for (i=0; iIO_ADDR_R); + buf[i] = this->read_byte(mtd); } /** @@ -336,7 +336,7 @@ struct nand_chip *this = mtd->priv; for (i=0; iIO_ADDR_R)) + if (buf[i] != this->read_byte(mtd)) return -EFAULT; return 0; diff -ruN linux-2.6.15-omap1-omap2/drivers/video/omap/lcd_ams_delta.c linux-2.6.15-e3/drivers/video/omap/lcd_ams_delta.c --- linux-2.6.15-omap1-omap2/drivers/video/omap/lcd_ams_delta.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.15-e3/drivers/video/omap/lcd_ams_delta.c 2006-02-27 15:51:50.010978265 +0000 @@ -0,0 +1,103 @@ +/* + * File: drivers/video/omap/lcd_ams_delta.c + * + * Based on drivers/video/omap/lcd_inn1510.c + * + * LCD panel support for the Amstrad E3 (Delta) videophone. + * + * Copyright (C) 2006 Jonathan McDowell + * + * 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 + +#include + +#include +#include +#include + +/* #define OMAPFB_DBG 1 */ + +#include "debug.h" + +static int ams_delta_panel_init(struct omapfb_device *fbdev) +{ + DBGENTER(1); + DBGLEAVE(1); + return 0; +} + +static void ams_delta_panel_cleanup(void) +{ + DBGENTER(1); + DBGLEAVE(1); +} + +static int ams_delta_panel_enable(void) +{ + DBGENTER(1); + + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP, + AMS_DELTA_LATCH2_LCD_NDISP); + + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN, + AMS_DELTA_LATCH2_LCD_VBLEN); + + DBGLEAVE(1); + return 0; +} + +static void ams_delta_panel_disable(void) +{ + DBGENTER(1); + + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_NDISP, 0); + ams_delta_latch2_write(AMS_DELTA_LATCH2_LCD_VBLEN, 0); + + DBGLEAVE(1); +} + +static unsigned long ams_delta_panel_get_caps(void) +{ + return 0; +} + +struct lcd_panel ams_delta_panel = { + .name = "ams-delta", + .config = 0, + + .bpp = 16, + .data_lines = 16, + .x_res = 480, + .y_res = 320, + .pixel_clock = 4687, + .hsw = 3, + .hfp = 1, + .hbp = 1, + .vsw = 1, + .vfp = 0, + .vbp = 0, + .pcd = 0, + .acb = 37, + + .init = ams_delta_panel_init, + .cleanup = ams_delta_panel_cleanup, + .enable = ams_delta_panel_enable, + .disable = ams_delta_panel_disable, + .get_caps = ams_delta_panel_get_caps, +}; + diff -ruN linux-2.6.15-omap1-omap2/drivers/video/omap/lcdc.c linux-2.6.15-e3/drivers/video/omap/lcdc.c --- linux-2.6.15-omap1-omap2/drivers/video/omap/lcdc.c 2006-02-22 16:57:32.834265211 +0000 +++ linux-2.6.15-e3/drivers/video/omap/lcdc.c 2006-02-27 17:04:59.876289531 +0000 @@ -442,24 +442,34 @@ l |= (is_tft && panel->bpp == 8) ? 0x810000 : 0; /* } */ #endif +#ifdef CONFIG_MACH_AMS_DELTA + if (machine_is_ams_delta()) { + l |= 0x800200; + } +#endif omap_writel(l, OMAP_LCDC_CONTROL); + printk(KERN_NOTICE "Set OMAP_LCDC_CONTROL to %08x\n", l); + l = omap_readl(OMAP_LCDC_TIMING2); l &= ~(((1 << 6) - 1) << 20); l |= (panel->config & OMAP_LCDC_SIGNAL_MASK) << 20; omap_writel(l, OMAP_LCDC_TIMING2); + printk(KERN_NOTICE "Set OMAP_LCDC_TIMING2 to %08x\n", l); l = panel->x_res - 1; l |= (panel->hsw - 1) << 10; l |= (panel->hfp - 1) << 16; l |= (panel->hbp - 1) << 24; omap_writel(l, OMAP_LCDC_TIMING0); + printk(KERN_NOTICE "Set OMAP_LCDC_TIMING0 to %08x\n", l); l = panel->y_res - 1; l |= (panel->vsw - 1) << 10; l |= panel->vfp << 16; l |= panel->vbp << 24; omap_writel(l, OMAP_LCDC_TIMING1); + printk(KERN_NOTICE "Set OMAP_LCDC_TIMING1 to %08x\n", l); l = omap_readl(OMAP_LCDC_TIMING2); l &= ~0xff; @@ -480,6 +490,7 @@ l |= pcd & 0xff; l |= panel->acb << 8; omap_writel(l, OMAP_LCDC_TIMING2); + printk(KERN_NOTICE "Set OMAP_LCDC_TIMING2 to %08x\n", l); /* update panel info with the exact clock */ panel->pixel_clock = lck / pcd / 1000; @@ -596,6 +607,8 @@ rate = clk_get_rate(tc_ck); clk_put(tc_ck); + if (machine_is_ams_delta()) + rate /= 4; if (machine_is_omap_h3()) rate /= 3; r = clk_set_rate(omap_lcdc.lcd_ck, rate); diff -ruN linux-2.6.15-omap1-omap2/drivers/video/omap/Makefile linux-2.6.15-e3/drivers/video/omap/Makefile --- linux-2.6.15-omap1-omap2/drivers/video/omap/Makefile 2006-02-22 16:57:32.794263791 +0000 +++ linux-2.6.15-e3/drivers/video/omap/Makefile 2006-02-27 09:30:20.985171113 +0000 @@ -13,6 +13,7 @@ objs-$(CONFIG_ARCH_OMAP1)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += rfbi.o +objs-y$(CONFIG_MACH_AMS_DELTA) += lcd_ams_delta.o objs-y$(CONFIG_MACH_OMAP_H4) += lcd_h4.o objs-y$(CONFIG_MACH_OMAP_H3) += lcd_h3.o objs-y$(CONFIG_MACH_OMAP_H2) += lcd_h2.o diff -ruN linux-2.6.15-omap1-omap2/drivers/video/omap/omapfb_main.c linux-2.6.15-e3/drivers/video/omap/omapfb_main.c --- linux-2.6.15-omap1-omap2/drivers/video/omap/omapfb_main.c 2006-02-22 16:57:32.842265495 +0000 +++ linux-2.6.15-e3/drivers/video/omap/omapfb_main.c 2006-02-27 10:05:19.134721171 +0000 @@ -80,6 +80,7 @@ * LCD panel * --------------------------------------------------------------------------- */ +extern struct lcd_panel ams_delta_panel; extern struct lcd_panel h4_panel; extern struct lcd_panel h3_panel; extern struct lcd_panel h2_panel; @@ -91,6 +92,9 @@ extern struct lcd_panel lph8923_panel; static struct lcd_panel *panels[] = { +#ifdef CONFIG_MACH_AMS_DELTA + &ams_delta_panel, +#endif #ifdef CONFIG_MACH_OMAP_H2 &h2_panel, #endif diff -ruN linux-2.6.15-omap1-omap2/include/asm-arm/arch-omap/board-ams-delta.h linux-2.6.15-e3/include/asm-arm/arch-omap/board-ams-delta.h --- linux-2.6.15-omap1-omap2/include/asm-arm/arch-omap/board-ams-delta.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.15-e3/include/asm-arm/arch-omap/board-ams-delta.h 2006-02-27 16:09:10.847639747 +0000 @@ -0,0 +1,54 @@ +/* + * linux/include/asm-arm/arch-omap/board-ams-delta.h + * + * Copyright (C) 2006 Jonathan McDowell + * + * 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 SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN + * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * 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., + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifndef __ASM_ARCH_OMAP_AMS_DELTA_H +#define __ASM_ARCH_OMAP_AMS_DELTA_H + +#if defined (CONFIG_MACH_AMS_DELTA) + +#define AMS_DELTA_LATCH1_BASE 0xEA000000 +#define AMS_DELTA_LATCH2_BASE 0xEC000000 + +#define AMS_DELTA_LATCH2_LCD_VBLEN 0x0001 +#define AMS_DELTA_LATCH2_LCD_NDISP 0x0002 +#define AMS_DELTA_LATCH2_NAND_NCE 0x0004 +#define AMS_DELTA_LATCH2_NAND_NRE 0x0008 +#define AMS_DELTA_LATCH2_NAND_NWP 0x0010 +#define AMS_DELTA_LATCH2_NAND_NWE 0x0020 +#define AMS_DELTA_LATCH2_NAND_ALE 0x0040 +#define AMS_DELTA_LATCH2_NAND_CLE 0x0080 +#define AMS_DELTA_LATCH2_MODEM_NRESET 0x1000 +#define AMS_DELTA_LATCH2_MODEM_CODEC 0x2000 + +#define AMS_DELTA_NAND_RB_GPIO_PIN 12 + +#ifndef __ASSEMBLY__ +void ams_delta_latch1_write(u8 mask, u8 value); +void ams_delta_latch2_write(u16 mask, u16 value); +#endif + +#endif /* CONFIG_MACH_AMS_DELTA */ + +#endif /* __ASM_ARCH_OMAP_AMS_DELTA_H */