Commit c2697968 authored by Paul Mundt's avatar Paul Mundt
Browse files

serial: sh-sci: Fix up SH7760/SH7780/SH7785 early printk regression. 



As noted by Manuel:

	Commit c63847a3 ("sh: Add
	SCIF2 support for SH7763.") broke build with CONFIG_EARLY_PRINTK
	enabled for me (SH7760):

	  CC      arch/sh/kernel/early_printk.o
	/mnt/work/sh7760/kernel/linux-2.6.git/arch/sh/kernel/early_printk.c: In function 'scif_sercon_putc':
	/mnt/work/sh7760/kernel/linux-2.6.git/arch/sh/kernel/early_printk.c:84: error: implicit declaration of function 'sci_SCFDR_in'

Move the SH7763 definitions out on their own, so they don't create additional
confusion within the SH7760/SH7780/SH7785 block. Restore the deleted
SCFDR definition for these parts.

Reported-by: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent c8b5d9dc

drivers/serial/sh-sci.h

+7 −5
Original line number Original line Diff line number Diff line
@@ -451,19 +451,21 @@ SCIx_FNS(SCxSR, 0x08, 8, 0x10, 8, 0x08, 16, 0x10, 16, 0x04, 8) 
SCIx_FNS(SCxRDR, 0x0a,  8, 0x14,  8, 0x0A,  8, 0x14,  8, 0x05,  8)

SCIx_FNS(SCxRDR, 0x0a,  8, 0x14,  8, 0x0A,  8, 0x14,  8, 0x05,  8)

SCIF_FNS(SCFCR,                      0x0c,  8, 0x18, 16)

SCIF_FNS(SCFCR,                      0x0c,  8, 0x18, 16)

#if defined(CONFIG_CPU_SUBTYPE_SH7760) || \

#if defined(CONFIG_CPU_SUBTYPE_SH7760) || \

    defined(CONFIG_CPU_SUBTYPE_SH7763) || \

    defined(CONFIG_CPU_SUBTYPE_SH7780) || \

    defined(CONFIG_CPU_SUBTYPE_SH7780) || \

    defined(CONFIG_CPU_SUBTYPE_SH7785)

    defined(CONFIG_CPU_SUBTYPE_SH7785)

SCIF_FNS(SCFDR,			     0x0e, 16, 0x1C, 16)

SCIF_FNS(SCTFDR,		     0x0e, 16, 0x1C, 16)

SCIF_FNS(SCTFDR,		     0x0e, 16, 0x1C, 16)

SCIF_FNS(SCRFDR,		     0x0e, 16, 0x20, 16)

SCIF_FNS(SCRFDR,		     0x0e, 16, 0x20, 16)

SCIF_FNS(SCSPTR,			0,  0, 0x24, 16)

SCIF_FNS(SCSPTR,			0,  0, 0x24, 16)

SCIF_FNS(SCLSR,				0,  0, 0x28, 16)

SCIF_FNS(SCLSR,				0,  0, 0x28, 16)

#if defined(CONFIG_CPU_SUBTYPE_SH7763)

#elif defined(CONFIG_CPU_SUBTYPE_SH7763)

/* SH7763 SCIF2 */

SCIF_FNS(SCFDR,				0,  0, 0x1C, 16)

SCIF_FNS(SCFDR,				0,  0, 0x1C, 16)

SCIF_FNS(SCSPTR2,			0,  0, 0x20, 16)

SCIF_FNS(SCSPTR2,			0,  0, 0x20, 16)

SCIF_FNS(SCLSR2,			0,  0, 0x24, 16)

SCIF_FNS(SCLSR2,			0,  0, 0x24, 16)

#endif /* CONFIG_CPU_SUBTYPE_SH7763 */

SCIF_FNS(SCTFDR,		     0x0e, 16, 0x1C, 16)

SCIF_FNS(SCRFDR,		     0x0e, 16, 0x20, 16)

SCIF_FNS(SCSPTR,			0,  0, 0x24, 16)

SCIF_FNS(SCLSR,				0,  0, 0x28, 16)

#else

#else

SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)

SCIF_FNS(SCFDR,                      0x0e, 16, 0x1C, 16)

#if defined(CONFIG_CPU_SUBTYPE_SH7722)

#if defined(CONFIG_CPU_SUBTYPE_SH7722)

CRA Git | Maintained and supported by SUSTech CRA and CCSE