Commit 050cbb09 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: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006
  avr32: add default configurations for ATNGW100 mkII and EVKLCD10X
  avr32: add support for ATNGW100 mkII board
  avr32: convert to asm-generic/hardirq.h
  avr32: add two new at91 to cpu.h definition
  avr32: clean up linker script using standard macros.
  avr32: MRMT: correct setup of SPI slaves
  avr32: function for independently setting up SPI slaves
  avr32: re-instate MCI WP/CD pin assignments for ATNGW100
parents 17c330f9 0386f9e6

arch/avr32/Kconfig

+11 −2
Original line number Diff line number Diff line
@@ -112,6 +112,11 @@ config CPU_AT32AP7002 
	bool

	select CPU_AT32AP700X



# AP700X boards

config BOARD_ATNGW100_COMMON

	bool

	select CPU_AT32AP7000



choice

	prompt "AVR32 board type"

	default BOARD_ATSTK1000
@@ -119,9 +124,13 @@ choice 
config BOARD_ATSTK1000

	bool "ATSTK1000 evaluation board"



config BOARD_ATNGW100

config BOARD_ATNGW100_MKI

	bool "ATNGW100 Network Gateway"

	select CPU_AT32AP7000

	select BOARD_ATNGW100_COMMON



config BOARD_ATNGW100_MKII

	bool "ATNGW100 mkII Network Gateway"

	select BOARD_ATNGW100_COMMON



config BOARD_HAMMERHEAD

	bool "Hammerhead board"

arch/avr32/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ head-$(CONFIG_LOADER_U_BOOT) += arch/avr32/boot/u-boot/head.o 
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_ATNGW100_COMMON)	+= 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_MERISC)		+= arch/avr32/boards/merisc/

arch/avr32/boards/atngw100/Kconfig

+16 −9
Original line number Diff line number Diff line 
# NGW100 customization



if BOARD_ATNGW100

if BOARD_ATNGW100_COMMON



config BOARD_ATNGW100_MKII_LCD

	bool "Enable ATNGW100 mkII LCD interface"

	depends on BOARD_ATNGW100_MKII

	help

	  This enables the LCD controller (LCDC) in the AT32AP7000. Since the

	  LCDC is multiplexed with MACB1 (LAN) Ethernet port, only one can be

	  enabled at a time.



	  This choice enables the LCDC and disables the MACB1 interface marked

	  LAN on the PCB.



choice

	prompt "Select an NGW100 add-on board to support"
@@ -11,15 +22,11 @@ config BOARD_ATNGW100_ADDON_NONE 


config BOARD_ATNGW100_EVKLCD10X

	bool "EVKLCD10X addon board"

	depends on BOARD_ATNGW100_MKI || BOARD_ATNGW100_MKII_LCD

	help

	  This enables support for the EVKLCD100 (QVGA) or EVKLCD101 (VGA)

	  addon board for the NGW100. By enabling this the LCD controller and

	  AC97 controller is added as platform devices.



	  This choice disables the detect pin and the write-protect pin for the

	  MCI platform device, since it conflicts with the LCD platform device.

	  The MCI pins can be reenabled by editing the "add device function" but

	  this may break the setup for other displays that use these pins.

	  addon board for the NGW100 and NGW100 mkII. By enabling this the LCD

	  controller and AC97 controller is added as platform devices.



config BOARD_ATNGW100_MRMT

	bool "Mediama RMT1/2 add-on board"
@@ -55,4 +62,4 @@ if BOARD_ATNGW100_MRMT 
source	"arch/avr32/boards/atngw100/Kconfig_mrmt"

endif



endif	# BOARD_ATNGW100
 
endif	# BOARD_ATNGW100_COMMON

arch/avr32/boards/atngw100/evklcd10x.c

+6 −1
Original line number Diff line number Diff line
@@ -164,7 +164,12 @@ static int __init atevklcd10x_init(void) 


	at32_add_device_lcdc(0, &atevklcd10x_lcdc_data,

			fbmem_start, fbmem_size,

			ATMEL_LCDC_ALT_18BIT | ATMEL_LCDC_PE_DVAL);

#ifdef CONFIG_BOARD_ATNGW100_MKII

			ATMEL_LCDC_PRI_18BIT | ATMEL_LCDC_PC_DVAL

#else

			ATMEL_LCDC_ALT_18BIT | ATMEL_LCDC_PE_DVAL

#endif

			);



	at32_add_device_ac97c(0, &ac97c0_data, AC97C_BOTH);

arch/avr32/boards/atngw100/mrmt.c

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ static int __init mrmt1_init(void) 
	at32_select_periph( GPIO_PIOB_BASE, 1 << (PB_EXTINT_BASE+TS_IRQ),

			GPIO_PERIPH_A, AT32_GPIOF_DEGLITCH);

	set_irq_type( AT32_EXTINT(TS_IRQ), IRQ_TYPE_EDGE_FALLING );

	at32_spi_setup_slaves(0,spi01_board_info,ARRAY_SIZE(spi01_board_info));

	spi_register_board_info(spi01_board_info,ARRAY_SIZE(spi01_board_info));

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE