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

Commit bc08969f authored by Haavard Skinnemoen's avatar Haavard Skinnemoen
Browse files

Merge branch 'cleanups' into boards

parents 4a6908a3 adde42b5

arch/avr32/boards/atstk1000/atstk1002.c

+1 −17
Original line number Diff line number Diff line
@@ -287,23 +287,7 @@ static int __init atstk1002_init(void) 
	 * ATSTK1000 uses 32-bit SDRAM interface. Reserve the

	 * SDRAM-specific pins so that nobody messes with them.

	 */

	at32_reserve_pin(GPIO_PIN_PE(0));	/* DATA[16]	*/

	at32_reserve_pin(GPIO_PIN_PE(1));	/* DATA[17]	*/

	at32_reserve_pin(GPIO_PIN_PE(2));	/* DATA[18]	*/

	at32_reserve_pin(GPIO_PIN_PE(3));	/* DATA[19]	*/

	at32_reserve_pin(GPIO_PIN_PE(4));	/* DATA[20]	*/

	at32_reserve_pin(GPIO_PIN_PE(5));	/* DATA[21]	*/

	at32_reserve_pin(GPIO_PIN_PE(6));	/* DATA[22]	*/

	at32_reserve_pin(GPIO_PIN_PE(7));	/* DATA[23]	*/

	at32_reserve_pin(GPIO_PIN_PE(8));	/* DATA[24]	*/

	at32_reserve_pin(GPIO_PIN_PE(9));	/* DATA[25]	*/

	at32_reserve_pin(GPIO_PIN_PE(10));	/* DATA[26]	*/

	at32_reserve_pin(GPIO_PIN_PE(11));	/* DATA[27]	*/

	at32_reserve_pin(GPIO_PIN_PE(12));	/* DATA[28]	*/

	at32_reserve_pin(GPIO_PIN_PE(13));	/* DATA[29]	*/

	at32_reserve_pin(GPIO_PIN_PE(14));	/* DATA[30]	*/

	at32_reserve_pin(GPIO_PIN_PE(15));	/* DATA[31]	*/

	at32_reserve_pin(GPIO_PIN_PE(26));	/* SDCS		*/

	at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);



#ifdef CONFIG_BOARD_ATSTK1006

	smc_set_timing(&nand_config, &nand_timing);

arch/avr32/boards/atstk1000/atstk1003.c

+1 −17
Original line number Diff line number Diff line
@@ -131,23 +131,7 @@ static int __init atstk1003_init(void) 
	 * ATSTK1000 uses 32-bit SDRAM interface. Reserve the

	 * SDRAM-specific pins so that nobody messes with them.

	 */

	at32_reserve_pin(GPIO_PIN_PE(0));	/* DATA[16]	*/

	at32_reserve_pin(GPIO_PIN_PE(1));	/* DATA[17]	*/

	at32_reserve_pin(GPIO_PIN_PE(2));	/* DATA[18]	*/

	at32_reserve_pin(GPIO_PIN_PE(3));	/* DATA[19]	*/

	at32_reserve_pin(GPIO_PIN_PE(4));	/* DATA[20]	*/

	at32_reserve_pin(GPIO_PIN_PE(5));	/* DATA[21]	*/

	at32_reserve_pin(GPIO_PIN_PE(6));	/* DATA[22]	*/

	at32_reserve_pin(GPIO_PIN_PE(7));	/* DATA[23]	*/

	at32_reserve_pin(GPIO_PIN_PE(8));	/* DATA[24]	*/

	at32_reserve_pin(GPIO_PIN_PE(9));	/* DATA[25]	*/

	at32_reserve_pin(GPIO_PIN_PE(10));	/* DATA[26]	*/

	at32_reserve_pin(GPIO_PIN_PE(11));	/* DATA[27]	*/

	at32_reserve_pin(GPIO_PIN_PE(12));	/* DATA[28]	*/

	at32_reserve_pin(GPIO_PIN_PE(13));	/* DATA[29]	*/

	at32_reserve_pin(GPIO_PIN_PE(14));	/* DATA[30]	*/

	at32_reserve_pin(GPIO_PIN_PE(15));	/* DATA[31]	*/

	at32_reserve_pin(GPIO_PIN_PE(26));	/* SDCS		*/

	at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);



#ifdef	CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_add_device_usart(1);

arch/avr32/boards/favr-32/setup.c

+1 −19
Original line number Diff line number Diff line
@@ -307,28 +307,10 @@ static int __init favr32_init(void) 
	 * Favr-32 uses 32-bit SDRAM interface. Reserve the SDRAM-specific

	 * pins so that nobody messes with them.

	 */

	at32_reserve_pin(GPIO_PIN_PE(0));	/* DATA[16]	*/

	at32_reserve_pin(GPIO_PIN_PE(1));	/* DATA[17]	*/

	at32_reserve_pin(GPIO_PIN_PE(2));	/* DATA[18]	*/

	at32_reserve_pin(GPIO_PIN_PE(3));	/* DATA[19]	*/

	at32_reserve_pin(GPIO_PIN_PE(4));	/* DATA[20]	*/

	at32_reserve_pin(GPIO_PIN_PE(5));	/* DATA[21]	*/

	at32_reserve_pin(GPIO_PIN_PE(6));	/* DATA[22]	*/

	at32_reserve_pin(GPIO_PIN_PE(7));	/* DATA[23]	*/

	at32_reserve_pin(GPIO_PIN_PE(8));	/* DATA[24]	*/

	at32_reserve_pin(GPIO_PIN_PE(9));	/* DATA[25]	*/

	at32_reserve_pin(GPIO_PIN_PE(10));	/* DATA[26]	*/

	at32_reserve_pin(GPIO_PIN_PE(11));	/* DATA[27]	*/

	at32_reserve_pin(GPIO_PIN_PE(12));	/* DATA[28]	*/

	at32_reserve_pin(GPIO_PIN_PE(13));	/* DATA[29]	*/

	at32_reserve_pin(GPIO_PIN_PE(14));	/* DATA[30]	*/

	at32_reserve_pin(GPIO_PIN_PE(15));	/* DATA[31]	*/

	at32_reserve_pin(GPIO_PIN_PE(26));	/* SDCS		*/

	at32_reserve_pin(GPIO_PIOE_BASE, ATMEL_EBI_PE_DATA_ALL);



	at32_select_gpio(GPIO_PIN_PB(3), 0);	/* IRQ from ADS7843 */



	at32_add_system_devices();



	at32_add_device_usart(0);



	set_hw_addr(at32_add_device_eth(0, &eth_data[0]));

arch/avr32/boards/mimc200/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -207,8 +207,6 @@ static int __init mimc200_init(void) 
	 * reserve any pins for it.

	 */



	at32_add_system_devices();



	at32_add_device_usart(0);

	at32_add_device_usart(1);

	at32_add_device_usart(2);

arch/avr32/kernel/process.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <asm/sysreg.h>

#include <asm/ocd.h>

#include <asm/syscalls.h>



#include <mach/pm.h>