diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-07 22:22:05 +0200 |
| commit | a48ecc969f8d2d0fe9167962e9b8b4cca52de10b (patch) | |
| tree | 604e04770713cb314cb6184e26eeb4319dec3d43 /cpu/arm926ejs/at91/at91cap9_devices.c | |
| parent | bec9cab9291bb221714d559a44fe37669a8ca604 (diff) | |
| parent | ceb70b466e75ceb1a621b6163f7e31116bfc8094 (diff) | |
| download | u-boot-imx-a48ecc969f8d2d0fe9167962e9b8b4cca52de10b.zip u-boot-imx-a48ecc969f8d2d0fe9167962e9b8b4cca52de10b.tar.gz u-boot-imx-a48ecc969f8d2d0fe9167962e9b8b4cca52de10b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
drivers/spi/Makefile
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu/arm926ejs/at91/at91cap9_devices.c')
| -rw-r--r-- | cpu/arm926ejs/at91/at91cap9_devices.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/cpu/arm926ejs/at91/at91cap9_devices.c b/cpu/arm926ejs/at91/at91cap9_devices.c index c0024ac..39e405f 100644 --- a/cpu/arm926ejs/at91/at91cap9_devices.c +++ b/cpu/arm926ejs/at91/at91cap9_devices.c @@ -3,6 +3,10 @@ * Stelian Pop <stelian.pop@leadtechdesign.com> * Lead Tech Design <www.leadtechdesign.com> * + * (C) Copyright 2009 + * Daniel Gorsulowski <daniel.gorsulowski@esd.eu> + * esd electronic system design gmbh <www.esd.eu> + * * See file CREDITS for list of people who contributed to this * project. * @@ -174,3 +178,14 @@ void at91_macb_hw_init(void) #endif } #endif + +#ifdef CONFIG_AT91_CAN +void at91_can_hw_init(void) +{ + at91_set_A_periph(AT91_PIN_PA12, 0); /* CAN_TX */ + at91_set_A_periph(AT91_PIN_PA13, 1); /* CAN_RX */ + + /* Enable clock */ + at91_sys_write(AT91_PMC_PCER, 1 << AT91CAP9_ID_CAN); +} +#endif |