Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sh: VoyagerGX cleanups and 8250 UART support.

Browse source 
This adds the VoyagerGX UART to the RTS7751R2D setup
code, and cleans up a few build issues.

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2006-09-27 16:48:46 +09:00
parent a3e61d50dc
commit ade2b3f6ed
3 changed files with 71 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
arch/sh/boards/renesas/rts7751r2d/setup.c
View file

@ -1,18 +1,76 @@
/* /*
* linux/arch/sh/kernel/setup_rts7751r2d.c
*
* Copyright (C) 2000 Kazumoto Kojima
*
* Renesas Technology Sales RTS7751R2D Support. * Renesas Technology Sales RTS7751R2D Support.
* *
* Modified for RTS7751R2D by * Copyright (C) 2002 Atom Create Engineering Co., Ltd.
* Atom Create Engineering Co., Ltd. 2002. * Copyright (C) 2004 - 2006 Paul Mundt
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/serial_8250.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/rts7751r2d/rts7751r2d.h> #include <asm/mach/rts7751r2d.h>
#include <asm/mach/voyagergx_reg.h>
static struct plat_serial8250_port uart_platform_data[] = {
{
.membase = (void *)VOYAGER_UART_BASE,
.mapbase = VOYAGER_UART_BASE,
.iotype = UPIO_MEM,
.irq = VOYAGER_UART0_IRQ,
.flags = UPF_BOOT_AUTOCONF,
.regshift = 2,
.uartclk = (9600 * 16),
}, {
.flags = 0,
},
};
static void __init voyagergx_serial_init(void)
{
unsigned long val;
/*
* GPIO Control
*/
val = inl(GPIO_MUX_HIGH);
val |= 0x00001fe0;
outl(val, GPIO_MUX_HIGH);
/*
* Power Mode Gate
*/
val = inl(POWER_MODE0_GATE);
val |= (POWER_MODE0_GATE_U0 | POWER_MODE0_GATE_U1);
outl(val, POWER_MODE0_GATE);
val = inl(POWER_MODE1_GATE);
val |= (POWER_MODE1_GATE_U0 | POWER_MODE1_GATE_U1);
outl(val, POWER_MODE1_GATE);
}
static struct platform_device uart_device = {
.name = "serial8250",
.id = -1,
.dev = {
.platform_data = uart_platform_data,
},
};
static struct platform_device *rts7751r2d_devices[] __initdata = {
&uart_device,
};
static int __init rts7751r2d_devices_setup(void)
{
return platform_add_devices(rts7751r2d_devices,
ARRAY_SIZE(rts7751r2d_devices));
}
__initcall(rts7751r2d_devices_setup);
const char *get_system_type(void) const char *get_system_type(void)
{ {
@ -32,4 +90,7 @@ void __init platform_setup(void)
printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n"); printk(KERN_INFO "Renesas Technology Sales RTS7751R2D support.\n");
ctrl_outw(0x0000, PA_OUTPORT); ctrl_outw(0x0000, PA_OUTPORT);
pm_power_off = rts7751r2d_power_off; pm_power_off = rts7751r2d_power_off;
voyagergx_serial_init();
} }

3
arch/sh/cchips/voyagergx/irq.c
View file

@ -32,8 +32,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/rts7751r2d/rts7751r2d.h> #include <asm/mach/voyagergx_reg.h>
#include <asm/rts7751r2d/voyagergx_reg.h>
static void disable_voyagergx_irq(unsigned int irq) static void disable_voyagergx_irq(unsigned int irq)
{ {

2
arch/sh/cchips/voyagergx/setup.c
View file

@ -13,7 +13,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/rts7751r2d/voyagergx_reg.h> #include <asm/mach/voyagergx_reg.h>
static int __init setup_voyagergx(void) static int __init setup_voyagergx(void)
{ {