Skip to content

L
linux
Commit de1e6c0e authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Linus Torvalds
Browse files
Options

[PATCH] serial: add the output interface control to VR41xx SIU driver 

This patch adds the output interface control to VR41xx SIU driver.
And obsolete function for VR41xx SIU is removed.

And add __init for the function used only for initialization.
Signed-off-by: default avatarYoichi Yuasa <yuasa@hh.iij4u.or.jp>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 26e25c95
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 312 deletions
arch/mips/vr41xx/casio-e55/setup.c
View file @ de1e6c0e
/*
* setup.c, Setup for the CASIO CASSIOPEIA E-11/15/55/65.
*
* Copyright (C) 2002-2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
* Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.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
......@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <asm/io.h>
......@@ -28,18 +28,13 @@ const char *get_system_type(void)
return "CASIO CASSIOPEIA E-11/15/55/65";
}
static int casio_e55_setup(void)
static int __init casio_e55_setup(void)
{
set_io_port_base(IO_PORT_BASE);
ioport_resource.start = IO_PORT_RESOURCE_START;
ioport_resource.end = IO_PORT_RESOURCE_END;
#ifdef CONFIG_SERIAL_8250
vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
vr41xx_siu_init();
#endif
return 0;
}
early_initcall(casio_e55_setup);
arch_initcall(casio_e55_setup);
arch/mips/vr41xx/common/Makefile
View file @ de1e6c0e
......@@ -3,7 +3,6 @@
#
obj-y += bcu.o cmu.o giu.o icu.o init.o int-handler.o ksyms.o pmu.o rtc.o
obj-$(CONFIG_SERIAL_8250) += serial.o
obj-$(CONFIG_VRC4171) += vrc4171.o
obj-$(CONFIG_VRC4173) += vrc4173.o
......
arch/mips/vr41xx/common/serial.c deleted 100644 → 0
View file @ 26e25c95
/*
* serial.c, Serial Interface Unit routines for NEC VR4100 series.
*
* Copyright (C) 2002 MontaVista Software Inc.
* Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
* Copyright (C) 2003-2004 Yoichi Yuasa <yuasa@hh.iij4u.or.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 Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/*
* Changes:
* MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com>
* - New creation, NEC VR4122 and VR4131 are supported.
* - Added support for NEC VR4111 and VR4121.
*
* Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
* - Added support for NEC VR4133.
*/
#include <linux/init.h>
#include <linux/types.h>
#include <linux/tty.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
#include <linux/smp.h>
#include <asm/addrspace.h>
#include <asm/cpu.h>
#include <asm/io.h>
#include <asm/vr41xx/vr41xx.h>
#define SIUIRSEL_TYPE1 KSEG1ADDR(0x0c000008)
#define SIUIRSEL_TYPE2 KSEG1ADDR(0x0f000808)
#define USE_RS232C 0x00
#define USE_IRDA 0x01
#define SIU_USES_IRDA 0x00
#define FIR_USES_IRDA 0x02
#define IRDA_MODULE_SHARP 0x00
#define IRDA_MODULE_TEMIC 0x04
#define IRDA_MODULE_HP 0x08
#define TMICTX 0x10
#define TMICMODE 0x20
#define SIU_BASE_TYPE1 0x0c000000UL /* VR4111 and VR4121 */
#define SIU_BASE_TYPE2 0x0f000800UL /* VR4122, VR4131 and VR4133 */
#define SIU_SIZE 0x8UL
#define SIU_BASE_BAUD 1152000
/* VR4122, VR4131 and VR4133 DSIU Registers */
#define DSIU_BASE 0x0f000820UL
#define DSIU_SIZE 0x8UL
#define DSIU_BASE_BAUD 1152000
int vr41xx_serial_ports = 0;
void vr41xx_select_siu_interface(siu_interface_t interface,
irda_module_t module)
{
uint16_t val = USE_RS232C; /* Select RS-232C */
/* Select IrDA */
if (interface == SIU_IRDA) {
switch (module) {
case IRDA_SHARP:
val = IRDA_MODULE_SHARP;
break;
case IRDA_TEMIC:
val = IRDA_MODULE_TEMIC;
break;
case IRDA_HP:
val = IRDA_MODULE_HP;
break;
default:
printk(KERN_ERR "SIU: unknown IrDA module\n");
return;
}
val |= USE_IRDA | SIU_USES_IRDA;
}
switch (current_cpu_data.cputype) {
case CPU_VR4111:
case CPU_VR4121:
writew(val, SIUIRSEL_TYPE1);
break;
case CPU_VR4122:
case CPU_VR4131:
case CPU_VR4133:
writew(val, SIUIRSEL_TYPE2);
break;
default:
printk(KERN_ERR "SIU: unsupported CPU of NEC VR4100 series\n");
break;
}
}
void __init vr41xx_siu_init(void)
{
struct uart_port port;
memset(&port, 0, sizeof(port));
port.line = vr41xx_serial_ports;
port.uartclk = SIU_BASE_BAUD * 16;
port.irq = SIU_IRQ;
port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
switch (current_cpu_data.cputype) {
case CPU_VR4111:
case CPU_VR4121:
port.mapbase = SIU_BASE_TYPE1;
break;
case CPU_VR4122:
case CPU_VR4131:
case CPU_VR4133:
port.mapbase = SIU_BASE_TYPE2;
break;
default:
printk(KERN_ERR "SIU: unsupported CPU of NEC VR4100 series\n");
return;
}
port.regshift = 0;
port.iotype = UPIO_MEM;
port.membase = ioremap(port.mapbase, SIU_SIZE);
if (port.membase != NULL) {
if (early_serial_setup(&port) == 0) {
vr41xx_supply_clock(SIU_CLOCK);
vr41xx_serial_ports++;
return;
}
}
printk(KERN_ERR "SIU: setup failed!\n");
}
void __init vr41xx_dsiu_init(void)
{
struct uart_port port;
if (current_cpu_data.cputype != CPU_VR4122 &&
current_cpu_data.cputype != CPU_VR4131 &&
current_cpu_data.cputype != CPU_VR4133) {
printk(KERN_ERR "DSIU: unsupported CPU of NEC VR4100 series\n");
return;
}
memset(&port, 0, sizeof(port));
port.line = vr41xx_serial_ports;
port.uartclk = DSIU_BASE_BAUD * 16;
port.irq = DSIU_IRQ;
port.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST;
port.mapbase = DSIU_BASE;
port.regshift = 0;
port.iotype = UPIO_MEM;
port.membase = ioremap(port.mapbase, DSIU_SIZE);
if (port.membase != NULL) {
if (early_serial_setup(&port) == 0) {
vr41xx_supply_clock(DSIU_CLOCK);
vr41xx_enable_dsiuint(DSIUINT_ALL);
vr41xx_serial_ports++;
return;
}
}
printk(KERN_ERR "DSIU: setup failed!\n");
}
arch/mips/vr41xx/ibm-workpad/setup.c
View file @ de1e6c0e
/*
* setup.c, Setup for the IBM WorkPad z50.
*
* Copyright (C) 2002-2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
* Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.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
......@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <asm/io.h>
......@@ -28,18 +28,13 @@ const char *get_system_type(void)
return "IBM WorkPad z50";
}
static int ibm_workpad_setup(void)
static int __init ibm_workpad_setup(void)
{
set_io_port_base(IO_PORT_BASE);
ioport_resource.start = IO_PORT_RESOURCE_START;
ioport_resource.end = IO_PORT_RESOURCE_END;
#ifdef CONFIG_SERIAL_8250
vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
vr41xx_siu_init();
#endif
return 0;
}
early_initcall(ibm_workpad_setup);
arch_initcall(ibm_workpad_setup);
arch/mips/vr41xx/nec-cmbvr4133/setup.c
View file @ de1e6c0e
......@@ -16,7 +16,6 @@
*/
#include <linux/config.h>
#include <linux/init.h>
#include <linux/console.h>
#include <linux/ide.h>
#include <linux/ioport.h>
......@@ -55,15 +54,6 @@ static struct mtd_partition cmbvr4133_mtd_parts[] = {
#define number_partitions (sizeof(cmbvr4133_mtd_parts)/sizeof(struct mtd_partition))
#endif
extern void (*late_time_init)(void);
static void __init vr4133_serial_init(void)
{
vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
vr41xx_siu_init();
vr41xx_dsiu_init();
}
extern void i8259_init(void);
static int __init nec_cmbvr4133_setup(void)
......@@ -78,8 +68,6 @@ static int __init nec_cmbvr4133_setup(void)
mips_machgroup = MACH_GROUP_NEC_VR41XX;
mips_machtype = MACH_NEC_CMBVR4133;
late_time_init = vr4133_serial_init;
#ifdef CONFIG_PCI
#ifdef CONFIG_ROCKHOPPER
ali_m5229_preinit();
......
arch/mips/vr41xx/tanbac-tb0226/setup.c
View file @ de1e6c0e
/*
* setup.c, Setup for the TANBAC TB0226.
*
* Copyright (C) 2002-2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
* Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.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
......@@ -17,23 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/config.h>
#include <asm/vr41xx/vr41xx.h>
const char *get_system_type(void)
{
return "TANBAC TB0226";
}
static int tanbac_tb0226_setup(void)
{
#ifdef CONFIG_SERIAL_8250
vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
vr41xx_siu_init();
#endif
return 0;
}
early_initcall(tanbac_tb0226_setup);
arch/mips/vr41xx/tanbac-tb0229/setup.c
View file @ de1e6c0e
/*
* setup.c, Setup for the TANBAC TB0229 (VR4131DIMM)
*
* Copyright (C) 2002-2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
* Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
*
* Modified for TANBAC TB0229:
* Copyright (C) 2003 Megasolution Inc. <matsu@megasolution.jp>
......@@ -20,24 +20,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/config.h>
#include <asm/vr41xx/vr41xx.h>
const char *get_system_type(void)
{
return "TANBAC TB0229";
}
static int tanbac_tb0229_setup(void)
{
#ifdef CONFIG_SERIAL_8250
vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
vr41xx_siu_init();
vr41xx_dsiu_init();
#endif
return 0;
}
early_initcall(tanbac_tb0229_setup);
arch/mips/vr41xx/victor-mpc30x/setup.c
View file @ de1e6c0e
/*
* setup.c, Setup for the Victor MP-C303/304.
*
* Copyright (C) 2002-2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
* Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.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
......@@ -17,23 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/config.h>
#include <asm/vr41xx/vr41xx.h>
const char *get_system_type(void)
{
return "Victor MP-C303/304";
}
static int victor_mpc30x_setup(void)
{
#ifdef CONFIG_SERIAL_8250
vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
vr41xx_siu_init();
#endif
return 0;
}
early_initcall(victor_mpc30x_setup);
arch/mips/vr41xx/zao-capcella/setup.c
View file @ de1e6c0e
/*
* setup.c, Setup for the ZAO Networks Capcella.
*
* Copyright (C) 2002-2004 Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
* Copyright (C) 2002-2005 Yoichi Yuasa <yuasa@hh.iij4u.or.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
......@@ -17,24 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <linux/config.h>
#include <asm/vr41xx/vr41xx.h>
const char *get_system_type(void)
{
return "ZAO Networks Capcella";
}
static int zao_capcella_setup(void)
{
#ifdef CONFIG_SERIAL_8250
vr41xx_select_siu_interface(SIU_RS232C, IRDA_NONE);
vr41xx_siu_init();
vr41xx_dsiu_init();
#endif
return 0;
}
early_initcall(zao_capcella_setup);
drivers/serial/vr41xx_siu.c
View file @ de1e6c0e
......@@ -32,7 +32,6 @@
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/platform.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
#include <linux/serial_reg.h>
......@@ -40,6 +39,7 @@
#include <linux/tty_flip.h>
#include <asm/io.h>
#include <asm/vr41xx/siu.h>
#include <asm/vr41xx/vr41xx.h>
#define SIU_PORTS_MAX 2
......@@ -50,21 +50,26 @@
#define RX_MAX_COUNT 256
#define TX_MAX_COUNT 15
#define SIUIRSEL 0x08
#define TMICMODE 0x20
#define TMICTX 0x10
#define IRMSEL 0x0c
#define IRMSEL_HP 0x08
#define IRMSEL_TEMIC 0x04
#define IRMSEL_SHARP 0x00
#define IRUSESEL 0x02
#define SIRSEL 0x01
struct siu_port {
unsigned int type;
unsigned int irq;
unsigned long start;
uint8_t flags;
};
#define SIU_HAS_IRDA_SUPPORT 0x01
#define SIU_OUTPUT_IRDA 0x10
static const struct siu_port siu_type1_ports[] = {
{ .type = PORT_VR41XX_SIU,
.irq = SIU_IRQ,
.start = 0x0c000000UL,
.flags = SIU_HAS_IRDA_SUPPORT, },
.start = 0x0c000000UL, },
};
#define SIU_TYPE1_NR_PORTS (sizeof(siu_type1_ports) / sizeof(struct siu_port))
......@@ -72,8 +77,7 @@ static const struct siu_port siu_type1_ports[] = {
static const struct siu_port siu_type2_ports[] = {
{ .type = PORT_VR41XX_SIU,
.irq = SIU_IRQ,
.start = 0x0f000800UL,
.flags = SIU_HAS_IRDA_SUPPORT, },
.start = 0x0f000800UL, },
{ .type = PORT_VR41XX_DSIU,
.irq = DSIU_IRQ,
.start = 0x0f000820UL, },
......@@ -87,6 +91,84 @@ static uint8_t lsr_break_flag[SIU_PORTS_MAX];
#define siu_read(port, offset) readb((port)->membase + (offset))
#define siu_write(port, offset, value) writeb((value), (port)->membase + (offset))
void vr41xx_select_siu_interface(siu_interface_t interface)
{
struct uart_port *port;
unsigned long flags;
uint8_t irsel;
port = &siu_uart_ports[0];
spin_lock_irqsave(&port->lock, flags);
irsel = siu_read(port, SIUIRSEL);
if (interface == SIU_INTERFACE_IRDA)
irsel |= SIRSEL;
else
irsel &= ~SIRSEL;
siu_write(port, SIUIRSEL, irsel);
spin_unlock_irqrestore(&port->lock, flags);
}
EXPORT_SYMBOL_GPL(vr41xx_select_siu_interface);
void vr41xx_use_irda(irda_use_t use)
{
struct uart_port *port;
unsigned long flags;
uint8_t irsel;
port = &siu_uart_ports[0];
spin_lock_irqsave(&port->lock, flags);
irsel = siu_read(port, SIUIRSEL);
if (use == FIR_USE_IRDA)
irsel |= IRUSESEL;
else
irsel &= ~IRUSESEL;
siu_write(port, SIUIRSEL, irsel);
spin_unlock_irqrestore(&port->lock, flags);
}
EXPORT_SYMBOL_GPL(vr41xx_use_irda);
void vr41xx_select_irda_module(irda_module_t module, irda_speed_t speed)
{
struct uart_port *port;
unsigned long flags;
uint8_t irsel;
port = &siu_uart_ports[0];
spin_lock_irqsave(&port->lock, flags);
irsel = siu_read(port, SIUIRSEL);
irsel &= ~(IRMSEL | TMICTX | TMICMODE);
switch (module) {
case SHARP_IRDA:
irsel |= IRMSEL_SHARP;
break;
case TEMIC_IRDA:
irsel |= IRMSEL_TEMIC | TMICMODE;
if (speed == IRDA_TX_4MBPS)
irsel |= TMICTX;
break;
case HP_IRDA:
irsel |= IRMSEL_HP;
break;
default:
break;
}
siu_write(port, SIUIRSEL, irsel);
spin_unlock_irqrestore(&port->lock, flags);
}
EXPORT_SYMBOL_GPL(vr41xx_select_irda_module);
static inline void siu_clear_fifo(struct uart_port *port)
{
siu_write(port, UART_FCR, UART_FCR_ENABLE_FIFO);
......@@ -830,6 +912,8 @@ static int siu_console_setup(struct console *con, char *options)
port->membase = (unsigned char __iomem *)KSEG1ADDR(port->mapbase);
}
vr41xx_select_siu_interface(SIU_INTERFACE_RS232C);
if (options != NULL)
uart_parse_options(options, &baud, &parity, &bits, &flow);
......@@ -991,9 +1075,8 @@ static int __devinit vr41xx_siu_init(void)
return PTR_ERR(siu_platform_device);
retval = driver_register(&siu_device_driver);
if (retval < 0) {
if (retval < 0)
platform_device_unregister(siu_platform_device);
}
return retval;
}
......
include/asm-mips/vr41xx/siu.h 0 → 100644
View file @ de1e6c0e
/*
* Include file for NEC VR4100 series Serial Interface Unit.
*
* Copyright (C) 2005 Yoichi Yuasa <yuasa@hh.iij4u.or.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 Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef __NEC_VR41XX_SIU_H
#define __NEC_VR41XX_SIU_H
typedef enum {
SIU_INTERFACE_RS232C,
SIU_INTERFACE_IRDA,
} siu_interface_t;
extern void vr41xx_select_siu_interface(siu_interface_t interface);
typedef enum {
SIU_USE_IRDA,
FIR_USE_IRDA,
} irda_use_t;
extern void vr41xx_use_irda(irda_use_t use);
typedef enum {
SHARP_IRDA,
TEMIC_IRDA,
HP_IRDA,
} irda_module_t;
typedef enum {
IRDA_TX_1_5MBPS,
IRDA_TX_4MBPS,
} irda_speed_t;
extern void vr41xx_select_irda_module(irda_module_t module, irda_speed_t speed);
#endif /* __NEC_VR41XX_SIU_H */
include/asm-mips/vr41xx/vr41xx.h
View file @ de1e6c0e
......@@ -247,32 +247,6 @@ enum {
DATA_HIGH
};
/*
* Serial Interface Unit
*/
/* SIU interfaces */
typedef enum {
SIU_RS232C,
SIU_IRDA
} siu_interface_t;
/* IrDA interfaces */
typedef enum {
IRDA_NONE,
IRDA_SHARP,
IRDA_TEMIC,
IRDA_HP
} irda_module_t;
extern void vr41xx_select_siu_interface(siu_interface_t interface,
irda_module_t module);
/*
* Debug Serial Interface Unit
*/
extern void vr41xx_dsiu_init(void);
/*
* PCI Control Unit
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7