Skip to content

Commit cf56ffa

Browse files
author
Russell King
committed
ARM: sa1100/hackkit: remove empty serial mctrl functions
Remove the empty serial modem control signal functions from hackkit as these are unnecessary - the core code can copes fine without these. Signed-off-by: Russell King <[email protected]>
1 parent 88a4c74 commit cf56ffa

File tree

1 file changed

+0
-48
lines changed

1 file changed

+0
-48
lines changed

arch/arm/mach-sa1100/hackkit.c

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@
4949
/* init funcs */
5050
static void __init hackkit_map_io(void);
5151

52-
static u_int hackkit_get_mctrl(struct uart_port *port);
53-
static void hackkit_set_mctrl(struct uart_port *port, u_int mctrl);
5452
static void hackkit_uart_pm(struct uart_port *port, u_int state, u_int oldstate);
5553

5654
/**********************************************************************
@@ -71,8 +69,6 @@ static struct map_desc hackkit_io_desc[] __initdata = {
7169
};
7270

7371
static struct sa1100_port_fns hackkit_port_fns __initdata = {
74-
.set_mctrl = hackkit_set_mctrl,
75-
.get_mctrl = hackkit_get_mctrl,
7672
.pm = hackkit_uart_pm,
7773
};
7874

@@ -105,50 +101,6 @@ static void hackkit_uart_pm(struct uart_port *port, u_int state, u_int oldstate)
105101
/* TODO: switch on/off uart in powersave mode */
106102
}
107103

108-
/*
109-
* Note! this can be called from IRQ context.
110-
* FIXME: No modem ctrl lines yet.
111-
*/
112-
static void hackkit_set_mctrl(struct uart_port *port, u_int mctrl)
113-
{
114-
#if 0
115-
if (port->mapbase == _Ser1UTCR0) {
116-
u_int set = 0, clear = 0;
117-
118-
if (mctrl & TIOCM_RTS)
119-
set |= PT_CTRL2_RS1_RTS;
120-
else
121-
clear |= PT_CTRL2_RS1_RTS;
122-
123-
if (mctrl & TIOCM_DTR)
124-
set |= PT_CTRL2_RS1_DTR;
125-
else
126-
clear |= PT_CTRL2_RS1_DTR;
127-
128-
PTCTRL2_clear(clear);
129-
PTCTRL2_set(set);
130-
}
131-
#endif
132-
}
133-
134-
static u_int hackkit_get_mctrl(struct uart_port *port)
135-
{
136-
u_int ret = 0;
137-
#if 0
138-
u_int irqsr = PT_IRQSR;
139-
140-
/* need 2 reads to read current value */
141-
irqsr = PT_IRQSR;
142-
143-
/* TODO: check IRQ source register for modem/com
144-
status lines and set them correctly. */
145-
#endif
146-
147-
ret = TIOCM_CD | TIOCM_CTS | TIOCM_DSR;
148-
149-
return ret;
150-
}
151-
152104
static struct mtd_partition hackkit_partitions[] = {
153105
{
154106
.name = "BLOB",

0 commit comments

Comments
 (0)