OMAP: use physmap-flash
Subsystems (5)
Arm (32-bit) Arm sub-architectures Memory technology devices (MTD) OMAP2+ support +1 more subsystems
cover OMAP: use physmap-flash
There is nothing special on omapflash driver, so it can be replaced with physmap-flash. First patch in serie does exactly this and second one removes drivers/mtd/maps/omap_nor.c and associated Kconfig option. I'd like to have either ack or merge into mtd git tree by mtd maintainers for that second part.
arch/arm/mach-omap1/flash.c | 33 ++ arch/arm/plat-omap/include/plat/flash.h | 16 + arch/arm/mach-omap1/Makefile | 2 arch/arm/mach-omap1/board-fsample.c | 9 arch/arm/mach-omap1/board-h2.c | 9 arch/arm/mach-omap1/board-h3.c | 9 arch/arm/mach-omap1/board-innovator.c | 9 arch/arm/mach-omap1/board-osk.c | 9 arch/arm/mach-omap1/board-palmte.c | 9 arch/arm/mach-omap1/board-palmtt.c | 9 arch/arm/mach-omap1/board-palmz71.c | 10 arch/arm/mach-omap1/board-perseus2.c | 9 arch/arm/mach-omap1/board-sx1.c | 11 arch/arm/mach-omap1/board-voiceblue.c | 9 arch/arm/mach-omap2/board-2430sdp.c | 7 arch/arm/mach-omap2/board-h4.c | 7 drivers/mtd/maps/Kconfig | 9 drivers/mtd/maps/Makefile | 1 drivers/mtd/maps/omap_nor.c | 188 ----------------- 19 files changed, 112 insertions(+), 253 deletions(-)
PATCH 1/2 OMAP: convert boards to use physmap-flash
Convert OMAP based boards to use physmap-flash.
Signed-off-by Ladislav Michl <[email protected]>
arch/arm/plat-omap/include/plat/flash.h new file +16 -0
@@ -0,0 +1,16 @@ +/* +* Flash support for OMAP1 +* +* 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 __OMAP_FLASH_H +#define __OMAP_FLASH_H + +#include <linux/mtd/map.h> + +extern void omap1_set_vpp (struct map_info *map,int enable); + +#endif
arch/arm/mach-omap1/flash.c new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Flash support for OMAP1 +* +* 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/mtd/mtd.h> +#include <linux/mtd/map.h> + +#include <plat/io.h> +#include <plat/tc.h> + +void omap1_set_vpp (struct map_info *map,int enable) +{ +static int count; +u32 l; + +if (enable) { +if (count++ ==0 ) { + l =omap_readl (EMIFS_CONFIG ); + l |=OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + }else { +if (count && (--count ==0 )) { + l =omap_readl (EMIFS_CONFIG ); + l &= ~OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + } +}
arch/arm/mach-omap1/Makefile +1 -1
@@ -3,7 +3,7 @@ # # Common support -obj-y := io.o id.o sram.o clock.o irq.o mux.o serial.o devices.o +obj-y := io.o id.o sram.o clock.o irq.o mux.o serial.o flash.o devices.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
arch/arm/mach-omap1/board-fsample.c +5 -4
@@ -18,18 +18,19 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> #include <plat/fpga.h> +#include <plat/flash.h> #include <plat/nand.h> #include <plat/keypad.h> #include <plat/common.h>
@@ -144,9 +145,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };
@@ -158,7 +159,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,
arch/arm/mach-omap1/board-h2.c +5 -4
@@ -26,6 +26,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/i2c/tps65010.h>
@@ -34,12 +35,12 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h> #include <plat/dma.h> #include <plat/tc.h> +#include <plat/flash.h> #include <plat/nand.h> #include <plat/irda.h> #include <plat/usb.h>
@@ -121,9 +122,9 @@ static struct mtd_partition h2_nor_partitions[] = { } }; -static struct flash_platform_data h2_nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h2_nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = h2_nor_partitions, .nr_parts =ARRAY_SIZE (h2_nor_partitions), };
@@ -134,7 +135,7 @@ static struct resource h2_nor_resource = { };static struct platform_device h2_nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h2_nor_data,
arch/arm/mach-omap1/board-h3.c +5 -4
@@ -25,6 +25,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/spi/spi.h> #include <linux/i2c/tps65010.h>
@@ -36,12 +37,12 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/irqs.h> #include <plat/mux.h> #include <plat/tc.h> +#include <plat/flash.h> #include <plat/nand.h> #include <plat/usb.h> #include <plat/keypad.h>
@@ -126,9 +127,9 @@ static struct mtd_partition nor_partitions[] = { } }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };
@@ -139,7 +140,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,
arch/arm/mach-omap1/board-innovator.c +5 -4
@@ -22,15 +22,16 @@#include <linux/delay.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h> +#include <plat/flash.h> #include <plat/fpga.h> #include <mach/gpio.h> #include <plat/tc.h>
@@ -93,9 +94,9 @@ static struct mtd_partition innovator_partitions[] = { } }; -static struct flash_platform_data innovator_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data innovator_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = innovator_partitions, .nr_parts =ARRAY_SIZE (innovator_partitions), };
@@ -107,7 +108,7 @@ static struct resource innovator_flash_resource = { };static struct platform_device innovator_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &innovator_flash_data,
arch/arm/mach-omap1/board-osk.c +5 -4
@@ -36,6 +36,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/i2c/tps65010.h>
@@ -45,8 +46,8 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> +#include <plat/flash.h> #include <plat/usb.h> #include <plat/mux.h> #include <plat/tc.h>
@@ -93,9 +94,9 @@ static struct mtd_partition osk_partitions[] = { } }; -static struct flash_platform_data osk_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data osk_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = osk_partitions, .nr_parts =ARRAY_SIZE (osk_partitions), };
@@ -106,7 +107,7 @@ static struct resource osk_flash_resource = { };static struct platform_device osk5912_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &osk_flash_data,
arch/arm/mach-omap1/board-palmte.c +5 -4
@@ -23,6 +23,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/spi/spi.h> #include <linux/interrupt.h> #include <linux/apm-emulation.h>
@@ -31,9 +32,9 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/tc.h>
@@ -126,9 +127,9 @@ static struct mtd_partition palmte_rom_partitions[] = { }, }; -static struct flash_platform_data palmte_rom_data = { - .map_name ="map_rom" , +static struct physmap_flash_data palmte_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmte_rom_partitions, .nr_parts =ARRAY_SIZE (palmte_rom_partitions), };
@@ -140,7 +141,7 @@ static struct resource palmte_rom_resource = { };static struct platform_device palmte_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmte_rom_data,
arch/arm/mach-omap1/board-palmtt.c +5 -4
@@ -21,16 +21,17 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/leds.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 <plat/led.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h>
@@ -104,9 +105,9 @@ static struct mtd_partition palmtt_partitions[] = { } }; -static struct flash_platform_data palmtt_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data palmtt_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmtt_partitions, .nr_parts =ARRAY_SIZE (palmtt_partitions), };
@@ -118,7 +119,7 @@ static struct resource palmtt_flash_resource = { };static struct platform_device palmtt_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &palmtt_flash_data,
arch/arm/mach-omap1/board-palmz71.c +5 -5
@@ -25,14 +25,15 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.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 <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h>
@@ -126,10 +127,9 @@ static struct mtd_partition palmz71_rom_partitions[] = { }, }; -static struct flash_platform_data palmz71_rom_data = { - .map_name ="map_rom" , - .name ="onboardrom" , +static struct physmap_flash_data palmz71_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmz71_rom_partitions, .nr_parts =ARRAY_SIZE (palmz71_rom_partitions), };
@@ -141,7 +141,7 @@ static struct resource palmz71_rom_resource = { };static struct platform_device palmz71_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmz71_rom_data,
arch/arm/mach-omap1/board-perseus2.c +5 -4
@@ -18,18 +18,19 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> #include <plat/fpga.h> +#include <plat/flash.h> #include <plat/nand.h> #include <plat/keypad.h> #include <plat/common.h>
@@ -111,9 +112,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };
@@ -125,7 +126,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,
arch/arm/mach-omap1/board-sx1.c +6 -5
@@ -22,6 +22,7 @@#include <linux/notifier.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/types.h> #include <linux/i2c.h> #include <linux/errno.h>
@@ -29,10 +30,10 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/dma.h> #include <plat/irda.h>
@@ -287,9 +288,9 @@ static struct mtd_partition sx1_partitions[] = { } }; -static struct flash_platform_data sx1_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sx1_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = sx1_partitions, .nr_parts =ARRAY_SIZE (sx1_partitions), };
@@ -310,7 +311,7 @@ static struct resource sx1_old_flash_resource[] = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,
@@ -327,7 +328,7 @@ static struct resource sx1_new_flash_resource = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,
arch/arm/mach-omap1/board-voiceblue.c +5 -4
@@ -18,6 +18,7 @@#include <linux/irq.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/mtd/physmap.h> #include <linux/notifier.h> #include <linux/reboot.h> #include <linux/serial_8250.h>
@@ -26,11 +27,11 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/common.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/tc.h> #include <plat/usb.h>
@@ -85,9 +86,9 @@ static int __init ext_uart_init(void) }arch_initcall (ext_uart_init); -static struct flash_platform_data voiceblue_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data voiceblue_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, };static struct resource voiceblue_flash_resource = {
@@ -97,7 +98,7 @@ static struct resource voiceblue_flash_resource = { };static struct platform_device voiceblue_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &voiceblue_flash_data,
arch/arm/mach-omap2/board-2430sdp.c +3 -4
@@ -18,6 +18,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/i2c/twl4030.h> #include <linux/err.h>
@@ -28,7 +29,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> #include <plat/mux.h>
@@ -74,8 +74,7 @@ static struct mtd_partition sdp2430_partitions[] = { } }; -static struct flash_platform_data sdp2430_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sdp2430_flash_data = { .width =2 , .parts = sdp2430_partitions, .nr_parts =ARRAY_SIZE (sdp2430_partitions),
@@ -88,7 +87,7 @@ static struct resource sdp2430_flash_resource = { };static struct platform_device sdp2430_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sdp2430_flash_data,
arch/arm/mach-omap2/board-h4.c +3 -4
@@ -16,6 +16,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/workqueue.h> #include <linux/i2c.h>
@@ -29,7 +30,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <plat/control.h> #include <mach/gpio.h>
@@ -115,8 +115,7 @@ static struct mtd_partition h4_partitions[] = { } }; -static struct flash_platform_data h4_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h4_flash_data = { .width =2 , .parts = h4_partitions, .nr_parts =ARRAY_SIZE (h4_partitions),
@@ -127,7 +126,7 @@ static struct resource h4_flash_resource = { };static struct platform_device h4_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h4_flash_data,
Tony Lindgren
maintainerRe: [PATCH 1/2] OMAP: convert boards to use physmap-flash
Quoted 1 line · Ladislav Michl
Convert OMAP based boards to use physmap-flash.
Looks like this needs to be refreshed to apply.
Regards,
Tony
Quoted 656 lines
Signed-off-by Ladislav Michl <[email protected]>arch/arm/plat-omap/include/plat/flash.h new file +16
-0@@ -0,0 +1,16 @@ +/* +* Flash support for OMAP1 +* +* 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 __OMAP_FLASH_H +#define __OMAP_FLASH_H + +#include <linux/mtd/map.h> + +extern void omap1_set_vpp (struct map_info *map,int enable); + +#endif arch/arm/mach-omap1/flash.c new file +33
-0@@ -0,0 +1,33 @@ +/* +* Flash support for OMAP1 +* +* 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/mtd/mtd.h> +#include <linux/mtd/map.h> + +#include <plat/io.h> +#include <plat/tc.h> + +void omap1_set_vpp (struct map_info *map,int enable) +{ +static int count; +u32 l; + +if (enable) { +if (count++ ==0 ) { + l =omap_readl (EMIFS_CONFIG ); + l |=OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + }else { +if (count && (--count ==0 )) { + l =omap_readl (EMIFS_CONFIG ); + l &= ~OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + } +}arch/arm/mach-omap1/Makefile +1
-1@@ -3,7 +3,7 @@ # # Common support -obj-y := io.o id.o sram.o clock.o irq.o mux.o serial.o devices.o +obj-y := io.o id.o sram.o clock.o irq.o mux.o serial.o flash.o devices.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.oarch/arm/mach-omap1/board-fsample.c +5
-4@@ -18,18 +18,19 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> #include <plat/fpga.h> +#include <plat/flash.h> #include <plat/nand.h> #include <plat/keypad.h> #include <plat/common.h> @@ -144,9 +145,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };@@ -158,7 +159,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,arch/arm/mach-omap1/board-h2.c +5
-4@@ -26,6 +26,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/i2c/tps65010.h> @@ -34,12 +35,12 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h> #include <plat/dma.h> #include <plat/tc.h> +#include <plat/flash.h> #include <plat/nand.h> #include <plat/irda.h> #include <plat/usb.h> @@ -121,9 +122,9 @@ static struct mtd_partition h2_nor_partitions[] = { } }; -static struct flash_platform_data h2_nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h2_nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = h2_nor_partitions, .nr_parts =ARRAY_SIZE (h2_nor_partitions), };@@ -134,7 +135,7 @@ static struct resource h2_nor_resource = { };static struct platform_device h2_nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h2_nor_data,arch/arm/mach-omap1/board-h3.c +5
-4@@ -25,6 +25,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/spi/spi.h> #include <linux/i2c/tps65010.h> @@ -36,12 +37,12 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/irqs.h> #include <plat/mux.h> #include <plat/tc.h> +#include <plat/flash.h> #include <plat/nand.h> #include <plat/usb.h> #include <plat/keypad.h> @@ -126,9 +127,9 @@ static struct mtd_partition nor_partitions[] = { } }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };@@ -139,7 +140,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,arch/arm/mach-omap1/board-innovator.c +5
-4@@ -22,15 +22,16 @@#include <linux/delay.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h> +#include <plat/flash.h> #include <plat/fpga.h> #include <mach/gpio.h> #include <plat/tc.h> @@ -93,9 +94,9 @@ static struct mtd_partition innovator_partitions[] = { } }; -static struct flash_platform_data innovator_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data innovator_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = innovator_partitions, .nr_parts =ARRAY_SIZE (innovator_partitions), };@@ -107,7 +108,7 @@ static struct resource innovator_flash_resource = { };static struct platform_device innovator_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &innovator_flash_data,arch/arm/mach-omap1/board-osk.c +5
-4@@ -36,6 +36,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/i2c/tps65010.h> @@ -45,8 +46,8 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> +#include <plat/flash.h> #include <plat/usb.h> #include <plat/mux.h> #include <plat/tc.h> @@ -93,9 +94,9 @@ static struct mtd_partition osk_partitions[] = { } }; -static struct flash_platform_data osk_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data osk_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = osk_partitions, .nr_parts =ARRAY_SIZE (osk_partitions), };@@ -106,7 +107,7 @@ static struct resource osk_flash_resource = { };static struct platform_device osk5912_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &osk_flash_data,arch/arm/mach-omap1/board-palmte.c +5
-4@@ -23,6 +23,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/spi/spi.h> #include <linux/interrupt.h> #include <linux/apm-emulation.h> @@ -31,9 +32,9 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/tc.h> @@ -126,9 +127,9 @@ static struct mtd_partition palmte_rom_partitions[] = { }, }; -static struct flash_platform_data palmte_rom_data = { - .map_name ="map_rom" , +static struct physmap_flash_data palmte_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmte_rom_partitions, .nr_parts =ARRAY_SIZE (palmte_rom_partitions), };@@ -140,7 +141,7 @@ static struct resource palmte_rom_resource = { };static struct platform_device palmte_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmte_rom_data,arch/arm/mach-omap1/board-palmtt.c +5
-4@@ -21,16 +21,17 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/leds.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 <plat/led.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h> @@ -104,9 +105,9 @@ static struct mtd_partition palmtt_partitions[] = { } }; -static struct flash_platform_data palmtt_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data palmtt_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmtt_partitions, .nr_parts =ARRAY_SIZE (palmtt_partitions), };@@ -118,7 +119,7 @@ static struct resource palmtt_flash_resource = { };static struct platform_device palmtt_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &palmtt_flash_data,arch/arm/mach-omap1/board-palmz71.c +5
-5@@ -25,14 +25,15 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.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 <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h> @@ -126,10 +127,9 @@ static struct mtd_partition palmz71_rom_partitions[] = { }, }; -static struct flash_platform_data palmz71_rom_data = { - .map_name ="map_rom" , - .name ="onboardrom" , +static struct physmap_flash_data palmz71_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmz71_rom_partitions, .nr_parts =ARRAY_SIZE (palmz71_rom_partitions), };@@ -141,7 +141,7 @@ static struct resource palmz71_rom_resource = { };static struct platform_device palmz71_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmz71_rom_data,arch/arm/mach-omap1/board-perseus2.c +5
-4@@ -18,18 +18,19 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> #include <plat/fpga.h> +#include <plat/flash.h> #include <plat/nand.h> #include <plat/keypad.h> #include <plat/common.h> @@ -111,9 +112,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };@@ -125,7 +126,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,arch/arm/mach-omap1/board-sx1.c +6
-5@@ -22,6 +22,7 @@#include <linux/notifier.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/types.h> #include <linux/i2c.h> #include <linux/errno.h> @@ -29,10 +30,10 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/dma.h> #include <plat/irda.h> @@ -287,9 +288,9 @@ static struct mtd_partition sx1_partitions[] = { } }; -static struct flash_platform_data sx1_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sx1_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = sx1_partitions, .nr_parts =ARRAY_SIZE (sx1_partitions), };@@ -310,7 +311,7 @@ static struct resource sx1_old_flash_resource[] = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,@@ -327,7 +328,7 @@ static struct resource sx1_new_flash_resource = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,arch/arm/mach-omap1/board-voiceblue.c +5
-4@@ -18,6 +18,7 @@#include <linux/irq.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/mtd/physmap.h> #include <linux/notifier.h> #include <linux/reboot.h> #include <linux/serial_8250.h> @@ -26,11 +27,11 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/common.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/tc.h> #include <plat/usb.h> @@ -85,9 +86,9 @@ static int __init ext_uart_init(void) }arch_initcall (ext_uart_init); -static struct flash_platform_data voiceblue_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data voiceblue_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, };static struct resource voiceblue_flash_resource = {@@ -97,7 +98,7 @@ static struct resource voiceblue_flash_resource = { };static struct platform_device voiceblue_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &voiceblue_flash_data,arch/arm/mach-omap2/board-2430sdp.c +3
-4@@ -18,6 +18,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/i2c/twl4030.h> #include <linux/err.h> @@ -28,7 +29,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> #include <plat/mux.h> @@ -74,8 +74,7 @@ static struct mtd_partition sdp2430_partitions[] = { } }; -static struct flash_platform_data sdp2430_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sdp2430_flash_data = { .width =2 , .parts = sdp2430_partitions, .nr_parts =ARRAY_SIZE (sdp2430_partitions),@@ -88,7 +87,7 @@ static struct resource sdp2430_flash_resource = { };static struct platform_device sdp2430_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sdp2430_flash_data,arch/arm/mach-omap2/board-h4.c +3
-5@@ -16,6 +16,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/workqueue.h> #include <linux/i2c.h> @@ -29,7 +30,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <plat/control.h> #include <mach/gpio.h> @@ -115,8 +115,7 @@ static struct mtd_partition h4_partitions[] = { } }; -static struct flash_platform_data h4_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h4_flash_data = { .width =2 , .parts = h4_partitions, .nr_parts =ARRAY_SIZE (h4_partitions),@@ -127,7 +126,7 @@ static struct resource h4_flash_resource = { };static struct platform_device h4_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h4_flash_data, --To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 1/2 OMAP: convert boards to use physmap-flash
Convert OMAP based boards to use physmap-flash. Refreshed against today's Linux omap kernel tree
Signed-off-by Ladislav Michl <[email protected]>
arch/arm/plat-omap/include/plat/flash.h new file +16 -0
@@ -0,0 +1,16 @@ +/* +* Flash support for OMAP1 +* +* 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 __OMAP_FLASH_H +#define __OMAP_FLASH_H + +#include <linux/mtd/map.h> + +extern void omap1_set_vpp (struct map_info *map,int enable); + +#endif
arch/arm/mach-omap1/flash.c new file +33 -0
@@ -0,0 +1,33 @@ +/* +* Flash support for OMAP1 +* +* 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/mtd/mtd.h> +#include <linux/mtd/map.h> + +#include <plat/io.h> +#include <plat/tc.h> + +void omap1_set_vpp (struct map_info *map,int enable) +{ +static int count; +u32 l; + +if (enable) { +if (count++ ==0 ) { + l =omap_readl (EMIFS_CONFIG ); + l |=OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + }else { +if (count && (--count ==0 )) { + l =omap_readl (EMIFS_CONFIG ); + l &= ~OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + } +}
arch/arm/mach-omap1/Makefile +1 -1
@@ -3,7 +3,7 @@ # # Common support -obj-y := io.o id.o sram.o irq.o mux.o serial.o devices.o +obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o obj-y += clock.o clock_data.o opp_data.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
arch/arm/mach-omap1/board-fsample.c +5 -4
@@ -18,18 +18,19 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> +#include <plat/flash.h> #include <plat/fpga.h> #include <plat/keypad.h> #include <plat/common.h>
@@ -150,9 +151,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };
@@ -164,7 +165,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,
arch/arm/mach-omap1/board-h2.c +5 -4
@@ -26,6 +26,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/i2c/tps65010.h> #include <linux/smc91x.h>
@@ -35,7 +36,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h>
@@ -45,6 +45,7 @@#include <plat/usb.h> #include <plat/keypad.h> #include <plat/common.h> +#include <plat/flash.h> #include "board-h2.h"
@@ -121,9 +122,9 @@ static struct mtd_partition h2_nor_partitions[] = { } }; -static struct flash_platform_data h2_nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h2_nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = h2_nor_partitions, .nr_parts =ARRAY_SIZE (h2_nor_partitions), };
@@ -134,7 +135,7 @@ static struct resource h2_nor_resource = { };static struct platform_device h2_nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h2_nor_data,
arch/arm/mach-omap1/board-h3.c +5 -4
@@ -25,6 +25,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/spi/spi.h> #include <linux/i2c/tps65010.h>
@@ -37,7 +38,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/irqs.h>
@@ -47,6 +47,7 @@#include <plat/keypad.h> #include <plat/dma.h> #include <plat/common.h> +#include <plat/flash.h> #include "board-h3.h"
@@ -126,9 +127,9 @@ static struct mtd_partition nor_partitions[] = { } }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };
@@ -139,7 +140,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,
arch/arm/mach-omap1/board-innovator.c +5 -4
@@ -22,16 +22,17 @@#include <linux/delay.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h> +#include <plat/flash.h> #include <plat/fpga.h> #include <mach/gpio.h> #include <plat/tc.h>
@@ -94,9 +95,9 @@ static struct mtd_partition innovator_partitions[] = { } }; -static struct flash_platform_data innovator_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data innovator_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = innovator_partitions, .nr_parts =ARRAY_SIZE (innovator_partitions), };
@@ -108,7 +109,7 @@ static struct resource innovator_flash_resource = { };static struct platform_device innovator_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &innovator_flash_data,
arch/arm/mach-omap1/board-osk.c +5 -4
@@ -37,6 +37,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/i2c/tps65010.h>
@@ -46,8 +47,8 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> +#include <plat/flash.h> #include <plat/usb.h> #include <plat/mux.h> #include <plat/tc.h>
@@ -94,9 +95,9 @@ static struct mtd_partition osk_partitions[] = { } }; -static struct flash_platform_data osk_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data osk_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = osk_partitions, .nr_parts =ARRAY_SIZE (osk_partitions), };
@@ -107,7 +108,7 @@ static struct resource osk_flash_resource = { };static struct platform_device osk5912_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &osk_flash_data,
arch/arm/mach-omap1/board-palmte.c +5 -4
@@ -23,6 +23,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/spi/spi.h> #include <linux/interrupt.h> #include <linux/apm-emulation.h>
@@ -31,9 +32,9 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/tc.h>
@@ -126,9 +127,9 @@ static struct mtd_partition palmte_rom_partitions[] = { }, }; -static struct flash_platform_data palmte_rom_data = { - .map_name ="map_rom" , +static struct physmap_flash_data palmte_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmte_rom_partitions, .nr_parts =ARRAY_SIZE (palmte_rom_partitions), };
@@ -140,7 +141,7 @@ static struct resource palmte_rom_resource = { };static struct platform_device palmte_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmte_rom_data,
arch/arm/mach-omap1/board-palmtt.c +5 -4
@@ -21,16 +21,17 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/leds.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 <plat/led.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h>
@@ -104,9 +105,9 @@ static struct mtd_partition palmtt_partitions[] = { } }; -static struct flash_platform_data palmtt_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data palmtt_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmtt_partitions, .nr_parts =ARRAY_SIZE (palmtt_partitions), };
@@ -118,7 +119,7 @@ static struct resource palmtt_flash_resource = { };static struct platform_device palmtt_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &palmtt_flash_data,
arch/arm/mach-omap1/board-palmz71.c +5 -5
@@ -25,14 +25,15 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.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 <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h>
@@ -126,10 +127,9 @@ static struct mtd_partition palmz71_rom_partitions[] = { }, }; -static struct flash_platform_data palmz71_rom_data = { - .map_name ="map_rom" , - .name ="onboardrom" , +static struct physmap_flash_data palmz71_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmz71_rom_partitions, .nr_parts =ARRAY_SIZE (palmz71_rom_partitions), };
@@ -141,7 +141,7 @@ static struct resource palmz71_rom_resource = { };static struct platform_device palmz71_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmz71_rom_data,
arch/arm/mach-omap1/board-perseus2.c +5 -4
@@ -18,19 +18,20 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> #include <plat/fpga.h> +#include <plat/flash.h> #include <plat/keypad.h> #include <plat/common.h> #include <plat/board.h>
@@ -117,9 +118,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };
@@ -131,7 +132,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,
arch/arm/mach-omap1/board-sx1.c +6 -5
@@ -22,6 +22,7 @@#include <linux/notifier.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/types.h> #include <linux/i2c.h> #include <linux/errno.h>
@@ -29,10 +30,10 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/dma.h> #include <plat/irda.h>
@@ -287,9 +288,9 @@ static struct mtd_partition sx1_partitions[] = { } }; -static struct flash_platform_data sx1_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sx1_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = sx1_partitions, .nr_parts =ARRAY_SIZE (sx1_partitions), };
@@ -310,7 +311,7 @@ static struct resource sx1_old_flash_resource[] = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,
@@ -327,7 +328,7 @@ static struct resource sx1_new_flash_resource = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,
arch/arm/mach-omap1/board-voiceblue.c +5 -4
@@ -18,6 +18,7 @@#include <linux/irq.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/mtd/physmap.h> #include <linux/notifier.h> #include <linux/reboot.h> #include <linux/serial_8250.h>
@@ -27,11 +28,11 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/common.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/tc.h> #include <plat/usb.h>
@@ -86,9 +87,9 @@ static int __init ext_uart_init(void) }arch_initcall (ext_uart_init); -static struct flash_platform_data voiceblue_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data voiceblue_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, };static struct resource voiceblue_flash_resource = {
@@ -98,7 +99,7 @@ static struct resource voiceblue_flash_resource = { };static struct platform_device voiceblue_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &voiceblue_flash_data,
arch/arm/mach-omap2/board-2430sdp.c +3 -4
@@ -18,6 +18,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/i2c/twl4030.h> #include <linux/err.h>
@@ -28,7 +29,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> #include <plat/mux.h>
@@ -74,8 +74,7 @@ static struct mtd_partition sdp2430_partitions[] = { } }; -static struct flash_platform_data sdp2430_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sdp2430_flash_data = { .width =2 , .parts = sdp2430_partitions, .nr_parts =ARRAY_SIZE (sdp2430_partitions),
@@ -88,7 +87,7 @@ static struct resource sdp2430_flash_resource = { };static struct platform_device sdp2430_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sdp2430_flash_data,
arch/arm/mach-omap2/board-h4.c +3 -4
@@ -16,6 +16,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/workqueue.h> #include <linux/i2c.h>
@@ -29,7 +30,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <plat/control.h> #include <mach/gpio.h>
@@ -115,8 +115,7 @@ static struct mtd_partition h4_partitions[] = { } }; -static struct flash_platform_data h4_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h4_flash_data = { .width =2 , .parts = h4_partitions, .nr_parts =ARRAY_SIZE (h4_partitions),
@@ -127,7 +126,7 @@ static struct resource h4_flash_resource = { };static struct platform_device h4_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h4_flash_data,
Tony Lindgren
maintainerRe: [PATCH v2 1/2] OMAP: convert boards to use physmap-flash
Quoted 2 lines · Ladislav Michl
Convert OMAP based boards to use physmap-flash. Refreshed against today's Linux omap kernel tree
Thanks for updating this, I've added it into for-next.
Regards,
Tony
Quoted 658 lines
Signed-off-by Ladislav Michl <[email protected]>arch/arm/plat-omap/include/plat/flash.h new file +16
-0@@ -0,0 +1,16 @@ +/* +* Flash support for OMAP1 +* +* 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 __OMAP_FLASH_H +#define __OMAP_FLASH_H + +#include <linux/mtd/map.h> + +extern void omap1_set_vpp (struct map_info *map,int enable); + +#endif arch/arm/mach-omap1/flash.c new file +33
-0@@ -0,0 +1,33 @@ +/* +* Flash support for OMAP1 +* +* 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/mtd/mtd.h> +#include <linux/mtd/map.h> + +#include <plat/io.h> +#include <plat/tc.h> + +void omap1_set_vpp (struct map_info *map,int enable) +{ +static int count; +u32 l; + +if (enable) { +if (count++ ==0 ) { + l =omap_readl (EMIFS_CONFIG ); + l |=OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + }else { +if (count && (--count ==0 )) { + l =omap_readl (EMIFS_CONFIG ); + l &= ~OMAP_EMIFS_CONFIG_WP ; +omap_writel (l,EMIFS_CONFIG ); + } + } +}arch/arm/mach-omap1/Makefile +1
-1@@ -3,7 +3,7 @@ # # Common support -obj-y := io.o id.o sram.o irq.o mux.o serial.o devices.o +obj-y := io.o id.o sram.o irq.o mux.o flash.o serial.o devices.o obj-y += clock.o clock_data.o opp_data.o obj-$(CONFIG_OMAP_MCBSP) += mcbsp.oarch/arm/mach-omap1/board-fsample.c +5
-4@@ -18,18 +18,19 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> +#include <plat/flash.h> #include <plat/fpga.h> #include <plat/keypad.h> #include <plat/common.h> @@ -150,9 +151,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };@@ -164,7 +165,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,arch/arm/mach-omap1/board-h2.c +5
-4@@ -26,6 +26,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/i2c/tps65010.h> #include <linux/smc91x.h> @@ -35,7 +36,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h> @@ -45,6 +45,7 @@#include <plat/usb.h> #include <plat/keypad.h> #include <plat/common.h> +#include <plat/flash.h> #include "board-h2.h" @@ -121,9 +122,9 @@ static struct mtd_partition h2_nor_partitions[] = { } }; -static struct flash_platform_data h2_nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h2_nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = h2_nor_partitions, .nr_parts =ARRAY_SIZE (h2_nor_partitions), };@@ -134,7 +135,7 @@ static struct resource h2_nor_resource = { };static struct platform_device h2_nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h2_nor_data,arch/arm/mach-omap1/board-h3.c +5
-4@@ -25,6 +25,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/spi/spi.h> #include <linux/i2c/tps65010.h> @@ -37,7 +38,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/irqs.h> @@ -47,6 +47,7 @@#include <plat/keypad.h> #include <plat/dma.h> #include <plat/common.h> +#include <plat/flash.h> #include "board-h3.h" @@ -126,9 +127,9 @@ static struct mtd_partition nor_partitions[] = { } }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };@@ -139,7 +140,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,arch/arm/mach-omap1/board-innovator.c +5
-4@@ -22,16 +22,17 @@#include <linux/delay.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/mux.h> +#include <plat/flash.h> #include <plat/fpga.h> #include <mach/gpio.h> #include <plat/tc.h> @@ -94,9 +95,9 @@ static struct mtd_partition innovator_partitions[] = { } }; -static struct flash_platform_data innovator_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data innovator_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = innovator_partitions, .nr_parts =ARRAY_SIZE (innovator_partitions), };@@ -108,7 +109,7 @@ static struct resource innovator_flash_resource = { };static struct platform_device innovator_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &innovator_flash_data,arch/arm/mach-omap1/board-osk.c +5
-4@@ -37,6 +37,7 @@#include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/i2c/tps65010.h> @@ -46,8 +47,8 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> +#include <plat/flash.h> #include <plat/usb.h> #include <plat/mux.h> #include <plat/tc.h> @@ -94,9 +95,9 @@ static struct mtd_partition osk_partitions[] = { } }; -static struct flash_platform_data osk_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data osk_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = osk_partitions, .nr_parts =ARRAY_SIZE (osk_partitions), };@@ -107,7 +108,7 @@ static struct resource osk_flash_resource = { };static struct platform_device osk5912_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &osk_flash_data,arch/arm/mach-omap1/board-palmte.c +5
-4@@ -23,6 +23,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/spi/spi.h> #include <linux/interrupt.h> #include <linux/apm-emulation.h> @@ -31,9 +32,9 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/tc.h> @@ -126,9 +127,9 @@ static struct mtd_partition palmte_rom_partitions[] = { }, }; -static struct flash_platform_data palmte_rom_data = { - .map_name ="map_rom" , +static struct physmap_flash_data palmte_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmte_rom_partitions, .nr_parts =ARRAY_SIZE (palmte_rom_partitions), };@@ -140,7 +141,7 @@ static struct resource palmte_rom_resource = { };static struct platform_device palmte_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmte_rom_data,arch/arm/mach-omap1/board-palmtt.c +5
-4@@ -21,16 +21,17 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/leds.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 <plat/led.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h> @@ -104,9 +105,9 @@ static struct mtd_partition palmtt_partitions[] = { } }; -static struct flash_platform_data palmtt_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data palmtt_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmtt_partitions, .nr_parts =ARRAY_SIZE (palmtt_partitions), };@@ -118,7 +119,7 @@ static struct resource palmtt_flash_resource = { };static struct platform_device palmtt_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &palmtt_flash_data,arch/arm/mach-omap1/board-palmz71.c +5
-5@@ -25,14 +25,15 @@#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.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 <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/usb.h> #include <plat/dma.h> @@ -126,10 +127,9 @@ static struct mtd_partition palmz71_rom_partitions[] = { }, }; -static struct flash_platform_data palmz71_rom_data = { - .map_name ="map_rom" , - .name ="onboardrom" , +static struct physmap_flash_data palmz71_rom_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = palmz71_rom_partitions, .nr_parts =ARRAY_SIZE (palmz71_rom_partitions), };@@ -141,7 +141,7 @@ static struct resource palmz71_rom_resource = { };static struct platform_device palmz71_rom_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =-1 , .dev = { .platform_data = &palmz71_rom_data,arch/arm/mach-omap1/board-perseus2.c +5
-4@@ -18,19 +18,20 @@#include <linux/mtd/mtd.h> #include <linux/mtd/nand.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/input.h> #include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/tc.h> #include <mach/gpio.h> #include <plat/mux.h> #include <plat/fpga.h> +#include <plat/flash.h> #include <plat/keypad.h> #include <plat/common.h> #include <plat/board.h> @@ -117,9 +118,9 @@ static struct mtd_partition nor_partitions[] = { }, }; -static struct flash_platform_data nor_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data nor_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = nor_partitions, .nr_parts =ARRAY_SIZE (nor_partitions), };@@ -131,7 +132,7 @@ static struct resource nor_resource = { };static struct platform_device nor_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &nor_data,arch/arm/mach-omap1/board-sx1.c +6
-5@@ -22,6 +22,7 @@#include <linux/notifier.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/types.h> #include <linux/i2c.h> #include <linux/errno.h> @@ -29,10 +30,10 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/dma.h> #include <plat/irda.h> @@ -287,9 +288,9 @@ static struct mtd_partition sx1_partitions[] = { } }; -static struct flash_platform_data sx1_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sx1_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, .parts = sx1_partitions, .nr_parts =ARRAY_SIZE (sx1_partitions), };@@ -310,7 +311,7 @@ static struct resource sx1_old_flash_resource[] = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,@@ -327,7 +328,7 @@ static struct resource sx1_new_flash_resource = { };static struct platform_device sx1_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sx1_flash_data,arch/arm/mach-omap1/board-voiceblue.c +5
-4@@ -18,6 +18,7 @@#include <linux/irq.h> #include <linux/init.h> #include <linux/kernel.h> +#include <linux/mtd/physmap.h> #include <linux/notifier.h> #include <linux/reboot.h> #include <linux/serial_8250.h> @@ -27,11 +28,11 @@#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/mach/flash.h> #include <asm/mach/map.h> #include <plat/common.h> #include <mach/gpio.h> +#include <plat/flash.h> #include <plat/mux.h> #include <plat/tc.h> #include <plat/usb.h> @@ -86,9 +87,9 @@ static int __init ext_uart_init(void) }arch_initcall (ext_uart_init); -static struct flash_platform_data voiceblue_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data voiceblue_flash_data = { .width =2 , + .set_vpp = omap1_set_vpp, };static struct resource voiceblue_flash_resource = {@@ -98,7 +99,7 @@ static struct resource voiceblue_flash_resource = { };static struct platform_device voiceblue_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &voiceblue_flash_data,arch/arm/mach-omap2/board-2430sdp.c +3
-4@@ -18,6 +18,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/i2c/twl4030.h> #include <linux/err.h> @@ -28,7 +29,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <mach/gpio.h> #include <plat/mux.h> @@ -74,8 +74,7 @@ static struct mtd_partition sdp2430_partitions[] = { } }; -static struct flash_platform_data sdp2430_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data sdp2430_flash_data = { .width =2 , .parts = sdp2430_partitions, .nr_parts =ARRAY_SIZE (sdp2430_partitions),@@ -88,7 +87,7 @@ static struct resource sdp2430_flash_resource = { };static struct platform_device sdp2430_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &sdp2430_flash_data,arch/arm/mach-omap2/board-h4.c +3
-4@@ -16,6 +16,7 @@#include <linux/platform_device.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <linux/mtd/physmap.h> #include <linux/delay.h> #include <linux/workqueue.h> #include <linux/i2c.h> @@ -29,7 +30,6 @@#include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> -#include <asm/mach/flash.h> #include <plat/control.h> #include <mach/gpio.h> @@ -115,8 +115,7 @@ static struct mtd_partition h4_partitions[] = { } }; -static struct flash_platform_data h4_flash_data = { - .map_name ="cfi_probe" , +static struct physmap_flash_data h4_flash_data = { .width =2 , .parts = h4_partitions, .nr_parts =ARRAY_SIZE (h4_partitions),@@ -127,7 +126,7 @@ static struct resource h4_flash_resource = { };static struct platform_device h4_flash_device = { - .name ="omapflash" , + .name ="physmap-flash" , .id =0 , .dev = { .platform_data = &h4_flash_data,
Tony Lindgren
maintainerRe: [PATCH v2 1/2] OMAP: convert boards to use physmap-flash
Quoted 5 lines · Tony Lindgren
Quoted 2 lines · Ladislav Michl
Convert OMAP based boards to use physmap-flash. Refreshed against today's Linux omap kernel tree
Thanks for updating this, I've added it into for-next.
Looks like your patches got wrongly credited for me, I've fixed that in for-next, but they'll show up that way in the l-o master branch until the next time I rebuild it.
Regards,
Tony
PATCH 2/2 MTD: remove no longer used OMAP flash map
In reply to Ladislav MichlAll OMAP boards are now using physmap-flash.
Signed-off-by Ladislav Michl <[email protected]>
drivers/mtd/maps/Kconfig +0 -9
@@ -436,15 +436,6 @@ config MTD_H720X This enables access to the flash chips on the Hynix evaluation boards. If you have such a board, say 'Y'. -config MTD_OMAP_NOR - tristate "TI OMAP board mappings" - depends on MTD_CFI && ARCH_OMAP - help - This enables access to the NOR flash chips on TI OMAP-based - boards defining flash platform devices and flash platform data. - These boards include the Innovator, H2, H3, OSK, Perseus2, and - more. If you have such a board, say 'Y'. - # This needs CFI or JEDEC, depending on the cards found. config MTD_PCI tristate "PCI MTD driver"
drivers/mtd/maps/Makefile +0 -1
@@ -55,7 +55,6 @@ obj-$(CONFIG_MTD_IXP2000) += ixp2000.o obj-$(CONFIG_MTD_WRSBC8260) += wr_sbc82xx_flash.o obj-$(CONFIG_MTD_DMV182) += dmv182.o obj-$(CONFIG_MTD_PLATRAM) += plat-ram.o -obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o obj-$(CONFIG_MTD_BFIN_ASYNC) += bfin-async-flash.o obj-$(CONFIG_MTD_RBTX4939) += rbtx4939-flash.o
drivers/mtd/maps/omap_nor.c +0 -188
188 lines not on this page · raw message
Tony Lindgren
maintainerPATCH 2/2 MTD: remove no longer used OMAP flash map
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): ae051fd241789473dd0b2651fbfd10e97d8b2810
PatchWorks
http://patchwork.kernel.org/patch/65724/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=ae051fd241789473dd0b2651fbfd10e97d8b2810
Quoted 4 lines · Ladislav Michl
There is nothing special on omapflash driver, so it can be replaced with physmap-flash. First patch in serie does exactly this and second one removes
drivers/mtd/maps/omap_nor.cand associatedKconfigoption. I'd like to have either ack or merge into mtd git tree by mtd maintainers for that second part.
Nice work! Ack from me to merge all this via the MTD tree.
Acked-by Tony Lindgren <[email protected]>
Quoted 24 lines
arch/arm/mach-omap1/flash.c | 33 ++ arch/arm/plat-omap/include/plat/flash.h | 16 + arch/arm/mach-omap1/Makefile | 2 arch/arm/mach-omap1/board-fsample.c | 9 arch/arm/mach-omap1/board-h2.c | 9 arch/arm/mach-omap1/board-h3.c | 9 arch/arm/mach-omap1/board-innovator.c | 9 arch/arm/mach-omap1/board-osk.c | 9 arch/arm/mach-omap1/board-palmte.c | 9 arch/arm/mach-omap1/board-palmtt.c | 9 arch/arm/mach-omap1/board-palmz71.c | 10 arch/arm/mach-omap1/board-perseus2.c | 9 arch/arm/mach-omap1/board-sx1.c | 11 arch/arm/mach-omap1/board-voiceblue.c | 9 arch/arm/mach-omap2/board-2430sdp.c | 7 arch/arm/mach-omap2/board-h4.c | 7 drivers/mtd/maps/Kconfig | 9 drivers/mtd/maps/Makefile | 1 drivers/mtd/maps/omap_nor.c | 188 ----------------- 19 files changed, 112 insertions(+), 253 deletions(-)--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 30 lines · Tony Lindgren
Quoted 4 lines · Ladislav Michl
There is nothing special on omapflash driver, so it can be replaced with physmap-flash. First patch in serie does exactly this and second one removes
drivers/mtd/maps/omap_nor.cand associatedKconfigoption. I'd like to have either ack or merge into mtd git tree by mtd maintainers for that second part.Nice work! Ack from me to merge all this via the MTD tree.
Acked-by Tony Lindgren <[email protected]>Quoted 20 lines
arch/arm/mach-omap1/flash.c | 33 ++ arch/arm/plat-omap/include/plat/flash.h | 16 + arch/arm/mach-omap1/Makefile | 2 arch/arm/mach-omap1/board-fsample.c | 9 arch/arm/mach-omap1/board-h2.c | 9 arch/arm/mach-omap1/board-h3.c | 9 arch/arm/mach-omap1/board-innovator.c | 9 arch/arm/mach-omap1/board-osk.c | 9 arch/arm/mach-omap1/board-palmte.c | 9 arch/arm/mach-omap1/board-palmtt.c | 9 arch/arm/mach-omap1/board-palmz71.c | 10 arch/arm/mach-omap1/board-perseus2.c | 9 arch/arm/mach-omap1/board-sx1.c | 11 arch/arm/mach-omap1/board-voiceblue.c | 9 arch/arm/mach-omap2/board-2430sdp.c | 7 arch/arm/mach-omap2/board-h4.c | 7 drivers/mtd/maps/Kconfig | 9 drivers/mtd/maps/Makefile | 1 drivers/mtd/maps/omap_nor.c | 188 ----------------- 19 files changed, 112 insertions(+), 253 deletions(-)
I think this should be merged via the omap tree, not mtd (CCed dwmw2).
Signature · 7 lines
Best Regards, Artem Bityutskiy (Артём Битюцкий) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Tony Lindgren
maintainerQuoted 32 lines · Artem Bityutskiy
Quoted 30 lines · Tony Lindgren
Quoted 4 lines · Ladislav Michl
There is nothing special on omapflash driver, so it can be replaced with physmap-flash. First patch in serie does exactly this and second one removes
drivers/mtd/maps/omap_nor.cand associatedKconfigoption. I'd like to have either ack or merge into mtd git tree by mtd maintainers for that second part.Nice work! Ack from me to merge all this via the MTD tree.
Acked-by Tony Lindgren <[email protected]>Quoted 20 lines
arch/arm/mach-omap1/flash.c | 33 ++ arch/arm/plat-omap/include/plat/flash.h | 16 + arch/arm/mach-omap1/Makefile | 2 arch/arm/mach-omap1/board-fsample.c | 9 arch/arm/mach-omap1/board-h2.c | 9 arch/arm/mach-omap1/board-h3.c | 9 arch/arm/mach-omap1/board-innovator.c | 9 arch/arm/mach-omap1/board-osk.c | 9 arch/arm/mach-omap1/board-palmte.c | 9 arch/arm/mach-omap1/board-palmtt.c | 9 arch/arm/mach-omap1/board-palmz71.c | 10 arch/arm/mach-omap1/board-perseus2.c | 9 arch/arm/mach-omap1/board-sx1.c | 11 arch/arm/mach-omap1/board-voiceblue.c | 9 arch/arm/mach-omap2/board-2430sdp.c | 7 arch/arm/mach-omap2/board-h4.c | 7 drivers/mtd/maps/Kconfig | 9 drivers/mtd/maps/Makefile | 1 drivers/mtd/maps/omap_nor.c | 188 ----------------- 19 files changed, 112 insertions(+), 253 deletions(-)
Quoted 1 line
I think this should be merged via the omap tree, not mtd (CCed dwmw2).
OK will queue then.
Tony