commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=5efebaa5cce5539f358a87db1a4f0cea12e81c9a branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Bob Liu <[email protected]> --- arch/blackfin/configs/BF609-EZKIT_defconfig | 2 +- arch/blackfin/include/asm/io.h | 27 --------------------------- arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- 3 files changed, 5 insertions(+), 32 deletions(-) diff --git a/arch/blackfin/configs/BF609-EZKIT_defconfig b/arch/blackfin/configs/BF609-EZKIT_defconfig index 9a11fba..07c9246 100644 --- a/arch/blackfin/configs/BF609-EZKIT_defconfig +++ b/arch/blackfin/configs/BF609-EZKIT_defconfig @@ -61,7 +61,7 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_STAA=y CONFIG_MTD_COMPLEX_MAPPINGS=y -CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_BFIN_BF60x=y CONFIG_MTD_M25P80=y CONFIG_MTD_UBI=m CONFIG_SCSI=y diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h index c8b1b1b..c6aca04 100644 --- a/arch/blackfin/include/asm/io.h +++ b/arch/blackfin/include/asm/io.h @@ -34,33 +34,6 @@ DECLARE_BFIN_RAW_READX(w, u16, w, (z)) DECLARE_BFIN_RAW_READX(l, u32, , ) #define __raw_readl __raw_readl -#ifdef CONFIG_BF60x -#define DECLARE_BFIN_RAW_WRITEX(size, type) \ -static inline void __raw_write##size(type val, volatile void __iomem *addr) \ -{ \ - unsigned int tmp = 0; \ - unsigned int tmp_addr = (unsigned int)addr; \ - int is_smc = 0; \ - if ((tmp_addr & ~(ASYNC_BANK0_SIZE - 1)) == ASYNC_BANK0_BASE) { \ - tmp = bfin_read32(SMC_B0CTL); \ - bfin_write32(SMC_B0CTL, tmp | 0x2000); \ - SSYNC(); \ - is_smc = 1; \ - } \ - *(volatile type __force *) addr = (type) val; \ - if (is_smc) { \ - tmp = bfin_read32(SMC_B0CTL); \ - bfin_write32(SMC_B0CTL, tmp & ~0x2000); \ - } \ -} -DECLARE_BFIN_RAW_WRITEX(b, u8) -#define __raw_writeb __raw_writeb -DECLARE_BFIN_RAW_WRITEX(w, u16) -#define __raw_writew __raw_writew -DECLARE_BFIN_RAW_WRITEX(l, u32) -#define __raw_writel __raw_writel -#endif - extern void outsb(unsigned long port, const void *addr, unsigned long count); extern void outsw(unsigned long port, const void *addr, unsigned long count); extern void outsw_8(unsigned long port, const void *addr, unsigned long count); diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c index 4e5185d..56ed857 100644 --- a/arch/blackfin/mach-bf609/boards/ezkit.c +++ b/arch/blackfin/mach-bf609/boards/ezkit.c @@ -639,7 +639,7 @@ static struct platform_device bfin_sdh_device = { }; #endif -#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) +#if defined(CONFIG_MTD_BFIN_BF60x) || defined(CONFIG_MTD_BFIN_BF60x_MODULE) static struct mtd_partition ezkit_partitions[] = { { .name = "bootloader(nor)", @@ -677,7 +677,7 @@ int bf609_nor_flash_init(struct platform_device *dev) static struct physmap_flash_data ezkit_flash_data = { .width = 2, .parts = ezkit_partitions, - .init = bf609_nor_flash_init, + .init = bf609_nor_flash_init, .nr_parts = ARRAY_SIZE(ezkit_partitions), }; @@ -688,7 +688,7 @@ static struct resource ezkit_flash_resource = { }; static struct platform_device ezkit_flash_device = { - .name = "physmap-flash", + .name = "bf60x-flash", .id = 0, .dev = { .platform_data = &ezkit_flash_data, @@ -1158,7 +1158,7 @@ static struct platform_device *ezkit_devices[] __initdata = { &bfin_device_gpiokeys, #endif -#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) +#if defined(CONFIG_MTD_BFIN_BF60x) || defined(CONFIG_MTD_BFIN_BF60x_MODULE) &ezkit_flash_device, #endif #if defined(CONFIG_SND_BF6XX_I2S) || defined(CONFIG_SND_BF6XX_I2S_MODULE)
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
