openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial: sh-sci: Add device tree support for r8a7779 

According to the platform data for the legacy-C initialisation of sh-sci
for the r8a7779 SoC and my own testing the SCIx_SH4_SCIF_REGTYPE bit of
scscr needs to be set.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Simon Horman 2014-04-24 15:54:44 +09:00 committed by Greg Kroah-Hartman
parent c439c33d85
commit fcbee4d49f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
View File

@ -12,6 +12,7 @@ Required properties:
- "renesas,scifa-r8a7791" for R8A7791 (R-Car M2) SCIFA compatible UART.
- "renesas,scifb-r8a7791" for R8A7791 (R-Car M2) SCIFB compatible UART.
- "renesas,hscif-r8a7791" for R8A7791 (R-Car M2) HSCIF compatible UART.
- "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART.
- "renesas,scif" for generic SCIF compatible UART.
- "renesas,scifa" for generic SCIFA compatible UART.
- "renesas,scifb" for generic SCIFB compatible UART.

10
drivers/tty/serial/sh-sci.c
View File

@ -2419,6 +2419,7 @@ static int sci_remove(struct platform_device *dev)
struct sci_port_info {
unsigned int type;
unsigned int regtype;
unsigned int scscr_extra;
};
static const struct of_device_id of_sci_match[] = {
@ -2428,6 +2429,13 @@ static const struct of_device_id of_sci_match[] = {
.type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_REGTYPE,
},
}, {
.compatible = "renesas,scif-r8a7779",
.data = (void *)&(const struct sci_port_info) {
.type = PORT_SCIF,
.regtype = SCIx_SH4_SCIF_REGTYPE,
.scscr_extra = SCSCR_CKE1,
},
}, {
.compatible = "renesas,scifa",
.data = &(const struct sci_port_info) {
@ -2488,7 +2496,7 @@ sci_parse_dt(struct platform_device *pdev, unsigned int *dev_id)
p->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
p->type = info->type;
p->regtype = info->regtype;
p->scscr = SCSCR_RE | SCSCR_TE;
p->scscr = SCSCR_RE | SCSCR_TE | info->scscr_extra;
return p;
}