From 8127d090809e3471aa1cb93529c73574336fda3e Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 13 Sep 2016 13:22:14 +0100 Subject: ARM: sa1100/h3xxx: convert to xcvr-enable Signed-off-by: Russell King --- arch/arm/mach-sa1100/h3xxx.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c index 9197019a6f20..2e43f0ff9948 100644 --- a/arch/arm/mach-sa1100/h3xxx.c +++ b/arch/arm/mach-sa1100/h3xxx.c @@ -83,21 +83,7 @@ static struct resource h3xxx_flash_resource = /* * H3xxx uart support */ -static void h3xxx_uart_pm(struct uart_port *port, u_int state, u_int oldstate) -{ - if (port->mapbase == _Ser3UTCR0) { - if (!gpio_request(H3XXX_EGPIO_RS232_ON, "RS232 transceiver")) { - gpio_direction_output(H3XXX_EGPIO_RS232_ON, !state); - gpio_free(H3XXX_EGPIO_RS232_ON); - } else { - pr_err("%s: can't request H3XXX_EGPIO_RS232_ON\n", - __func__); - } - } -} - static const struct sa1100_port_fns h3xxx_port_fns __initconst = { - .pm = h3xxx_uart_pm, .wake = { [0] = SA11X0_WAKE_CTS | SA11X0_WAKE_DCD, }, @@ -106,6 +92,7 @@ static const struct sa1100_port_fns h3xxx_port_fns __initconst = { static struct gpiod_lookup_table h3xxx_uart3_gpio_table = { .dev_id = "sa11x0-uart.3", .table = { + GPIO_LOOKUP("htc-egpio", 7, "xcvr-enable", GPIO_ACTIVE_HIGH), GPIO_LOOKUP("gpio", H3XXX_GPIO_COM_DCD, "dcd", GPIO_ACTIVE_LOW), GPIO_LOOKUP("gpio", H3XXX_GPIO_COM_CTS, "cts", GPIO_ACTIVE_LOW), GPIO_LOOKUP("gpio", H3XXX_GPIO_COM_RTS, "rts", GPIO_ACTIVE_LOW), -- cgit