Skip to content

Commit

Permalink
sh: use sm501 8250 mfd support on r2d boards
Browse files Browse the repository at this point in the history
Make use of recently added sm501 8250 uart support, commit
61711f8 makes the mfd code
handle 8250 uarts so there is no longer need to do it from
the r2d board code.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed May 23, 2008
1 parent b76baf4 commit fa7ff08
Showing 1 changed file with 1 addition and 38 deletions.
39 changes: 1 addition & 38 deletions arch/sh/boards/renesas/rts7751r2d/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include <linux/init.h>
#include <linux/platform_device.h>
#include <linux/ata_platform.h>
#include <linux/serial_8250.h>
#include <linux/sm501.h>
#include <linux/sm501-regs.h>
#include <linux/pm.h>
Expand Down Expand Up @@ -109,27 +108,6 @@ static struct platform_device heartbeat_device = {
.resource = heartbeat_resources,
};

static struct plat_serial8250_port uart_platform_data[] = {
{
.membase = (void __iomem *)0xb3e30000,
.mapbase = 0xb3e30000,
.iotype = UPIO_MEM,
.irq = IRQ_VOYAGER,
.flags = UPF_BOOT_AUTOCONF | UPF_SHARE_IRQ,
.regshift = 2,
.uartclk = (9600 * 16),
},
{ 0 },
};

static struct platform_device uart_device = {
.name = "serial8250",
.id = PLAT8250_DEV_PLATFORM,
.dev = {
.platform_data = uart_platform_data,
},
};

static struct resource sm501_resources[] = {
[0] = {
.start = 0x10000000,
Expand Down Expand Up @@ -185,11 +163,7 @@ static struct sm501_platdata_fb sm501_fb_pdata = {
};

static struct sm501_initdata sm501_initdata = {
.gpio_high = {
.set = 0x00001fe0,
.mask = 0x0,
},
.devices = SM501_USE_USB_HOST,
.devices = SM501_USE_USB_HOST | SM501_USE_UART0,
};

static struct sm501_platdata sm501_platform_data = {
Expand All @@ -208,7 +182,6 @@ static struct platform_device sm501_device = {
};

static struct platform_device *rts7751r2d_devices[] __initdata = {
&uart_device,
&sm501_device,
&heartbeat_device,
&spi_sh_sci_device,
Expand Down Expand Up @@ -272,16 +245,6 @@ static void __init rts7751r2d_setup(char **cmdline_p)

sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL;
writel(readl(sm501_reg) | 0x00f107c0, sm501_reg);

/*
* Power Mode Gate - Enable UART0
*/

sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_0_GATE;
writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg);

sm501_reg = (void __iomem *)0xb3e00000 + SM501_POWER_MODE_1_GATE;
writel(readl(sm501_reg) | (1 << SM501_GATE_UART0), sm501_reg);
}

/*
Expand Down

0 comments on commit fa7ff08

Please sign in to comment.