diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-08-31 03:49:52 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2019-06-04 07:56:44 -0400 |
commit | cf56ffaa51a794749f2faa619eb5156a84308a18 (patch) | |
tree | 7679e210604b0d48cd7cd4e90d12f47c8d50095a | |
parent | 88a4c748ba10a7006fc2eabb1a4ff22a705dd4b7 (diff) |
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 <rmk+kernel@armlinux.org.uk>
-rw-r--r-- | arch/arm/mach-sa1100/hackkit.c | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c index 643d5f2d9af9..9faf602666cf 100644 --- a/arch/arm/mach-sa1100/hackkit.c +++ b/arch/arm/mach-sa1100/hackkit.c | |||
@@ -49,8 +49,6 @@ | |||
49 | /* init funcs */ | 49 | /* init funcs */ |
50 | static void __init hackkit_map_io(void); | 50 | static void __init hackkit_map_io(void); |
51 | 51 | ||
52 | static u_int hackkit_get_mctrl(struct uart_port *port); | ||
53 | static void hackkit_set_mctrl(struct uart_port *port, u_int mctrl); | ||
54 | static void hackkit_uart_pm(struct uart_port *port, u_int state, u_int oldstate); | 52 | static void hackkit_uart_pm(struct uart_port *port, u_int state, u_int oldstate); |
55 | 53 | ||
56 | /********************************************************************** | 54 | /********************************************************************** |
@@ -71,8 +69,6 @@ static struct map_desc hackkit_io_desc[] __initdata = { | |||
71 | }; | 69 | }; |
72 | 70 | ||
73 | static struct sa1100_port_fns hackkit_port_fns __initdata = { | 71 | static struct sa1100_port_fns hackkit_port_fns __initdata = { |
74 | .set_mctrl = hackkit_set_mctrl, | ||
75 | .get_mctrl = hackkit_get_mctrl, | ||
76 | .pm = hackkit_uart_pm, | 72 | .pm = hackkit_uart_pm, |
77 | }; | 73 | }; |
78 | 74 | ||
@@ -105,50 +101,6 @@ static void hackkit_uart_pm(struct uart_port *port, u_int state, u_int oldstate) | |||
105 | /* TODO: switch on/off uart in powersave mode */ | 101 | /* TODO: switch on/off uart in powersave mode */ |
106 | } | 102 | } |
107 | 103 | ||
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 | |||
152 | static struct mtd_partition hackkit_partitions[] = { | 104 | static struct mtd_partition hackkit_partitions[] = { |
153 | { | 105 | { |
154 | .name = "BLOB", | 106 | .name = "BLOB", |