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

Commit fc3f341b authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Linus Torvalds
Browse files

serial: add VR41xx SIU setup for serial console 



Add VR41xx SIU setup for serial console.

Signed-off-by: default avatarYoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent baac5895

arch/mips/vr41xx/common/init.c

+3 −1
Original line number Diff line number Diff line 
/*

 *  init.c, Common initialization routines for NEC VR4100 series.

 *

 *  Copyright (C) 2003-2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

 *  Copyright (C) 2003-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by
@@ -53,6 +53,8 @@ void __init plat_time_init(void) 
void __init plat_mem_setup(void)

{

	iomem_resource_init();



	vr41xx_siu_setup();

}



void __init prom_init(void)

arch/mips/vr41xx/common/siu.c

+35 −1
Original line number Diff line number Diff line 
/*

 *  NEC VR4100 series SIU platform device.

 *

 *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

 *  Copyright (C) 2007-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by
@@ -118,3 +118,37 @@ err_free_device: 
	return retval;

}

device_initcall(vr41xx_siu_add);



void __init vr41xx_siu_setup(void)

{

	struct uart_port port;

	struct resource *res;

	unsigned int *type;

	int i;



	switch (current_cpu_type()) {

	case CPU_VR4111:

	case CPU_VR4121:

		type = siu_type1_ports;

		res = siu_type1_resource;

		break;

	case CPU_VR4122:

	case CPU_VR4131:

	case CPU_VR4133:

		type = siu_type2_ports;

		res = siu_type2_resource;

		break;

	default:

		return;

	}



	for (i = 0; i < SIU_PORTS_MAX; i++) {

		port.line = i;

		port.type = type[i];

		if (port.type == PORT_UNKNOWN)

			break;

		port.mapbase = res[i].start;

		port.membase = (unsigned char __iomem *)KSEG1ADDR(res[i].start);

		vr41xx_siu_early_setup(&port);

	}

}

include/asm-mips/vr41xx/siu.h

+7 −1
Original line number Diff line number Diff line 
/*

 *  Include file for NEC VR4100 series Serial Interface Unit.

 *

 *  Copyright (C) 2005  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

 *  Copyright (C) 2005-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

 *

 *  This program is free software; you can redistribute it and/or modify

 *  it under the terms of the GNU General Public License as published by
@@ -49,4 +49,10 @@ typedef enum { 


extern void vr41xx_select_irda_module(irda_module_t module, irda_speed_t speed);



#ifdef CONFIG_SERIAL_VR41XX_CONSOLE

extern void vr41xx_siu_early_setup(struct uart_port *port);

#else

static inline void vr41xx_siu_early_setup(struct uart_port *port) {}

#endif



#endif /* __NEC_VR41XX_SIU_H */

include/asm-mips/vr41xx/vr41xx.h

+7 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 * Copyright (C) 2001, 2002 Paul Mundt

 * Copyright (C) 2002 MontaVista Software, Inc.

 * Copyright (C) 2002 TimeSys Corp.

 * Copyright (C) 2003-2005 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

 * Copyright (C) 2003-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the
@@ -143,4 +143,10 @@ extern void vr41xx_disable_csiint(uint16_t mask); 
extern void vr41xx_enable_bcuint(void);

extern void vr41xx_disable_bcuint(void);



#ifdef CONFIG_SERIAL_VR41XX_CONSOLE

extern void vr41xx_siu_setup(void);

#else

static inline void vr41xx_siu_setup(void) {}

#endif



#endif /* __NEC_VR41XX_H */