Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 146617
b: refs/heads/master
c: cd5b9ef
h: refs/heads/master
i:
  146615: c771186
v: v3
  • Loading branch information
Kuninori Morimoto authored and Paul Mundt committed Apr 16, 2009
1 parent 5181235 commit e762b3e
Show file tree
Hide file tree
Showing 2 changed files with 34 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: 40c7e8be556715079d0a9d7454ceb5371a2f0b39
refs/heads/master: cd5b9ef776feff440e7a889d1a565ceabfecbfa1
33 changes: 33 additions & 0 deletions trunk/arch/sh/kernel/cpu/sh4a/setup-sh7724.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,49 @@ static struct platform_device iic1_device = {
.resource = iic1_resources,
};

/* VPU */
static struct uio_info vpu_platform_data = {
.name = "VPU5F",
.version = "0",
.irq = 60,
};

static struct resource vpu_resources[] = {
[0] = {
.name = "VPU",
.start = 0xfe900000,
.end = 0xfe902807,
.flags = IORESOURCE_MEM,
},
[1] = {
/* place holder for contiguous memory */
},
};

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 platform_device *sh7724_devices[] __initdata = {
&sci_device,
&rtc_device,
&iic0_device,
&iic1_device,
&vpu_device,
};

static int __init sh7724_devices_setup(void)
{
clk_always_enable("rtc0"); /* RTC */
clk_always_enable("vpu0"); /* VPU */

platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20);

return platform_add_devices(sh7724_devices,
ARRAY_SIZE(sh7724_devices));
Expand Down

0 comments on commit e762b3e

Please sign in to comment.