diff options
Diffstat (limited to 'include/asm-arm')
| -rwxr-xr-x | include/asm-arm/arch-stw8500/gpio.h | 12 | ||||
| -rw-r--r-- | include/asm-arm/arch-stw8500/hardware.h | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/asm-arm/arch-stw8500/gpio.h b/include/asm-arm/arch-stw8500/gpio.h index be53c4c1f..24f3c6ee6 100755 --- a/include/asm-arm/arch-stw8500/gpio.h +++ b/include/asm-arm/arch-stw8500/gpio.h @@ -375,6 +375,8 @@ typedef enum { GPIO_ALT_UART_2, GPIO_ALT_I2C_0, GPIO_ALT_I2C_1, + GPIO_ALT_I2C_2, + GPIO_ALT_I2C_3, GPIO_ALT_MSP_0, GPIO_ALT_MSP_1, GPIO_ALT_MSP_2, @@ -421,9 +423,11 @@ typedef enum { GPIO_ALT_CAM, GPIO_ALT_CCP1, GPIO_ALT_EMMC, -#ifdef CONFIG_NOMADIK_8500_V1 GPIO_ALT_POP_EMMC, -#endif + GPIO_ALT_SPI_0, + GPIO_ALT_SPI_1, + GPIO_ALT_SPI_2, + GPIO_ALT_SPI_3, GPIO_ALT_FUNMAX /* Add new alt func before this */ } gpio_alt_function; @@ -503,8 +507,8 @@ typedef struct { * refer ./Documentation/arm/STM-Nomadik/gpio_user_guide.txt *----------------------------------------------------------------------*/ -extern int gpio_setpinconfig(gpio_pin pin_id, gpio_config * pin_config); -extern int gpio_resetpinconfig(gpio_pin pin_id, char *dev_name); +extern gpio_error gpio_setpinconfig(gpio_pin pin_id, gpio_config * pin_config); +extern gpio_error gpio_resetpinconfig(gpio_pin pin_id, char *dev_name); extern int gpio_writepin(gpio_pin pin_id, gpio_data value, char *dev_name); extern int gpio_readpin(gpio_pin pin_id, gpio_data * value); extern int gpio_altfuncenable(gpio_alt_function altfunc, diff --git a/include/asm-arm/arch-stw8500/hardware.h b/include/asm-arm/arch-stw8500/hardware.h index 777a50c3b..df55a841d 100644 --- a/include/asm-arm/arch-stw8500/hardware.h +++ b/include/asm-arm/arch-stw8500/hardware.h @@ -72,11 +72,15 @@ #define U8500_CLKRST3_BASE (U8500_PER3_BASE + 0xf000) /* Per2 */ +#define U8500_SPI2_BASE (U8500_PER2_BASE + 0x1000) +#define U8500_SPI1_BASE (U8500_PER2_BASE + 0x2000) +#define U8500_SPI0_BASE (U8500_PER2_BASE + 0xa000) #define U8500_CLKRST2_BASE (U8500_PER2_BASE + 0xf000) /* Per1 */ #define U8500_UART0_BASE (U8500_PER1_BASE + 0x0000) #define U8500_UART1_BASE (U8500_PER1_BASE + 0x1000) +#define U8500_SPI3_BASE (U8500_PER2_BASE + 0x9000) #define U8500_CLKRST1_BASE (U8500_PER1_BASE + 0xf000) #define U8500_BOOTROM_BASE 0x90000000 |