Skip to content

Commit 49a94e9

Browse files
tsbogendralfbaechle
authored andcommitted
MIPS: SNI: Switch RM400 serial to SCCNXP driver
The new SCCNXP driver supports the SC2681 chips used in RM400 machines. We now use the new driver instead of the old SC26xx driver. Signed-off-by: Thomas Bogendoerfer <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/4417/ Signed-off-by: Ralf Baechle <[email protected]>
1 parent fd9e839 commit 49a94e9

File tree

1 file changed

+3
-24
lines changed

1 file changed

+3
-24
lines changed

arch/mips/sni/a20r.c

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -118,26 +118,6 @@ static struct resource sc26xx_rsrc[] = {
118118
}
119119
};
120120

121-
static unsigned int sc26xx_data[2] = {
122-
/* DTR | RTS | DSR | CTS | DCD | RI */
123-
(8 << 0) | (4 << 4) | (6 << 8) | (0 << 12) | (6 << 16) | (0 << 20),
124-
(3 << 0) | (2 << 4) | (1 << 8) | (2 << 12) | (3 << 16) | (4 << 20)
125-
};
126-
127-
static struct platform_device sc26xx_pdev = {
128-
.name = "SC26xx",
129-
.num_resources = ARRAY_SIZE(sc26xx_rsrc),
130-
.resource = sc26xx_rsrc,
131-
.dev = {
132-
.platform_data = sc26xx_data,
133-
}
134-
};
135-
136-
#warning "Please try migrate to use new driver SCCNXP and report the status" \
137-
"in the linux-serial mailing list."
138-
139-
/* The code bellow is a replacement of SC26XX to SCCNXP */
140-
#if 0
141121
#include <linux/platform_data/sccnxp.h>
142122

143123
static struct sccnxp_pdata sccnxp_data = {
@@ -155,15 +135,14 @@ static struct sccnxp_pdata sccnxp_data = {
155135
MCTRL_SIG(RNG_IP, LINE_IP3),
156136
};
157137

158-
static struct platform_device sc2681_pdev = {
138+
static struct platform_device sc26xx_pdev = {
159139
.name = "sc2681",
160-
.resource = sc2xxx_rsrc,
161-
.num_resources = ARRAY_SIZE(sc2xxx_rsrc),
140+
.resource = sc26xx_rsrc,
141+
.num_resources = ARRAY_SIZE(sc26xx_rsrc),
162142
.dev = {
163143
.platform_data = &sccnxp_data,
164144
},
165145
};
166-
#endif
167146

168147
static u32 a20r_ack_hwint(void)
169148
{

0 commit comments

Comments
 (0)