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

Commit fcc63716 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 3957/1: AT91: Physically mapped flash on DK and EK boards 



This patch converts the old CONFIG_MTD_PHYSMAP_ options to the new
physmap API by creating a physmap platform device for the NOR flash
found on the Atmel AT91RM9200-DK and AT91RM9200-EK boards.

Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 330d741b

arch/arm/configs/at91rm9200dk_defconfig

+6 −4
Original line number Diff line number Diff line
@@ -357,9 +357,9 @@ CONFIG_MTD_CFI_UTIL=y 
#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_START=0x10000000

CONFIG_MTD_PHYSMAP_LEN=0x200000

CONFIG_MTD_PHYSMAP_BANKWIDTH=2

CONFIG_MTD_PHYSMAP_START=0

CONFIG_MTD_PHYSMAP_LEN=0

CONFIG_MTD_PHYSMAP_BANKWIDTH=0

# CONFIG_MTD_ARM_INTEGRATOR is not set

# CONFIG_MTD_IMPA7 is not set

# CONFIG_MTD_PLATRAM is not set
@@ -585,7 +585,9 @@ CONFIG_AT91RM9200_WATCHDOG=y 
# CONFIG_USBPCWATCHDOG is not set

# CONFIG_NVRAM is not set

# CONFIG_RTC is not set

CONFIG_AT91_RTC=y

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91RM9200=y

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

arch/arm/configs/at91rm9200ek_defconfig

+6 −4
Original line number Diff line number Diff line
@@ -348,9 +348,9 @@ CONFIG_MTD_CFI_UTIL=y 
#

# CONFIG_MTD_COMPLEX_MAPPINGS is not set

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_PHYSMAP_START=0x10000000

CONFIG_MTD_PHYSMAP_LEN=0x800000

CONFIG_MTD_PHYSMAP_BANKWIDTH=2

CONFIG_MTD_PHYSMAP_START=0

CONFIG_MTD_PHYSMAP_LEN=0

CONFIG_MTD_PHYSMAP_BANKWIDTH=0

# CONFIG_MTD_ARM_INTEGRATOR is not set

# CONFIG_MTD_IMPA7 is not set

# CONFIG_MTD_PLATRAM is not set
@@ -566,7 +566,9 @@ CONFIG_AT91RM9200_WATCHDOG=y 
# CONFIG_USBPCWATCHDOG is not set

# CONFIG_NVRAM is not set

# CONFIG_RTC is not set

CONFIG_AT91_RTC=y

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_AT91RM9200=y

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

arch/arm/mach-at91rm9200/board-dk.c

+28 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/spi/spi.h>

#include <linux/mtd/physmap.h>



#include <asm/hardware.h>

#include <asm/setup.h>
@@ -39,6 +40,7 @@ 


#include <asm/arch/board.h>

#include <asm/arch/gpio.h>

#include <asm/arch/at91rm9200_mc.h>



#include "generic.h"
@@ -145,6 +147,30 @@ static struct at91_nand_data __initdata dk_nand_data = { 
	.partition_info	= nand_partitions,

};



#define DK_FLASH_BASE	AT91_CHIPSELECT_0

#define DK_FLASH_SIZE	0x200000



static struct physmap_flash_data dk_flash_data = {

	.width	= 2,

};



static struct resource dk_flash_resource = {

	.start		= DK_FLASH_BASE,

	.end		= DK_FLASH_BASE + DK_FLASH_SIZE - 1,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device dk_flash = {

	.name		= "physmap-flash",

	.id		= 0,

	.dev		= {

				.platform_data	= &dk_flash_data,

			},

	.resource	= &dk_flash_resource,

	.num_resources	= 1,

};





static void __init dk_board_init(void)

{

	/* Serial */
@@ -172,6 +198,8 @@ static void __init dk_board_init(void) 
#endif

	/* NAND */

	at91_add_device_nand(&dk_nand_data);

	/* NOR Flash */

	platform_device_register(&dk_flash);

	/* VGA */

//	dk_add_device_video();

}

arch/arm/mach-at91rm9200/board-ek.c

+28 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/spi/spi.h>

#include <linux/mtd/physmap.h>



#include <asm/hardware.h>

#include <asm/setup.h>
@@ -39,6 +40,7 @@ 


#include <asm/arch/board.h>

#include <asm/arch/gpio.h>

#include <asm/arch/at91rm9200_mc.h>



#include "generic.h"
@@ -107,6 +109,30 @@ static struct spi_board_info ek_spi_devices[] = { 
#endif

};



#define EK_FLASH_BASE	AT91_CHIPSELECT_0

#define EK_FLASH_SIZE	0x200000



static struct physmap_flash_data ek_flash_data = {

	.width	= 2,

};



static struct resource ek_flash_resource = {

	.start		= EK_FLASH_BASE,

	.end		= EK_FLASH_BASE + EK_FLASH_SIZE - 1,

	.flags		= IORESOURCE_MEM,

};



static struct platform_device ek_flash = {

	.name		= "physmap-flash",

	.id		= 0,

	.dev		= {

				.platform_data	= &ek_flash_data,

			},

	.resource	= &ek_flash_resource,

	.num_resources	= 1,

};





static void __init ek_board_init(void)

{

	/* Serial */
@@ -130,6 +156,8 @@ static void __init ek_board_init(void) 
	at91_set_gpio_output(AT91_PIN_PB22, 1);	/* this MMC card slot can optionally use SPI signaling (CS3). */

	at91_add_device_mmc(&ek_mmc_data);

#endif

	/* NOR Flash */

	platform_device_register(&ek_flash);

	/* VGA */

//	ek_add_device_video();

}