summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-09-13 13:22:14 +0100
committerRussell King (Oracle) <rmk+kernel@armlinux.org.uk>2024-01-08 10:30:06 +0000
commit25377b652013fed5c7bed17c95a9c19e8b1c0995 (patch)
tree98824f05010015b2b33968a11e42bfc15f9f578a
parentd67a8aa70ab96173ea4d7ee2f1881b1a9f82d336 (diff)
ARM: sa1100/h3xxx: convert to xcvr-enable
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--arch/arm/mach-sa1100/h3xxx.c15
1 files changed, 1 insertions, 14 deletions
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),