Commit 1137ceee authored by Janusz Krzysztofik's avatar Janusz Krzysztofik Committed by Tony Lindgren

ARM: OMAP1: ams-delta: Don't request unused GPIOs

GPIOs with no kernel drivers can still be used from user space, don't
request them from the board file.
Signed-off-by: default avatarJanusz Krzysztofik <jmkrzyszt@gmail.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 26683316
...@@ -250,39 +250,6 @@ static struct platform_device latch2_gpio_device = { ...@@ -250,39 +250,6 @@ static struct platform_device latch2_gpio_device = {
#define LATCH2_PIN_HOOKFLASH1 14 #define LATCH2_PIN_HOOKFLASH1 14
#define LATCH2_PIN_HOOKFLASH2 15 #define LATCH2_PIN_HOOKFLASH2 15
static const struct gpio latch_gpios[] __initconst = {
{
.gpio = LATCH1_GPIO_BASE + 6,
.flags = GPIOF_OUT_INIT_LOW,
.label = "dockit1",
},
{
.gpio = LATCH1_GPIO_BASE + 7,
.flags = GPIOF_OUT_INIT_LOW,
.label = "dockit2",
},
{
.gpio = AMS_DELTA_GPIO_PIN_SCARD_RSTIN,
.flags = GPIOF_OUT_INIT_LOW,
.label = "scard_rstin",
},
{
.gpio = AMS_DELTA_GPIO_PIN_SCARD_CMDVCC,
.flags = GPIOF_OUT_INIT_LOW,
.label = "scard_cmdvcc",
},
{
.gpio = AMS_DELTA_LATCH2_GPIO_BASE + 14,
.flags = GPIOF_OUT_INIT_LOW,
.label = "hookflash1",
},
{
.gpio = AMS_DELTA_LATCH2_GPIO_BASE + 15,
.flags = GPIOF_OUT_INIT_LOW,
.label = "hookflash2",
},
};
static struct regulator_consumer_supply modem_nreset_consumers[] = { static struct regulator_consumer_supply modem_nreset_consumers[] = {
REGULATOR_SUPPLY("RESET#", "serial8250.1"), REGULATOR_SUPPLY("RESET#", "serial8250.1"),
REGULATOR_SUPPLY("POR", "cx20442-codec"), REGULATOR_SUPPLY("POR", "cx20442-codec"),
...@@ -862,7 +829,6 @@ static void __init ams_delta_led_init(struct gpio_chip *chip) ...@@ -862,7 +829,6 @@ static void __init ams_delta_led_init(struct gpio_chip *chip)
static int __init ams_delta_gpio_init(void) static int __init ams_delta_gpio_init(void)
{ {
struct gpio_chip *chip; struct gpio_chip *chip;
int err;
if (!machine_is_ams_delta()) if (!machine_is_ams_delta())
return -ENODEV; return -ENODEV;
...@@ -873,11 +839,7 @@ static int __init ams_delta_gpio_init(void) ...@@ -873,11 +839,7 @@ static int __init ams_delta_gpio_init(void)
else else
ams_delta_led_init(chip); ams_delta_led_init(chip);
err = gpio_request_array(latch_gpios, ARRAY_SIZE(latch_gpios)); return 0;
if (err)
pr_err("Couldn't take over latch1/latch2 GPIO pins\n");
return err;
} }
device_initcall_sync(ams_delta_gpio_init); device_initcall_sync(ams_delta_gpio_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment