Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 561b036a authored by Ladislav Michl's avatar Ladislav Michl Committed by Tony Lindgren
Browse files

omap: convert boards to use physmap-flash 



Convert OMAP based boards to use physmap-flash. Refreshed against today's
Linux omap kernel tree

Cc: linux-mtd@lists.infradead.org
Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent fd17a25f

arch/arm/mach-omap1/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,