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

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

[ARM] 5288/1: [AT91] Remove SMC configuration from devices.c files 



In at91_add_device_nand(), do not configure the Static Memory
controller with specific timing values.
The *_devices.c files are board independent, and the SMC timing values
are specific to the NAND devices that are installed on the board.
The board-specific files are now responsible for configuring the
Static Memory controller (if the don't want to leave it up to a
bootloader).

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

arch/arm/mach-at91/at91cap9_devices.c

+2 −17
Original line number Diff line number Diff line
@@ -406,28 +406,13 @@ static struct platform_device at91cap9_nand_device = { 


void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;

	unsigned long csa;



	if (!data)

		return;



	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA | AT91_MATRIX_EBI_VDDIOMSEL_3_3V);



	/* set the bus interface characteristics */

	at91_sys_write(AT91_SMC_SETUP(3), AT91_SMC_NWESETUP_(2) | AT91_SMC_NCS_WRSETUP_(1)

			| AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(1));



	at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(6)

			| AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(6));



	at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(8) | AT91_SMC_NRDCYCLE_(8));



	if (data->bus_width_16)

		mode = AT91_SMC_DBW_16;

	else

		mode = AT91_SMC_DBW_8;

	at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(1));

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA);



	/* enable pin */

	if (data->enable_pin)

arch/arm/mach-at91/at91sam9260_devices.c

+1 −37
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static struct platform_device at91sam9260_nand_device = { 


void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;

	unsigned long csa;



	if (!data)

		return;
@@ -321,42 +321,6 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) 
	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	at91_sys_write(AT91_MATRIX_EBICSA, csa | AT91_MATRIX_CS3A_SMC_SMARTMEDIA);



	if (cpu_is_at91sam9260()) {

		/* Timing for sam9260 */

		/* set the bus interface characteristics */

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

				| AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0));



		at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3)

				| AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3));



		at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5));



		if (data->bus_width_16)

			mode = AT91_SMC_DBW_16;

		else

			mode = AT91_SMC_DBW_8;

		at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2));

	}



	if (cpu_is_at91sam9g20()) {

		/* Timing for sam9g20 */

		/* set the bus interface characteristics */

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

				| AT91_SMC_NRDSETUP_(2) | AT91_SMC_NCS_RDSETUP_(0));



		at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(4) | AT91_SMC_NCS_WRPULSE_(4)

				| AT91_SMC_NRDPULSE_(4) | AT91_SMC_NCS_RDPULSE_(4));



		at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(7) | AT91_SMC_NRDCYCLE_(7));



		if (data->bus_width_16)

			mode = AT91_SMC_DBW_16;

		else

			mode = AT91_SMC_DBW_8;

		at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(3));

	}



	/* enable pin */

	if (data->enable_pin)

		at91_set_gpio_output(data->enable_pin, 1);

arch/arm/mach-at91/at91sam9261_devices.c

+1 −16
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static struct platform_device atmel_nand_device = { 


void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;

	unsigned long csa;



	if (!data)

		return;
@@ -231,21 +231,6 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) 
	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	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_(1) | AT91_SMC_NCS_WRSETUP_(0)

			| AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0));



	at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3)

			| AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3));



	at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5));



	if (data->bus_width_16)

		mode = AT91_SMC_DBW_16;

	else

		mode = AT91_SMC_DBW_8;

	at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2));



	/* enable pin */

	if (data->enable_pin)

		at91_set_gpio_output(data->enable_pin, 1);

arch/arm/mach-at91/at91sam9263_devices.c

+1 −16
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static struct platform_device at91sam9263_nand_device = { 


void __init at91_add_device_nand(struct atmel_nand_data *data)

{

	unsigned long csa, mode;

	unsigned long csa;



	if (!data)

		return;
@@ -390,21 +390,6 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) 
	csa = at91_sys_read(AT91_MATRIX_EBI0CSA);

	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_(1) | AT91_SMC_NCS_WRSETUP_(0)

			| AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0));



	at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3)

			| AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3));



	at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5));



	if (data->bus_width_16)

		mode = AT91_SMC_DBW_16;

	else

		mode = AT91_SMC_DBW_8;

	at91_sys_write(AT91_SMC_MODE(3), mode | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2));



	/* enable pin */

	if (data->enable_pin)

		at91_set_gpio_output(data->enable_pin, 1);

arch/arm/mach-at91/at91sam9rl_devices.c

+0 −11
Original line number Diff line number Diff line
@@ -232,17 +232,6 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) 
	csa = at91_sys_read(AT91_MATRIX_EBICSA);

	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_(1) | AT91_SMC_NCS_WRSETUP_(0)

			| AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0));



	at91_sys_write(AT91_SMC_PULSE(3), AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3)

			| AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3));



	at91_sys_write(AT91_SMC_CYCLE(3), AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5));



	at91_sys_write(AT91_SMC_MODE(3), AT91_SMC_DBW_8 | AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_TDF_(2));



	/* enable pin */

	if (data->enable_pin)

		at91_set_gpio_output(data->enable_pin, 1);