diff options
| author |   Magnus Damm <damm@opensource.se> | 2009-12-14 12:30:14 +0000 |
|---|---|---|
| committer |   Paul Mundt <lethal@linux-sh.org> | 2009-12-15 12:06:33 +0900 |
| commit | cd5f107628ab89c5dec5ad923f1c27f4cba41972 (patch) | |
| tree | 2c6a6c2e1314b445fab972519bb7c4ce22de2f71 /arch/sh/kernel/cpu/sh4/setup-sh4-202.c | |
| parent | sh: sh3 scif pdata (sh7705/sh770x/sh7710/sh7720) (diff) | |
| download | linux-dev-cd5f107628ab89c5dec5ad923f1c27f4cba41972.tar.xz linux-dev-cd5f107628ab89c5dec5ad923f1c27f4cba41972.zip | |
sh: sh4 scif pdata (sh7750/sh7760/sh4-202)
This patch breaks out the sh4 scif serial port platform
data from a shared platform device to one platform
device per port. Also, add serial ports to the list of
early platform devices.
While at it, get rid of the R2D ifdef in the processor
code and adjust the defconfigs to use ttySC1.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4/setup-sh4-202.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c index de4827df19aa..4b733715cdb5 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh4-202.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh4-202.c @@ -15,22 +15,18 @@ #include <linux/sh_timer.h> #include <linux/io.h> -static struct plat_sci_port sci_platform_data[] = { - { - .mapbase = 0xffe80000, - .flags = UPF_BOOT_AUTOCONF, - .type = PORT_SCIF, - .irqs = { 40, 41, 43, 42 }, - }, { - .flags = 0, - } +static struct plat_sci_port scif0_platform_data = { + .mapbase = 0xffe80000, + .flags = UPF_BOOT_AUTOCONF, + .type = PORT_SCIF, + .irqs = { 40, 41, 43, 42 }, }; -static struct platform_device sci_device = { +static struct platform_device scif0_device = { .name = "sh-sci", - .id = -1, + .id = 0, .dev = { - .platform_data = sci_platform_data, + .platform_data = &scif0_platform_data, }, }; @@ -127,7 +123,7 @@ static struct platform_device tmu2_device = { }; static struct platform_device *sh4202_devices[] __initdata = { - &sci_device, + &scif0_device, &tmu0_device, &tmu1_device, &tmu2_device, @@ -141,6 +137,7 @@ static int __init sh4202_devices_setup(void) arch_initcall(sh4202_devices_setup); static struct platform_device *sh4202_early_devices[] __initdata = { + &scif0_device, &tmu0_device, &tmu1_device, &tmu2_device, |