Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 106845
b: refs/heads/master
c: a55f6d2
h: refs/heads/master
i:
  106843: 5731a92
v: v3
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Jul 28, 2008
1 parent 5c2a3c8 commit 9e38c6e
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c901c96cc25f6143a7d2fb59c3287f868e84a69e
refs/heads/master: a55f6d2567008699d705a006f2432bf3e872b743
53 changes: 53 additions & 0 deletions trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <linux/serial.h>
#include <linux/serial_sci.h>
#include <linux/mm.h>
#include <linux/uio_driver.h>
#include <asm/mmzone.h>

static struct resource usbf_resources[] = {
Expand Down Expand Up @@ -59,6 +60,56 @@ static struct platform_device iic_device = {
.resource = iic_resources,
};

static struct uio_info vpu_platform_data = {
.name = "VPU4",
.version = "0",
.irq = 60,
};

static struct resource vpu_resources[] = {
[0] = {
.name = "VPU",
.start = 0xfe900000,
.end = 0xfe9022eb,
.flags = IORESOURCE_MEM,
},
};

static struct platform_device vpu_device = {
.name = "uio_pdrv_genirq",
.id = 0,
.dev = {
.platform_data = &vpu_platform_data,
},
.resource = vpu_resources,
.num_resources = ARRAY_SIZE(vpu_resources),
};

static struct uio_info veu_platform_data = {
.name = "VEU",
.version = "0",
.irq = 54,
};

static struct resource veu_resources[] = {
[0] = {
.name = "VEU",
.start = 0xfe920000,
.end = 0xfe9200b7,
.flags = IORESOURCE_MEM,
},
};

static struct platform_device veu_device = {
.name = "uio_pdrv_genirq",
.id = 1,
.dev = {
.platform_data = &veu_platform_data,
},
.resource = veu_resources,
.num_resources = ARRAY_SIZE(veu_resources),
};

static struct plat_sci_port sci_platform_data[] = {
{
.mapbase = 0xffe00000,
Expand Down Expand Up @@ -95,6 +146,8 @@ static struct platform_device *sh7722_devices[] __initdata = {
&usbf_device,
&iic_device,
&sci_device,
&vpu_device,
&veu_device,
};

static int __init sh7722_devices_setup(void)
Expand Down

0 comments on commit 9e38c6e

Please sign in to comment.