diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:49 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:49 +0100 |
commit | 0bf6b41cfa98a68b5c59c372bb5ab067b1e98449 (patch) | |
tree | 66266ef1e234ddb3f33816af571403906421de76 /arch/arm/mach-at91/at91rm9200_devices.c | |
parent | 8d094bcab0580595765e8ce216c4d23d3c6823e2 (diff) | |
parent | 630c4ecc5e0a9ddf533de260daa7b414b5c0d0b0 (diff) | |
download | barebox-0bf6b41cfa98a68b5c59c372bb5ab067b1e98449.tar.gz barebox-0bf6b41cfa98a68b5c59c372bb5ab067b1e98449.tar.xz |
Merge branch 'for-next/spi'
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91rm9200_devices.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index 1a2d0fdaba..a676436399 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -210,7 +210,12 @@ void at91_add_device_spi(int spi_id, struct at91_spi_platform_data *pdata) cs_pin = pdata->chipselect[i]; /* enable chip-select pin */ - if (cs_pin > 0) + if (!gpio_is_valid(cs_pin)) + continue; + + if (cs_pin == AT91_PIN_PA3) + at91_set_A_periph(cs_pin, 0); + else at91_set_gpio_output(cs_pin, 1); } |