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

Commit 08249903 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: Move syscalls.h under arch/avr32/include/asm/
  avr32: Define DIE_OOPS
  avr32: Remove DMATEST from defconfigs
  arch/avr32: Eliminate NULL test and memset after alloc_bootmem
  avr32: data param to at32_add_device_mci() must be non-NULL
  atmel-mci: move atmel-mci.h file to include/linux
  avr32: Hammerhead board support
  avr32: Allow reserving multiple pins at once
  favr-32: Remove deprecated call
  MIMC200: Remove deprecated call
  avr: struct device - replace bus_id with dev_name(), dev_set_name()
  avr32: Introducing asm/syscalls.h
parents 0d6326a1 183b3af6

arch/avr32/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -122,6 +122,24 @@ config BOARD_ATNGW100 
	bool "ATNGW100 Network Gateway"

	select CPU_AT32AP7000



config BOARD_HAMMERHEAD

	bool "Hammerhead board"

	select CPU_AT32AP7000

	select USB_ARCH_HAS_HCD

	help

	  The Hammerhead platform is built around a AVR32 32-bit microcontroller from Atmel.

	  It offers versatile peripherals, such as ethernet, usb device, usb host etc.



	  The board also incooperates a power supply and is a Power over Ethernet (PoE) Powered

	  Device (PD).



	  Additonally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is

	  mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which

	  will cover even the most exceptional need of memory bandwidth. Together with the onboard

	  video decoder the board is ready for video processing.



	  For more information see: http://www.miromico.com/hammerhead



config BOARD_FAVR_32

	bool "Favr-32 LCD-board"

	select CPU_AT32AP7000
@@ -133,6 +151,7 @@ endchoice 


source "arch/avr32/boards/atstk1000/Kconfig"

source "arch/avr32/boards/atngw100/Kconfig"

source "arch/avr32/boards/hammerhead/Kconfig"

source "arch/avr32/boards/favr-32/Kconfig"



choice

arch/avr32/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ head-y += arch/avr32/kernel/head.o 
core-y					+= $(machdirs)

core-$(CONFIG_BOARD_ATSTK1000)		+= arch/avr32/boards/atstk1000/

core-$(CONFIG_BOARD_ATNGW100)		+= arch/avr32/boards/atngw100/

core-$(CONFIG_BOARD_HAMMERHEAD)		+= arch/avr32/boards/hammerhead/

core-$(CONFIG_BOARD_FAVR_32)		+= arch/avr32/boards/favr-32/

core-$(CONFIG_BOARD_MIMC200)		+= arch/avr32/boards/mimc200/

core-$(CONFIG_LOADER_U_BOOT)		+= arch/avr32/boot/u-boot/

arch/avr32/boards/atngw100/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
#include <linux/types.h>

#include <linux/leds.h>

#include <linux/spi/spi.h>

#include <linux/atmel-mci.h>



#include <asm/atmel-mci.h>

#include <asm/io.h>

#include <asm/setup.h>

arch/avr32/boards/atstk1000/atstk1002.c

+2 −18
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 
#include <linux/types.h>

#include <linux/spi/spi.h>

#include <linux/spi/at73c213.h>

#include <linux/atmel-mci.h>



#include <video/atmel_lcdc.h>



#include <asm/io.h>

#include <asm/setup.h>

#include <asm/atmel-mci.h>



#include <mach/at32ap700x.h>

#include <mach/board.h>
@@ -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

+2 −18
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 


#include <linux/spi/at73c213.h>

#include <linux/spi/spi.h>

#include <linux/atmel-mci.h>



#include <asm/setup.h>

#include <asm/atmel-mci.h>



#include <mach/at32ap700x.h>

#include <mach/board.h>
@@ -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);