diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:01:00 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 09:01:00 -0800 |
commit | 050cbb09dac0402672edeaeac06094ef8ff1749a (patch) | |
tree | 89cbe4ac48e8e8f80ff5849e2cc33f045f5ccd52 /arch/avr32/boards/atngw100/mrmt.c | |
parent | 17c330f98383629cfd359ee62b3adde1d2a3ff7c (diff) | |
parent | 0386f9e68fc92a3650088b86d908b07de4fb1744 (diff) | |
download | linux-050cbb09dac0402672edeaeac06094ef8ff1749a.tar.gz linux-050cbb09dac0402672edeaeac06094ef8ff1749a.tar.xz |
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
Diffstat (limited to 'arch/avr32/boards/atngw100/mrmt.c')
-rw-r--r-- | arch/avr32/boards/atngw100/mrmt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/avr32/boards/atngw100/mrmt.c b/arch/avr32/boards/atngw100/mrmt.c index bf78e516a85f..7919be311f4a 100644 --- a/arch/avr32/boards/atngw100/mrmt.c +++ b/arch/avr32/boards/atngw100/mrmt.c @@ -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 |