diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-09-13 13:18:18 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-10-12 21:55:46 +0100 |
| commit | c72d7c21cde480447b588e046a22d05ff8b8150a (patch) | |
| tree | b288eca3566afadb7fe75bc901b048a9c3938f14 | |
| parent | 9feac9d88a76349bf91679f7fb4ee8e9b7fc419d (diff) | |
ARM: sa1100/assabet: convert to xcvr-enable
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index 1e5f4eb33cbf..41d50d91502f 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -545,6 +545,7 @@ static const struct gpio_keys_platform_data assabet_keys_pdata = { static struct gpiod_lookup_table assabet_uart1_gpio_table = { .dev_id = "sa11x0-uart.1", .table = { + GPIO_LOOKUP("assabet", 12, "xcvr-enable", GPIO_ACTIVE_HIGH), GPIO_LOOKUP("assabet", 16, "dtr", GPIO_ACTIVE_LOW), GPIO_LOOKUP("assabet", 17, "rts", GPIO_ACTIVE_LOW), GPIO_LOOKUP("assabet", 25, "dcd", GPIO_ACTIVE_LOW), @@ -721,20 +722,6 @@ fixup_assabet(struct tag *tags, char **cmdline) } -static void assabet_uart_pm(struct uart_port *port, u_int state, u_int oldstate) -{ - if (port->mapbase == _Ser1UTCR0) { - if (state) - ASSABET_BCR_clear(ASSABET_BCR_RS232EN); - else - ASSABET_BCR_set(ASSABET_BCR_RS232EN); - } -} - -static const struct sa1100_port_fns assabet_port_fns __initconst = { - .pm = assabet_uart_pm, -}; - static struct map_desc assabet_io_desc[] __initdata = { { /* Board Control Register */ .virtual = ASSABET_BCR_BASE, @@ -766,9 +753,6 @@ static void __init assabet_map_io(void) MSC_RdAcc(2) | MSC_WrAcc(2) | MSC_Rec(0) ); - if (!machine_has_neponset()) - sa1100_register_uart_fns(&assabet_port_fns); - /* * When Neponset is attached, the first UART should be * UART3. That's what Angel is doing and many documents |