* [-mm patch 0/4] AVR32 MTD: Introduction @ 2006-09-14 14:29 Haavard Skinnemoen 2006-09-14 14:30 ` [-mm patch 1/4] AVR32 MTD: Static Memory Controller driver Haavard Skinnemoen 0 siblings, 1 reply; 9+ messages in thread From: Haavard Skinnemoen @ 2006-09-14 14:29 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-mtd, linux-kernel Hi Andrew and MTD people, This patchset adds the necessary drivers and infrastructure to access the external flash on the ATSTK1000 board through the MTD subsystem. With this stuff in place, it will be possible to use a jffs2 filesystem stored in the external flash as a root filesystem. It might also be possible to update the boot loader if you drop the write protection of partition 0. Andrew, can you apply this to -mm? They probably don't make sense for the MTD tree until the rest of the AVR32 patches are merged into mainline, but I'd really appreciate if someone could have a quick look to see if I did something stupid. This also needs two patches I've submitted earlier (included in git-mtd.patch) in order to work, but it should still apply without them. For the record, these are: MTD: Add lock/unlock operations for Atmel AT49BV6416 MTD: Convert Atmel PRI information to AMD format This patchset includes the following patches: AVR32 MTD: Static Memory Controller driver AVR32 MTD: Define struct flash_platform_data AVR32 MTD: Mapping driver for the ATSTK1000 board AVR32 MTD: AT49BV6416 platform device for atstk1000 And the combined diffstat looks like this: arch/avr32/boards/atstk1000/atstk1002.c | 46 ++++++++ arch/avr32/mach-at32ap/Makefile | 2 arch/avr32/mach-at32ap/at32ap7000.c | 10 + arch/avr32/mach-at32ap/hsmc.c | 164 +++++++++++++++++++++++++++++ arch/avr32/mach-at32ap/hsmc.h | 169 ++++++++++++++++++++++++++++++ drivers/mtd/maps/Kconfig | 10 + drivers/mtd/maps/Makefile | 1 drivers/mtd/maps/atstk1000.c | 179 ++++++++++++++++++++++++++++++++ include/asm-avr32/arch-at32ap/board.h | 7 + include/asm-avr32/arch-at32ap/smc.h | 60 ++++++++++ 10 files changed, 647 insertions(+), 1 deletion(-) Best regards, Haavard ^ permalink raw reply [flat|nested] 9+ messages in thread
* [-mm patch 1/4] AVR32 MTD: Static Memory Controller driver 2006-09-14 14:29 [-mm patch 0/4] AVR32 MTD: Introduction Haavard Skinnemoen @ 2006-09-14 14:30 ` Haavard Skinnemoen 2006-09-14 14:31 ` [-mm patch 2/4] AVR32 MTD: Define struct flash_platform_data Haavard Skinnemoen 0 siblings, 1 reply; 9+ messages in thread From: Haavard Skinnemoen @ 2006-09-14 14:30 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-mtd, linux-kernel This adds a simple API for configuring the static memory controller along with an implementation for the Atmel HSMC. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> --- arch/avr32/mach-at32ap/Makefile | 2 arch/avr32/mach-at32ap/at32ap7000.c | 10 ++ arch/avr32/mach-at32ap/hsmc.c | 164 ++++++++++++++++++++++++++++++++++ arch/avr32/mach-at32ap/hsmc.h | 169 ++++++++++++++++++++++++++++++++++++ include/asm-avr32/arch-at32ap/smc.h | 60 ++++++++++++ 5 files changed, 404 insertions(+), 1 deletion(-) Index: linux-2.6.18-rc2-mm1/arch/avr32/mach-at32ap/Makefile =================================================================== --- linux-2.6.18-rc2-mm1.orig/arch/avr32/mach-at32ap/Makefile 2006-08-01 16:16:07.000000000 +0200 +++ linux-2.6.18-rc2-mm1/arch/avr32/mach-at32ap/Makefile 2006-08-01 16:49:52.000000000 +0200 @@ -1,2 +1,2 @@ -obj-y += at32ap.o clock.o pio.o intc.o extint.o +obj-y += at32ap.o clock.o pio.o intc.o extint.o hsmc.o obj-$(CONFIG_CPU_AT32AP7000) += at32ap7000.o Index: linux-2.6.18-rc2-mm1/arch/avr32/mach-at32ap/at32ap7000.c =================================================================== --- linux-2.6.18-rc2-mm1.orig/arch/avr32/mach-at32ap/at32ap7000.c 2006-08-01 16:16:07.000000000 +0200 +++ linux-2.6.18-rc2-mm1/arch/avr32/mach-at32ap/at32ap7000.c 2006-08-01 16:49:52.000000000 +0200 @@ -450,6 +450,13 @@ static struct clk hramc_clk = { .users = 1, }; +static struct resource smc0_resource[] = { + PBMEM(0xfff03400), +}; +DEFINE_DEV(smc, 0); +DEV_CLK(pclk, smc0, pbb, 13); +DEV_CLK(mck, smc0, hsb, 0); + static struct platform_device pdc_device = { .name = "pdc", .id = 0, @@ -503,6 +510,7 @@ void __init at32_add_system_devices(void platform_device_register(&at32_sm_device); platform_device_register(&at32_intc0_device); + platform_device_register(&smc0_device); platform_device_register(&pdc_device); platform_device_register(&pio0_device); @@ -796,6 +804,8 @@ struct clk *at32_clock_list[] = { &at32_intc0_pclk, &ebi_clk, &hramc_clk, + &smc0_pclk, + &smc0_mck, &pdc_hclk, &pdc_pclk, &pico_clk, Index: linux-2.6.18-rc2-mm1/arch/avr32/mach-at32ap/hsmc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.18-rc2-mm1/arch/avr32/mach-at32ap/hsmc.c 2006-08-01 16:49:52.000000000 +0200 @@ -0,0 +1,164 @@ +/* + * Static Memory Controller for AT32 chips + * + * Copyright (C) 2006 Atmel Corporation + * + * 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. + */ +#define DEBUG +#include <linux/clk.h> +#include <linux/err.h> +#include <linux/init.h> +#include <linux/module.h> +#include <linux/platform_device.h> + +#include <asm/io.h> +#include <asm/arch/smc.h> + +#include "hsmc.h" + +#define NR_CHIP_SELECTS 6 + +struct hsmc { + void __iomem *regs; + struct clk *pclk; + struct clk *mck; +}; + +static struct hsmc *hsmc; + +int smc_set_configuration(int cs, const struct smc_config *config) +{ + unsigned long mul; + unsigned long offset; + u32 setup, pulse, cycle, mode; + + if (!hsmc) + return -ENODEV; + if (cs >= NR_CHIP_SELECTS) + return -EINVAL; + + /* + * cycles = x / T = x * f + * = ((x * 1000000000) * ((f * 65536) / 1000000000)) / 65536 + * = ((x * 1000000000) * (((f / 10000) * 65536) / 100000)) / 65536 + */ + mul = (clk_get_rate(hsmc->mck) / 10000) << 16; + mul /= 100000; + +#define ns2cyc(x) ((((x) * mul) + 65535) >> 16) + + setup = (HSMC_BF(NWE_SETUP, ns2cyc(config->nwe_setup)) + | HSMC_BF(NCS_WR_SETUP, ns2cyc(config->ncs_write_setup)) + | HSMC_BF(NRD_SETUP, ns2cyc(config->nrd_setup)) + | HSMC_BF(NCS_RD_SETUP, ns2cyc(config->ncs_read_setup))); + pulse = (HSMC_BF(NWE_PULSE, ns2cyc(config->nwe_pulse)) + | HSMC_BF(NCS_WR_PULSE, ns2cyc(config->ncs_write_pulse)) + | HSMC_BF(NRD_PULSE, ns2cyc(config->nrd_pulse)) + | HSMC_BF(NCS_RD_PULSE, ns2cyc(config->ncs_read_pulse))); + cycle = (HSMC_BF(NWE_CYCLE, ns2cyc(config->write_cycle)) + | HSMC_BF(NRD_CYCLE, ns2cyc(config->read_cycle))); + + switch (config->bus_width) { + case 1: + mode = HSMC_BF(DBW, HSMC_DBW_8_BITS); + break; + case 2: + mode = HSMC_BF(DBW, HSMC_DBW_16_BITS); + break; + case 4: + mode = HSMC_BF(DBW, HSMC_DBW_32_BITS); + break; + default: + return -EINVAL; + } + + if (config->nrd_controlled) + mode |= HSMC_BIT(READ_MODE); + if (config->nwe_controlled) + mode |= HSMC_BIT(WRITE_MODE); + if (config->byte_write) + mode |= HSMC_BIT(BAT); + + pr_debug("smc cs%d: setup/%08x pulse/%08x cycle/%08x mode/%08x\n", + cs, setup, pulse, cycle, mode); + + offset = cs * 0x10; + hsmc_writel(hsmc, SETUP0 + offset, setup); + hsmc_writel(hsmc, PULSE0 + offset, pulse); + hsmc_writel(hsmc, CYCLE0 + offset, cycle); + hsmc_writel(hsmc, MODE0 + offset, mode); + hsmc_readl(hsmc, MODE0); /* I/O barrier */ + + return 0; +} +EXPORT_SYMBOL(smc_set_configuration); + +static int hsmc_probe(struct platform_device *pdev) +{ + struct resource *regs; + struct clk *pclk, *mck; + int ret; + + if (hsmc) + return -EBUSY; + + regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!regs) + return -ENXIO; + pclk = clk_get(&pdev->dev, "pclk"); + if (IS_ERR(pclk)) + return PTR_ERR(pclk); + mck = clk_get(&pdev->dev, "mck"); + if (IS_ERR(mck)) { + ret = PTR_ERR(mck); + goto out_put_pclk; + } + + ret = -ENOMEM; + hsmc = kzalloc(sizeof(struct hsmc), GFP_KERNEL); + if (!hsmc) + goto out_put_clocks; + + clk_enable(pclk); + clk_enable(mck); + + hsmc->pclk = pclk; + hsmc->mck = mck; + hsmc->regs = ioremap(regs->start, regs->end - regs->start + 1); + if (!hsmc->regs) + goto out_disable_clocks; + + dev_info(&pdev->dev, "Atmel Static Memory Controller at 0x%08lx\n", + (unsigned long)regs->start); + + platform_set_drvdata(pdev, hsmc); + + return 0; + +out_disable_clocks: + clk_disable(mck); + clk_disable(pclk); + kfree(hsmc); +out_put_clocks: + clk_put(mck); +out_put_pclk: + clk_put(pclk); + hsmc = NULL; + return ret; +} + +static struct platform_driver hsmc_driver = { + .probe = hsmc_probe, + .driver = { + .name = "smc", + }, +}; + +static int __init hsmc_init(void) +{ + return platform_driver_register(&hsmc_driver); +} +arch_initcall(hsmc_init); Index: linux-2.6.18-rc2-mm1/arch/avr32/mach-at32ap/hsmc.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.18-rc2-mm1/arch/avr32/mach-at32ap/hsmc.h 2006-08-01 16:49:52.000000000 +0200 @@ -0,0 +1,169 @@ +/* + * Register definitions for Atmel Static Memory Controller (SMC) + * + * Copyright (C) 2006 Atmel Corporation + * + * 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. + */ +#ifndef __ASM_AVR32_HSMC_H__ +#define __ASM_AVR32_HSMC_H__ + +/* HSMC register offsets */ +#define HSMC_SETUP0 0x0000 +#define HSMC_PULSE0 0x0004 +#define HSMC_CYCLE0 0x0008 +#define HSMC_MODE0 0x000c +#define HSMC_SETUP1 0x0010 +#define HSMC_PULSE1 0x0014 +#define HSMC_CYCLE1 0x0018 +#define HSMC_MODE1 0x001c +#define HSMC_SETUP2 0x0020 +#define HSMC_PULSE2 0x0024 +#define HSMC_CYCLE2 0x0028 +#define HSMC_MODE2 0x002c +#define HSMC_SETUP3 0x0030 +#define HSMC_PULSE3 0x0034 +#define HSMC_CYCLE3 0x0038 +#define HSMC_MODE3 0x003c +#define HSMC_SETUP4 0x0040 +#define HSMC_PULSE4 0x0044 +#define HSMC_CYCLE4 0x0048 +#define HSMC_MODE4 0x004c +#define HSMC_SETUP5 0x0050 +#define HSMC_PULSE5 0x0054 +#define HSMC_CYCLE5 0x0058 +#define HSMC_MODE5 0x005c + +/* Bitfields in SETUP0 */ +#define HSMC_NWE_SETUP_OFFSET 0 +#define HSMC_NWE_SETUP_SIZE 6 +#define HSMC_NCS_WR_SETUP_OFFSET 8 +#define HSMC_NCS_WR_SETUP_SIZE 6 +#define HSMC_NRD_SETUP_OFFSET 16 +#define HSMC_NRD_SETUP_SIZE 6 +#define HSMC_NCS_RD_SETUP_OFFSET 24 +#define HSMC_NCS_RD_SETUP_SIZE 6 + +/* Bitfields in PULSE0 */ +#define HSMC_NWE_PULSE_OFFSET 0 +#define HSMC_NWE_PULSE_SIZE 7 +#define HSMC_NCS_WR_PULSE_OFFSET 8 +#define HSMC_NCS_WR_PULSE_SIZE 7 +#define HSMC_NRD_PULSE_OFFSET 16 +#define HSMC_NRD_PULSE_SIZE 7 +#define HSMC_NCS_RD_PULSE_OFFSET 24 +#define HSMC_NCS_RD_PULSE_SIZE 7 + +/* Bitfields in CYCLE0 */ +#define HSMC_NWE_CYCLE_OFFSET 0 +#define HSMC_NWE_CYCLE_SIZE 9 +#define HSMC_NRD_CYCLE_OFFSET 16 +#define HSMC_NRD_CYCLE_SIZE 9 + +/* Bitfields in MODE0 */ +#define HSMC_READ_MODE_OFFSET 0 +#define HSMC_READ_MODE_SIZE 1 +#define HSMC_WRITE_MODE_OFFSET 1 +#define HSMC_WRITE_MODE_SIZE 1 +#define HSMC_EXNW_MODE_OFFSET 4 +#define HSMC_EXNW_MODE_SIZE 2 +#define HSMC_BAT_OFFSET 8 +#define HSMC_BAT_SIZE 1 +#define HSMC_DBW_OFFSET 12 +#define HSMC_DBW_SIZE 2 +#define HSMC_TDF_CYCLES_OFFSET 16 +#define HSMC_TDF_CYCLES_SIZE 4 +#define HSMC_TDF_MODE_OFFSET 20 +#define HSMC_TDF_MODE_SIZE 1 +#define HSMC_PMEN_OFFSET 24 +#define HSMC_PMEN_SIZE 1 +#define HSMC_PS_OFFSET 28 +#define HSMC_PS_SIZE 2 + +/* Bitfields in SETUP1 */ + +/* Bitfields in PULSE1 */ + +/* Bitfields in CYCLE1 */ + +/* Bitfields in MODE1 */ +#define HSMC_PD_OFFSET 28 +#define HSMC_PD_SIZE 2 + +/* Bitfields in SETUP2 */ + +/* Bitfields in PULSE2 */ + +/* Bitfields in CYCLE2 */ + +/* Bitfields in MODE2 */ + +/* Bitfields in SETUP3 */ + +/* Bitfields in PULSE3 */ + +/* Bitfields in CYCLE3 */ + +/* Bitfields in MODE3 */ + +/* Bitfields in SETUP4 */ + +/* Bitfields in PULSE4 */ + +/* Bitfields in CYCLE4 */ + +/* Bitfields in MODE4 */ + +/* Bitfields in SETUP5 */ + +/* Bitfields in PULSE5 */ + +/* Bitfields in CYCLE5 */ + +/* Bitfields in MODE5 */ + +/* Constants for READ_MODE */ +#define HSMC_READ_MODE_NCS_CONTROLLED 0 +#define HSMC_READ_MODE_NRD_CONTROLLED 1 + +/* Constants for WRITE_MODE */ +#define HSMC_WRITE_MODE_NCS_CONTROLLED 0 +#define HSMC_WRITE_MODE_NWE_CONTROLLED 1 + +/* Constants for EXNW_MODE */ +#define HSMC_EXNW_MODE_DISABLED 0 +#define HSMC_EXNW_MODE_RESERVED 1 +#define HSMC_EXNW_MODE_FROZEN 2 +#define HSMC_EXNW_MODE_READY 3 + +/* Constants for BAT */ +#define HSMC_BAT_BYTE_SELECT 0 +#define HSMC_BAT_BYTE_WRITE 1 + +/* Constants for DBW */ +#define HSMC_DBW_8_BITS 0 +#define HSMC_DBW_16_BITS 1 +#define HSMC_DBW_32_BITS 2 + +/* Bit manipulation macros */ +#define HSMC_BIT(name) \ + (1 << HSMC_##name##_OFFSET) +#define HSMC_BF(name,value) \ + (((value) & ((1 << HSMC_##name##_SIZE) - 1)) \ + << HSMC_##name##_OFFSET) +#define HSMC_BFEXT(name,value) \ + (((value) >> HSMC_##name##_OFFSET) \ + & ((1 << HSMC_##name##_SIZE) - 1)) +#define HSMC_BFINS(name,value,old) \ + (((old) & ~(((1 << HSMC_##name##_SIZE) - 1) \ + << HSMC_##name##_OFFSET)) | HSMC_BF(name,value)) + +/* Register access macros */ +#define hsmc_readl(port,reg) \ + readl((port)->regs + HSMC_##reg) +#define hsmc_writel(port,reg,value) \ + writel((value), (port)->regs + HSMC_##reg) + +#endif /* __ASM_AVR32_HSMC_H__ */ Index: linux-2.6.18-rc2-mm1/include/asm-avr32/arch-at32ap/smc.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.18-rc2-mm1/include/asm-avr32/arch-at32ap/smc.h 2006-08-01 16:49:52.000000000 +0200 @@ -0,0 +1,60 @@ +/* + * Static Memory Controller for AT32 chips + * + * Copyright (C) 2006 Atmel Corporation + * + * Inspired by the OMAP2 General-Purpose Memory Controller interface + * + * 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. + */ +#ifndef __ARCH_AT32AP_SMC_H +#define __ARCH_AT32AP_SMC_H + +/* + * All timing parameters are in nanoseconds. + */ +struct smc_config { + /* Delay from address valid to assertion of given strobe */ + u16 ncs_read_setup; + u16 nrd_setup; + u16 ncs_write_setup; + u16 nwe_setup; + + /* Pulse length of given strobe */ + u16 ncs_read_pulse; + u16 nrd_pulse; + u16 ncs_write_pulse; + u16 nwe_pulse; + + /* Total cycle length of given operation */ + u16 read_cycle; + u16 write_cycle; + + /* Bus width in bytes */ + u8 bus_width; + + /* + * 0: Data is sampled on rising edge of NCS + * 1: Data is sampled on rising edge of NRD + */ + unsigned int nrd_controlled:1; + + /* + * 0: Data is driven on falling edge of NCS + * 1: Data is driven on falling edge of NWR + */ + unsigned int nwe_controlled:1; + + /* + * 0: Byte select access type + * 1: Byte write access type + */ + unsigned int byte_write:1; +}; + +extern int smc_set_configuration(int cs, const struct smc_config *config); +extern struct smc_config *smc_get_configuration(int cs); + +#endif /* __ARCH_AT32AP_SMC_H */ ^ permalink raw reply [flat|nested] 9+ messages in thread
* [-mm patch 2/4] AVR32 MTD: Define struct flash_platform_data 2006-09-14 14:30 ` [-mm patch 1/4] AVR32 MTD: Static Memory Controller driver Haavard Skinnemoen @ 2006-09-14 14:31 ` Haavard Skinnemoen 2006-09-14 14:32 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board Haavard Skinnemoen 0 siblings, 1 reply; 9+ messages in thread From: Haavard Skinnemoen @ 2006-09-14 14:31 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-mtd, linux-kernel Define a data structure for passing board-specific information to an MTD mapping driver. For now it specifies a default partition layout. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> --- include/asm-avr32/arch-at32ap/board.h | 7 +++++++ 1 file changed, 7 insertions(+) Index: linux-2.6.18-rc5-mm1/include/asm-avr32/arch-at32ap/board.h =================================================================== --- linux-2.6.18-rc5-mm1.orig/include/asm-avr32/arch-at32ap/board.h 2006-09-07 15:14:20.000000000 +0200 +++ linux-2.6.18-rc5-mm1/include/asm-avr32/arch-at32ap/board.h 2006-09-07 15:19:08.000000000 +0200 @@ -6,6 +6,13 @@ #include <linux/types.h> +struct mtd_partition; + +struct flash_platform_data { + unsigned int nr_parts; + struct mtd_partition *parts; +}; + /* Add basic devices: system manager, interrupt controller, portmuxes, etc. */ void at32_add_system_devices(void); ^ permalink raw reply [flat|nested] 9+ messages in thread
* [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board 2006-09-14 14:31 ` [-mm patch 2/4] AVR32 MTD: Define struct flash_platform_data Haavard Skinnemoen @ 2006-09-14 14:32 ` Haavard Skinnemoen 2006-09-14 14:34 ` [-mm patch 4/4] AVR32 MTD: AT49BV6416 platform device for atstk1000 Haavard Skinnemoen 2006-09-14 20:11 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board David Woodhouse 0 siblings, 2 replies; 9+ messages in thread From: Haavard Skinnemoen @ 2006-09-14 14:32 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-mtd, linux-kernel Add mapping driver for the AT49BV6416 NOR flash chip on the ATSTK1000 development board. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> --- drivers/mtd/maps/Kconfig | 10 ++ drivers/mtd/maps/Makefile | 1 drivers/mtd/maps/atstk1000.c | 179 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 190 insertions(+) Index: linux-2.6.18-rc5-mm1/drivers/mtd/maps/Kconfig =================================================================== --- linux-2.6.18-rc5-mm1.orig/drivers/mtd/maps/Kconfig 2006-09-07 15:56:47.000000000 +0200 +++ linux-2.6.18-rc5-mm1/drivers/mtd/maps/Kconfig 2006-09-07 16:18:47.000000000 +0200 @@ -630,5 +630,15 @@ config MTD_PLATRAM This selection automatically selects the map_ram driver. +config MTD_ATSTK1000 + tristate "Map driver for NOR flash on Atmel ATSTK1000" + depends on MTD && AVR32 && BOARD_ATSTK1000 + select MTD_CFI + select MTD_CFI_AMDSTD + select MTD_PARTITIONS + help + Map driver for NOR flash on the Atmel ATSTK1000 development + board. + endmenu Index: linux-2.6.18-rc5-mm1/drivers/mtd/maps/Makefile =================================================================== --- linux-2.6.18-rc5-mm1.orig/drivers/mtd/maps/Makefile 2006-09-07 15:56:47.000000000 +0200 +++ linux-2.6.18-rc5-mm1/drivers/mtd/maps/Makefile 2006-09-07 16:16:03.000000000 +0200 @@ -71,3 +71,4 @@ obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o obj-$(CONFIG_MTD_TQM834x) += tqm834x.o +obj-$(CONFIG_MTD_ATSTK1000) += atstk1000.o Index: linux-2.6.18-rc5-mm1/drivers/mtd/maps/atstk1000.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.18-rc5-mm1/drivers/mtd/maps/atstk1000.c 2006-09-07 16:16:03.000000000 +0200 @@ -0,0 +1,179 @@ +/* + * Flash memory support for the ATSTK1000 development board + * + * Copyright (C) 2006 Atmel Corporation + * + * 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/init.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> + +#include <linux/mtd/mtd.h> +#include <linux/mtd/map.h> +#include <linux/mtd/partitions.h> + +#include <asm/io.h> +#include <asm/arch/board.h> +#include <asm/arch/smc.h> + +static struct smc_config flash_config = { + .ncs_read_setup = 0, + .nrd_setup = 40, + .ncs_write_setup = 0, + .nwe_setup = 10, + + .ncs_read_pulse = 80, + .nrd_pulse = 40, + .ncs_write_pulse = 65, + .nwe_pulse = 55, + + .read_cycle = 120, + .write_cycle = 120, + + .bus_width = 2, + .nrd_controlled = 1, + .nwe_controlled = 1, + .byte_write = 1, +}; + +struct atstk1000_flash { + struct mtd_info *mtd; + struct map_info map; + unsigned int nr_parts; + struct mtd_partition *parts; +}; + +static const char *part_probes[] = { "cmdlinepart", NULL }; + +static int __devinit atstk1000_flash_probe(struct platform_device *pdev) +{ + struct flash_platform_data *plat = pdev->dev.platform_data; + struct atstk1000_flash *flash; + struct resource *mem; + struct mtd_partition *parts; + unsigned long size; + int nr_parts; + int ret; + + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!mem) + return -ENXIO; + + flash = kzalloc(sizeof(struct atstk1000_flash), GFP_KERNEL); + if (!flash) + return -ENOMEM; + + size = mem->end - mem->start + 1; + + ret = smc_set_configuration(0, &flash_config); + if (ret < 0) + goto out_free_flash; + + ret = -ENOMEM; + flash->map.virt = ioremap(mem->start, size); + if (!flash->map.virt) + goto out_free_flash; + flash->map.name = pdev->dev.bus_id; + flash->map.phys = mem->start; + flash->map.size = size; + flash->map.bankwidth = 2; + + simple_map_init(&flash->map); + + ret = -ENXIO; + flash->mtd = do_map_probe("cfi_probe", &flash->map); + if (!flash->mtd) + goto out_unmap_mem; + flash->mtd->owner = THIS_MODULE; + + if (flash->mtd->unlock) { + printk("ATSTK1000 flash: unlocking area 0x%08lx-0x%08lx\n", + (unsigned long)mem->start, (unsigned long)mem->end); + ret = flash->mtd->unlock(flash->mtd, mem->start, size); + if (ret < 0) + goto out_destroy_map; + } + + nr_parts = parse_mtd_partitions(flash->mtd, part_probes, &parts, 0); + if (nr_parts > 0) { + flash->parts = parts; + } else if (plat) { + parts = plat->parts; + nr_parts = plat->nr_parts; + } + if (nr_parts <= 0) { + printk(KERN_NOTICE "ATSTK1000 flash: no partition info " + "available, registering whole flash\n"); + add_mtd_device(flash->mtd); + } else { + ret = add_mtd_partitions(flash->mtd, parts, nr_parts); + if (ret < 0) + goto out_free_parts; + } + + flash->nr_parts = nr_parts; + + platform_set_drvdata(pdev, flash); + return 0; + +out_free_parts: + kfree(flash->parts); +out_destroy_map: + map_destroy(flash->mtd); +out_unmap_mem: + iounmap(flash->map.virt); +out_free_flash: + kfree(flash); + return ret; +} + +static int __devexit atstk1000_flash_remove(struct platform_device *pdev) +{ + struct atstk1000_flash *flash = platform_get_drvdata(pdev); + + if (flash->mtd) { + if (flash->nr_parts > 0) + del_mtd_partitions(flash->mtd); + else + del_mtd_device(flash->mtd); + + kfree(flash->parts); + + map_destroy(flash->mtd); + iounmap(flash->map.virt); + kfree(flash); + } + + platform_set_drvdata(pdev, NULL); + return 0; +} + +static struct platform_driver atstk1000_flash_driver = { + .probe = atstk1000_flash_probe, + .remove = __devexit_p(atstk1000_flash_remove), + .driver = { + .name = "atstk1000-flash", + }, +}; + +static int __init atstk1000_flash_init(void) +{ + return platform_driver_register(&atstk1000_flash_driver); +} + +static void __exit atstk1000_flash_exit(void) +{ + platform_driver_unregister(&atstk1000_flash_driver); +} + +module_init(atstk1000_flash_init); +module_exit(atstk1000_flash_exit); + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("MTD NOR map driver for the ATSTK1000 board"); +MODULE_AUTHOR("Haavard Skinnemoen <hskinnemoen@atmel.com>"); ^ permalink raw reply [flat|nested] 9+ messages in thread
* [-mm patch 4/4] AVR32 MTD: AT49BV6416 platform device for atstk1000 2006-09-14 14:32 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board Haavard Skinnemoen @ 2006-09-14 14:34 ` Haavard Skinnemoen 2006-09-14 20:11 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board David Woodhouse 1 sibling, 0 replies; 9+ messages in thread From: Haavard Skinnemoen @ 2006-09-14 14:34 UTC (permalink / raw) To: Andrew Morton; +Cc: linux-mtd, linux-kernel Register a platform device for the AT49BV6416 NOR flash chip on the ATSTK1000 development board for use by the ATSTK1000 MTD map driver. Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com> --- arch/avr32/boards/atstk1000/atstk1002.c | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) Index: linux-2.6.18-rc5-mm1/arch/avr32/boards/atstk1000/atstk1002.c =================================================================== --- linux-2.6.18-rc5-mm1.orig/arch/avr32/boards/atstk1000/atstk1002.c 2006-09-07 15:18:55.000000000 +0200 +++ linux-2.6.18-rc5-mm1/arch/avr32/boards/atstk1000/atstk1002.c 2006-09-07 15:21:18.000000000 +0200 @@ -8,6 +8,9 @@ * published by the Free Software Foundation. */ #include <linux/init.h> +#include <linux/platform_device.h> +#include <linux/mtd/mtd.h> +#include <linux/mtd/partitions.h> #include <asm/arch/board.h> @@ -20,6 +23,47 @@ struct eth_platform_data __initdata eth0 extern struct lcdc_platform_data atstk1000_fb0_data; +static struct mtd_partition flash_parts[] = { + { + .name = "u-boot", + .offset = 0x00000000, + .size = 0x00020000, /* 128 KiB */ + .mask_flags = MTD_WRITEABLE, + }, + { + .name = "root", + .offset = 0x00020000, + .size = 0x007d0000, + }, + { + .name = "env", + .offset = 0x007f0000, + .size = 0x00010000, + .mask_flags = MTD_WRITEABLE, + }, +}; + +static struct flash_platform_data flash_data = { + .nr_parts = ARRAY_SIZE(flash_parts), + .parts = flash_parts, +}; + +struct resource flash_resource = { + .start = 0x00000000, + .end = 0x007fffff, + .flags = IORESOURCE_MEM, +}; + +struct platform_device flash_device = { + .name = "atstk1000-flash", + .id = 0, + .resource = &flash_resource, + .num_resources = 1, + .dev = { + .platform_data = &flash_data, + }, +}; + static int __init atstk1002_init(void) { at32_add_system_devices(); @@ -32,6 +76,8 @@ static int __init atstk1002_init(void) at32_add_device_spi(0); at32_add_device_lcdc(0, &atstk1000_fb0_data); + platform_device_register(&flash_device); + return 0; } postcore_initcall(atstk1002_init); ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board 2006-09-14 14:32 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board Haavard Skinnemoen 2006-09-14 14:34 ` [-mm patch 4/4] AVR32 MTD: AT49BV6416 platform device for atstk1000 Haavard Skinnemoen @ 2006-09-14 20:11 ` David Woodhouse 2006-09-15 7:56 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000board Haavard Skinnemoen 1 sibling, 1 reply; 9+ messages in thread From: David Woodhouse @ 2006-09-14 20:11 UTC (permalink / raw) To: Haavard Skinnemoen; +Cc: Andrew Morton, linux-mtd, linux-kernel On Thu, 2006-09-14 at 16:32 +0200, Haavard Skinnemoen wrote: > Add mapping driver for the AT49BV6416 NOR flash chip on the ATSTK1000 > development board. Hm, can't you set it up in advance and just register a platform_device for physmap to drive? -- dwmw2 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000board 2006-09-14 20:11 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board David Woodhouse @ 2006-09-15 7:56 ` Haavard Skinnemoen 2006-09-15 8:00 ` David Woodhouse 0 siblings, 1 reply; 9+ messages in thread From: Haavard Skinnemoen @ 2006-09-15 7:56 UTC (permalink / raw) To: David Woodhouse; +Cc: Andrew Morton, linux-mtd, linux-kernel On Thu, 14 Sep 2006 21:11:28 +0100 David Woodhouse <dwmw2@infradead.org> wrote: > On Thu, 2006-09-14 at 16:32 +0200, Haavard Skinnemoen wrote: > > Add mapping driver for the AT49BV6416 NOR flash chip on the > > ATSTK1000 development board. > > Hm, can't you set it up in advance and just register a platform_device > for physmap to drive? Probably. I'll give it a try. I have to find a way to unlock the flash at some point, though. Is it okay if I add code to physmap to iterate over the partitions and unlock the writable ones if info->mtd->unlock is non-null? Or is there a better way to do it? Andrew, please don't merge any of the patches in this series. I just noticed that the SMC patch should be cleaned up a bit, so I'm probably going to rework all the patches. (btw, I got an "awaiting moderator approval" message from the linux-mtd mailer because "Message has a suspicious header". Can someone tell me more about this so I can fix my mailer?) Thanks, Haavard ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000board 2006-09-15 7:56 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000board Haavard Skinnemoen @ 2006-09-15 8:00 ` David Woodhouse 2006-09-15 8:22 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for theATSTK1000board Haavard Skinnemoen 0 siblings, 1 reply; 9+ messages in thread From: David Woodhouse @ 2006-09-15 8:00 UTC (permalink / raw) To: Haavard Skinnemoen; +Cc: Andrew Morton, linux-mtd, linux-kernel On Fri, 2006-09-15 at 09:56 +0200, Haavard Skinnemoen wrote: > Probably. I'll give it a try. > > I have to find a way to unlock the flash at some point, though. Is it > okay if I add code to physmap to iterate over the partitions and unlock > the writable ones if info->mtd->unlock is non-null? Or is there a > better way to do it? I'm coming to the conclusion that if there are flash chips which inherit the Intel insanity of automatically locking themselves on every power cycle, thus rendering the 'locked' status meaningless, we should just automatically unlock the whole chip at boot time, from the _chip_ driver. That way, we can remove that hack from the board drivers which are currently doing it. > (btw, I got an "awaiting moderator approval" message from the linux-mtd > mailer because "Message has a suspicious header". Can someone tell me > more about this so I can fix my mailer?) Attachments would do that, but your patches were sensibly inlined. In fact, your mail got trapped for moderation because you did the _right_ thing -- you sent them in a thread, with References: headers to keep them together. But because that means you have References: and no 'Re:' in the Subject: header, that's indistinguishable from the muppets who try to start a new thread by replying to an existing mail and changing the subject. So it's trapped for moderation and I get to look at it and manually approve it. -- dwmw2 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [-mm patch 3/4] AVR32 MTD: Mapping driver for theATSTK1000board 2006-09-15 8:00 ` David Woodhouse @ 2006-09-15 8:22 ` Haavard Skinnemoen 0 siblings, 0 replies; 9+ messages in thread From: Haavard Skinnemoen @ 2006-09-15 8:22 UTC (permalink / raw) To: David Woodhouse; +Cc: Andrew Morton, linux-mtd, linux-kernel On Fri, 15 Sep 2006 09:00:30 +0100 David Woodhouse <dwmw2@infradead.org> wrote: > I'm coming to the conclusion that if there are flash chips which > inherit the Intel insanity of automatically locking themselves on > every power cycle, thus rendering the 'locked' status meaningless, we > should just automatically unlock the whole chip at boot time, from > the _chip_ driver. Yeah, there really is no reason to keep anything "soft locked". I'll unlock the chip from the fixup I submitted earlier so that it comes up unlocked by default. > So it's trapped for moderation and I > get to look at it and manually approve it. I'll keep doing it, then. That way, I can be sure that you'll notice my patches, too ;) Thanks, Haavard ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2006-09-15 8:22 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2006-09-14 14:29 [-mm patch 0/4] AVR32 MTD: Introduction Haavard Skinnemoen 2006-09-14 14:30 ` [-mm patch 1/4] AVR32 MTD: Static Memory Controller driver Haavard Skinnemoen 2006-09-14 14:31 ` [-mm patch 2/4] AVR32 MTD: Define struct flash_platform_data Haavard Skinnemoen 2006-09-14 14:32 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board Haavard Skinnemoen 2006-09-14 14:34 ` [-mm patch 4/4] AVR32 MTD: AT49BV6416 platform device for atstk1000 Haavard Skinnemoen 2006-09-14 20:11 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000 board David Woodhouse 2006-09-15 7:56 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for the ATSTK1000board Haavard Skinnemoen 2006-09-15 8:00 ` David Woodhouse 2006-09-15 8:22 ` [-mm patch 3/4] AVR32 MTD: Mapping driver for theATSTK1000board Haavard Skinnemoen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®