diff options
Diffstat (limited to 'arch/arm/mach-sa1100/simpad.c')
| -rw-r--r-- | arch/arm/mach-sa1100/simpad.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index 7d4feb8a49ac..406487e76a5c 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c @@ -4,6 +4,7 @@ */ #include <linux/module.h> +#include <linux/gpio/machine.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/tty.h> @@ -36,7 +37,7 @@ #include <linux/input.h> #include <linux/gpio_keys.h> #include <linux/leds.h> -#include <linux/i2c-gpio.h> +#include <linux/platform_data/i2c-gpio.h> #include "generic.h" @@ -326,7 +327,7 @@ static struct platform_device simpad_gpio_leds = { * i2c */ static struct gpiod_lookup_table simpad_i2c_gpiod_table = { - .dev_id = "i2c-gpio", + .dev_id = "i2c-gpio.0", .table = { GPIO_LOOKUP_IDX("gpio", 21, NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN), @@ -364,6 +365,15 @@ static struct platform_device *devices[] __initdata = { &simpad_i2c, }; +/* Compact Flash */ +static struct gpiod_lookup_table simpad_cf_gpio_table = { + .dev_id = "sa11x0-pcmcia", + .table = { + GPIO_LOOKUP("gpio", GPIO_CF_IRQ, "cf-ready", GPIO_ACTIVE_HIGH), + GPIO_LOOKUP("gpio", GPIO_CF_CD, "cf-detect", GPIO_ACTIVE_HIGH), + { }, + }, +}; static int __init simpad_init(void) @@ -385,6 +395,7 @@ static int __init simpad_init(void) pm_power_off = simpad_power_off; + sa11x0_register_pcmcia(-1, &simpad_cf_gpio_table); sa11x0_ppc_configure_mcp(); sa11x0_register_mtd(&simpad_flash_data, simpad_flash_resources, ARRAY_SIZE(simpad_flash_resources)); |