diff options
| author | Kalle Vahlman <kalle.vahlman@movial.com> | 2012-01-23 14:50:30 +0200 |
|---|---|---|
| committer | Kalle Vahlman <kalle.vahlman@movial.com> | 2012-02-17 10:46:03 +0200 |
| commit | cb0e1ea44ae3a166357265edaaee273a91331a1e (patch) | |
| tree | 7c626f1274c418276d897c6172b7e77d499c377a /arch/arm/mach-ux500/board-mop500.c | |
| parent | 70d89b97afcbb911c21a0fb6ac2c8130dd87e9ae (diff) | |
Various kernel changes for ISP1763 driver
Original changes from ST-Ericsson, modified by Calao.
Needs serious cleanup.
Diffstat (limited to 'arch/arm/mach-ux500/board-mop500.c')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 4420adf0bd9..cf75610cfb7 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -125,9 +125,9 @@ static struct ab8500_gpio_platform_data ab8500_gpio_pdata = { .config_reg = {0x0F, 0x9E, 0x80, 0x01, 0x78, 0x02, 0x00}, /* config_direction allows for the initial GPIO direction to - * be set. For Snowball we set GPIO26 to output. + * be set. For Snowball we set GPIO2, GPIO4, GPIO26, GPIO40 to output. */ - .config_direction = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00}, + .config_direction = {0x0A, 0x00, 0x00, 0x02, 0x80, 0x00}, /* * config_pullups allows for the intial configuration of the @@ -165,6 +165,7 @@ static struct gpio_keys_button snowball_key_array[] = { .debounce_interval = 50, .wakeup = 1, }, +/* { .gpio = SNOWBALL_J1_PIN_8_GPIO, .type = EV_KEY, @@ -192,6 +193,7 @@ static struct gpio_keys_button snowball_key_array[] = { .debounce_interval = 50, .wakeup = 1, }, +*/ }; static struct gpio_keys_platform_data snowball_key_data = { |