diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-04 22:15:46 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-04 22:15:46 +0200 |
| commit | 5f58f8d20f97deaf4dde7eb3886efa3e5a3715ee (patch) | |
| tree | 0e748004387ad33d791977718a100f090b59a5c6 /cpu/arm926ejs/at91/at91sam9260_spi.c | |
| parent | 66932ac3929c7a145a6ef6574a96fd7535154951 (diff) | |
| parent | 03bab0091948196b9558248684c04f60943ca4b5 (diff) | |
| download | olio-uboot-2014.01-5f58f8d20f97deaf4dde7eb3886efa3e5a3715ee.tar.xz olio-uboot-2014.01-5f58f8d20f97deaf4dde7eb3886efa3e5a3715ee.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-at91
Diffstat (limited to 'cpu/arm926ejs/at91/at91sam9260_spi.c')
| -rw-r--r-- | cpu/arm926ejs/at91/at91sam9260_spi.c | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/cpu/arm926ejs/at91/at91sam9260_spi.c b/cpu/arm926ejs/at91/at91sam9260_spi.c index 0105072da..d6fd80ea7 100644 --- a/cpu/arm926ejs/at91/at91sam9260_spi.c +++ b/cpu/arm926ejs/at91/at91sam9260_spi.c @@ -38,15 +38,27 @@ void at91_spi0_hw_init(unsigned long cs_mask) at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI0); if (cs_mask & (1 << 0)) { - at91_set_gpio_output(AT91_PIN_PA3, 1); + at91_set_A_periph(AT91_PIN_PA3, 1); } if (cs_mask & (1 << 1)) { - at91_set_gpio_output(AT91_PIN_PC11, 1); + at91_set_B_periph(AT91_PIN_PC11, 1); } if (cs_mask & (1 << 2)) { - at91_set_gpio_output(AT91_PIN_PC16, 1); + at91_set_B_periph(AT91_PIN_PC16, 1); } if (cs_mask & (1 << 3)) { + at91_set_B_periph(AT91_PIN_PC17, 1); + } + if (cs_mask & (1 << 4)) { + at91_set_gpio_output(AT91_PIN_PA3, 1); + } + if (cs_mask & (1 << 5)) { + at91_set_gpio_output(AT91_PIN_PC11, 1); + } + if (cs_mask & (1 << 6)) { + at91_set_gpio_output(AT91_PIN_PC16, 1); + } + if (cs_mask & (1 << 7)) { at91_set_gpio_output(AT91_PIN_PC17, 1); } } @@ -61,15 +73,27 @@ void at91_spi1_hw_init(unsigned long cs_mask) at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_SPI1); if (cs_mask & (1 << 0)) { - at91_set_gpio_output(AT91_PIN_PB3, 1); + at91_set_A_periph(AT91_PIN_PB3, 1); } if (cs_mask & (1 << 1)) { - at91_set_gpio_output(AT91_PIN_PC5, 1); + at91_set_B_periph(AT91_PIN_PC5, 1); } if (cs_mask & (1 << 2)) { - at91_set_gpio_output(AT91_PIN_PC4, 1); + at91_set_B_periph(AT91_PIN_PC4, 1); } if (cs_mask & (1 << 3)) { at91_set_gpio_output(AT91_PIN_PC3, 1); } + if (cs_mask & (1 << 4)) { + at91_set_gpio_output(AT91_PIN_PB3, 1); + } + if (cs_mask & (1 << 5)) { + at91_set_gpio_output(AT91_PIN_PC5, 1); + } + if (cs_mask & (1 << 6)) { + at91_set_gpio_output(AT91_PIN_PC4, 1); + } + if (cs_mask & (1 << 7)) { + at91_set_gpio_output(AT91_PIN_PC3, 1); + } } |