Don't use Amstrad Delta custom I/O functions for setting up modem related pins, use GPIO API instead. However, keep old pin definitions used by ams_delta_latch2_write() for now, as those are still used by the Amstrad Delta ASoC driver.
While being at it, extend the device platform data with a power management hook which toggles one of those new GPIO pins. Depends on patch 2/10 "ARM: OMAP1: Convert Amstrad E3 latches to basic_mmio_gpio". Signed-off-by: Janusz Krzysztofik <[email protected]> --- arch/arm/mach-omap1/board-ams-delta.c | 44 ++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 7670374..5705481 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -262,16 +262,6 @@ static struct gpio _latch_gpios[] __initconst = { .label = "scard_cmdvcc", }, { - .gpio = AMS_DELTA_GPIO_PIN_MODEM_NRESET, - .flags = GPIOF_OUT_INIT_LOW, - .label = "modem_nreset", - }, - { - .gpio = AMS_DELTA_GPIO_PIN_MODEM_CODEC, - .flags = GPIOF_OUT_INIT_LOW, - .label = "modem_codec", - }, - { .gpio = AMS_DELTA_LATCH2_GPIO_BASE + 14, .flags = GPIOF_OUT_INIT_LOW, .label = "hookflash1", @@ -482,6 +472,12 @@ static void __init ams_delta_init(void) omap_writew(omap_readw(ARM_RSTCT1) | 0x0004, ARM_RSTCT1); } +static void _modem_pm(struct uart_port *port, unsigned int state, unsigned old) +{ + if (state != old) + gpio_set_value(AMS_DELTA_GPIO_PIN_MODEM_NRESET, state == 0); +} + static struct plat_serial8250_port ams_delta_modem_ports[] = { { .membase = IOMEM(_MODEM_VIRT), @@ -492,6 +488,7 @@ static struct plat_serial8250_port ams_delta_modem_ports[] = { .iotype = UPIO_MEM, .regshift = 1, .uartclk = BASE_BAUD * 16, + .pm = _modem_pm, }, { }, }; @@ -504,6 +501,24 @@ static struct platform_device ams_delta_modem_device = { }, }; +static struct gpio _modem_gpios[] __initconst = { + { + .gpio = AMS_DELTA_GPIO_PIN_MODEM_IRQ, + .flags = GPIOF_DIR_IN, + .label = "modem_irq", + }, + { + .gpio = AMS_DELTA_GPIO_PIN_MODEM_NRESET, + .flags = GPIOF_OUT_INIT_HIGH, + .label = "modem_nreset", + }, + { + .gpio = AMS_DELTA_GPIO_PIN_MODEM_CODEC, + .flags = GPIOF_OUT_INIT_HIGH, + .label = "modem_codec", + }, +}; + static int __init ams_delta_modem_init(void) { int err; @@ -515,16 +530,11 @@ static int __init ams_delta_modem_init(void) ams_delta_modem_ports[0].irq = gpio_to_irq(AMS_DELTA_GPIO_PIN_MODEM_IRQ); - err = gpio_request(AMS_DELTA_GPIO_PIN_MODEM_IRQ, "modem"); + err = gpio_request_array(_modem_gpios, ARRAY_SIZE(_modem_gpios)); if (err) { - pr_err("Couldn't request gpio pin for modem\n"); + pr_err("Couldn't request gpio pins for modem\n"); return err; } - gpio_direction_input(AMS_DELTA_GPIO_PIN_MODEM_IRQ); - - ams_delta_latch2_write( - AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC, - AMS_DELTA_LATCH2_MODEM_NRESET | AMS_DELTA_LATCH2_MODEM_CODEC); return platform_device_register(&ams_delta_modem_device); } -- 1.7.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
