Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fbde950 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

sh: sh-sci - fix SH7708 support 



This patch makes sure the sci serial port driver compiles for sh7708.
The approach taken is to treat the sh7708 as a subset of sh7706, sh7707,
sh7709. sh7708 is very similar to sh7706, sh7707, sh7709, but only
equipped with a single sci port. The platform data in setup-sh770x.c
already limits the number of serial ports for sh7708 to a single one,
so the non-existing scif ports pointed out in sh-sci.h will remain
unused in case of sh7708.

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent ac79fd58

drivers/serial/sh-sci.h

+8 −17
Original line number Diff line number Diff line
@@ -23,13 +23,10 @@ 
#endif

#endif



#if defined(CONFIG_CPU_SUBTYPE_SH7708)

# define SCSPTR 0xffffff7c /* 8 bit */

# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */

# define SCI_ONLY

#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || \

      defined(CONFIG_CPU_SUBTYPE_SH7709) || \

      defined(CONFIG_CPU_SUBTYPE_SH7706)

#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \

    defined(CONFIG_CPU_SUBTYPE_SH7707) || \

    defined(CONFIG_CPU_SUBTYPE_SH7708) || \

    defined(CONFIG_CPU_SUBTYPE_SH7709)

# define SCPCR  0xA4000116 /* 16 bit SCI and SCIF */

# define SCPDR  0xA4000136 /* 8  bit SCI and SCIF */

# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
@@ -479,16 +476,10 @@ static const struct __attribute__((packed)) { 
};

#endif



#if defined(CONFIG_CPU_SUBTYPE_SH7708)

static inline int sci_rxd_in(struct uart_port *port)

{

	if (port->mapbase == 0xfffffe80)

		return ctrl_inb(SCSPTR)&0x01 ? 1 : 0; /* SCI */

	return 1;

}

#elif defined(CONFIG_CPU_SUBTYPE_SH7707) || \

      defined(CONFIG_CPU_SUBTYPE_SH7709) || \

      defined(CONFIG_CPU_SUBTYPE_SH7706)

#if defined(CONFIG_CPU_SUBTYPE_SH7706) || \

    defined(CONFIG_CPU_SUBTYPE_SH7707) || \

    defined(CONFIG_CPU_SUBTYPE_SH7708) || \

    defined(CONFIG_CPU_SUBTYPE_SH7709)

static inline int sci_rxd_in(struct uart_port *port)

{

	if (port->mapbase == 0xfffffe80)