diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
| commit | 88107f6e121a3a1835aa261a39a0a284e06457ce (patch) | |
| tree | b8f7a1618c29215aa3bfa0c24fe99bdffb4da650 /arch/arm/mach-at91 | |
| parent | ae982001331215adb009cc93701401623b2a94d7 (diff) | |
| parent | 0d98114eb218aa80379b82192499e4c91d64123c (diff) | |
| download | barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.gz barebox-88107f6e121a3a1835aa261a39a0a284e06457ce.tar.xz | |
Merge branch 'for-next/randconfig'
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200_devices.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9261_devices.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/gpio.h | 9 |
3 files changed, 5 insertions, 13 deletions
diff --git a/arch/arm/mach-at91/at91rm9200_devices.c b/arch/arm/mach-at91/at91rm9200_devices.c index d5268dd8b9..8cb2f57751 100644 --- a/arch/arm/mach-at91/at91rm9200_devices.c +++ b/arch/arm/mach-at91/at91rm9200_devices.c @@ -17,6 +17,7 @@ #include <mach/board.h> #include <mach/gpio.h> #include <mach/io.h> +#include <mach/at91rm9200_mc.h> #include <sizes.h> #include "generic.h" @@ -158,7 +159,7 @@ void __init at91_add_device_nand(struct atmel_nand_data *data) {} * -------------------------------------------------------------------- */ #if defined(CONFIG_DRIVER_SPI_ATMEL) -static const unsigned spi_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 }; +static unsigned spi_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 }; static struct at91_spi_platform_data spi_pdata[] = { [0] = { diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c index 41eeeaec51..a109804139 100644 --- a/arch/arm/mach-at91/at91sam9261_devices.c +++ b/arch/arm/mach-at91/at91sam9261_devices.c @@ -107,9 +107,9 @@ void at91_add_device_nand(struct atmel_nand_data *data) {} * -------------------------------------------------------------------- */ #if defined(CONFIG_DRIVER_SPI_ATMEL) -static const unsigned spi0_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 }; +static unsigned spi0_standard_cs[4] = { AT91_PIN_PA3, AT91_PIN_PA4, AT91_PIN_PA5, AT91_PIN_PA6 }; -static const unsigned spi1_standard_cs[4] = { AT91_PIN_PB28, AT91_PIN_PA24, AT91_PIN_PA25, AT91_PIN_PA26 }; +static unsigned spi1_standard_cs[4] = { AT91_PIN_PB28, AT91_PIN_PA24, AT91_PIN_PA25, AT91_PIN_PA26 }; static struct at91_spi_platform_data spi_pdata[] = { [0] = { @@ -150,7 +150,7 @@ void at91_add_device_spi(int spi_id, struct at91_spi_platform_data *pdata) at91_set_A_periph(AT91_PIN_PA2, 0); /* SPI0_SPCK */ break; case 1: - start = AT91SAM9213_BASE_SPI1; + start = AT91SAM9261_BASE_SPI1; at91_set_A_periph(AT91_PIN_PB30, 0); /* SPI1_MISO */ at91_set_A_periph(AT91_PIN_PB31, 0); /* SPI1_MOSI */ at91_set_A_periph(AT91_PIN_PB29, 0); /* SPI1_SPCK */ diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h index 0f93f8de05..3533bf9e3f 100644 --- a/arch/arm/mach-at91/include/mach/gpio.h +++ b/arch/arm/mach-at91/include/mach/gpio.h @@ -248,15 +248,6 @@ struct at91_gpio_bank { extern int at91_gpio_init(struct at91_gpio_bank *data, int nr_banks); -static inline int gpio_request(unsigned gpio, const char *label) -{ - return 0; -} - -static inline void gpio_free(unsigned gpio) -{ -} - extern int gpio_direction_input(unsigned gpio); extern int gpio_direction_output(unsigned gpio, int value); #define gpio_get_value at91_get_gpio_value |