Skip to contentSkip to conversation

ARM: OMAP: serial: remove last vestige of DTR_gpio support.

PATCH In review NeilBrown 2 participants 2 messages Nov 7, 2014 – Nov 10, 2014

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

NeilBrown

author
#0 lore raw

PATCH 1/1 ARM: OMAP: serial: remove last vestige of DTR_gpio support.

These fields were added by:
commit 9574f36fb801035f6ab0fbb1b53ce2c12c17d100
OMAP/serial: Add support for driving a GPIO as DTR.

but not removed by

commit 985bfd54c826c0ba873ca0adfd5589263e0c6ee2
tty: serial: omap: remove some dead code

which reverted most of that commit.
Time to revert the rest.

Signed-off-by NeilBrown <[email protected]>
arch/arm/mach-omap2/serial.c +0 -3
index a388f8c1bcb3..57dee0c7cd2b 100644
@@ -263,9 +263,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
 	omap_up.dma_rx_timeout = info->dma_rx_timeout;
 	omap_up.dma_rx_poll_rate = info->dma_rx_poll_rate;
 	omap_up.autosuspend_timeout = info->autosuspend_timeout;
-	omap_up.DTR_gpio = info->DTR_gpio;
-	omap_up.DTR_inverted = info->DTR_inverted;
-	omap_up.DTR_present = info->DTR_present;
 
 	pdata = &omap_up;
 	pdata_size = sizeof(struct omap_uart_port_info);
include/linux/platform_data/serial-omap.h +0 -3
index c860c1b314c0..d09275f3cde3 100644
@@ -38,9 +38,6 @@ struct omap_uart_port_info {
 	unsigned int		dma_rx_timeout;
 	unsigned int		autosuspend_timeout;
 	unsigned int		dma_rx_poll_rate;
-	int			DTR_gpio;
-	int			DTR_inverted;
-	int			DTR_present;
 
 	int (*get_context_loss_count)(struct device *);
 	void (*enable_wakeup)(struct device *, bool);
maintainer
#1 lore raw
Quoted 5 lines · NeilBrown

These fields were added by:
commit 9574f36fb801035f6ab0fbb1b53ce2c12c17d100
OMAP/serial: Add support for driving a GPIO as DTR.

Quoted 7 lines

but not removed by

commit 985bfd54c826c0ba873ca0adfd5589263e0c6ee2
tty: serial: omap: remove some dead code

which reverted most of that commit.
Time to revert the rest.

Thanks applying into omap-for-v3.19/fixes-not-urgent.

Tony