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

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

[ARM] 4755/1: [AT91] NAND update 



Map the complete memory region (SZ_256M) as is done on the other AT91
processors.

The SMC_SMARTMEDIA bit should be set in the EBI controller to enable
the hardware NAND logic.
  (Patch from Sascha Erlacher)

Signed-off-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bfbc3266

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static struct at91_nand_data nand_data; 
static struct resource nand_resources[] = {

	{

		.start	= NAND_BASE,

		.end	= NAND_BASE + SZ_8M - 1,

		.end	= NAND_BASE + SZ_256M - 1,

		.flags	= IORESOURCE_MEM,

	}

};

arch/arm/mach-at91/at91sam9260_devices.c

+2 −2
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static struct at91_nand_data nand_data; 
static struct resource nand_resources[] = {

	{

		.start	= NAND_BASE,

		.end	= NAND_BASE + SZ_8M - 1,

		.end	= NAND_BASE + SZ_256M - 1,

		.flags	= IORESOURCE_MEM,

	}

};
@@ -313,7 +313,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
		return;



	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC);

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);



	/* set the bus interface characteristics */

	at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0)

arch/arm/mach-at91/at91sam9261_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
		return;



	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC);

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);



	/* set the bus interface characteristics */

	at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0)

arch/arm/mach-at91/at91sam9263_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ void __init at91_add_device_nand(struct at91_nand_data *data) 
		return;



	csa = at91_sys_read(AT91_MATRIX_EBI0CSA);

	at91_sys_write(AT91_MATRIX_EBI0CSA, csa | AT91_MATRIX_EBI0_CS3A_SMC);

	at91_sys_write(AT91_MATRIX_EBI0CSA, csa | AT91_MATRIX_EBI0_CS3A_SMC_SMARTMEDIA);



	/* set the bus interface characteristics */

	at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(0) | AT91_SMC_NCS_WRSETUP_(0)