diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 15:08:57 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-03 15:08:57 +0200 |
| commit | 76467874b83835129dc454e3a7a8e5d1186101b0 (patch) | |
| tree | 162129f0c36c35be4aa323cf00626db0e804c3fc /arch/arm/mach-at91rm9200/board-dk.c | |
| parent | [GFS2] Update GFS2 for the recent pull from Linus (diff) | |
| parent | Linux v2.6.17-rc1 (diff) | |
| download | linux-76467874b83835129dc454e3a7a8e5d1186101b0.tar.xz linux-76467874b83835129dc454e3a7a8e5d1186101b0.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-at91rm9200/board-dk.c')
| -rw-r--r-- | arch/arm/mach-at91rm9200/board-dk.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-at91rm9200/board-dk.c b/arch/arm/mach-at91rm9200/board-dk.c index 8a783368366e..2d7200ed66ed 100644 --- a/arch/arm/mach-at91rm9200/board-dk.c +++ b/arch/arm/mach-at91rm9200/board-dk.c @@ -70,6 +70,9 @@ static void __init dk_map_io(void) /* Initialize clocks: 18.432 MHz crystal */ at91_clock_init(18432000); + /* Setup the LEDs */ + at91_init_leds(AT91_PIN_PB2, AT91_PIN_PB2); + #ifdef CONFIG_SERIAL_AT91 at91_console_port = DK_SERIAL_CONSOLE; memcpy(at91_serial_map, serial, sizeof(serial)); @@ -118,9 +121,14 @@ static void __init dk_board_init(void) at91_add_device_udc(&dk_udc_data); /* Compact Flash */ at91_add_device_cf(&dk_cf_data); +#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD + /* DataFlash card */ + at91_set_gpio_output(AT91_PIN_PB7, 0); +#else /* MMC */ - at91_set_gpio_output(AT91_PIN_PB7, 1); /* this MMC card slot can optionally use SPI signaling (CS3). default: MMC */ + at91_set_gpio_output(AT91_PIN_PB7, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */ at91_add_device_mmc(&dk_mmc_data); +#endif /* VGA */ // dk_add_device_video(); } |