Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 120166
b: refs/heads/master
c: 7d91fcf
h: refs/heads/master
v: v3
  • Loading branch information
Takanari Hayama authored and Paul Mundt committed Dec 22, 2008
1 parent 1aaafaa commit eb1dfd6
Show file tree
Hide file tree
Showing 2 changed files with 32 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: b0c50ad71746c4ad148f366135e3c87e32729108
refs/heads/master: 7d91fcfcb91dde7bc4586154942862c1724b3519
31 changes: 31 additions & 0 deletions trunk/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,34 @@ static struct platform_device veu_device = {
.num_resources = ARRAY_SIZE(veu_resources),
};

static struct uio_info jpu_platform_data = {
.name = "JPU",
.version = "0",
.irq = 27,
};

static struct resource jpu_resources[] = {
[0] = {
.name = "JPU",
.start = 0xfea00000,
.end = 0xfea102d0,
.flags = IORESOURCE_MEM,
},
[1] = {
/* place holder for contiguous memory */
},
};

static struct platform_device jpu_device = {
.name = "uio_pdrv_genirq",
.id = 2,
.dev = {
.platform_data = &jpu_platform_data,
},
.resource = jpu_resources,
.num_resources = ARRAY_SIZE(jpu_resources),
};

static struct plat_sci_port sci_platform_data[] = {
{
.mapbase = 0xffe00000,
Expand Down Expand Up @@ -187,6 +215,7 @@ static struct platform_device *sh7722_devices[] __initdata = {
&sci_device,
&vpu_device,
&veu_device,
&jpu_device,
};

static int __init sh7722_devices_setup(void)
Expand All @@ -196,9 +225,11 @@ static int __init sh7722_devices_setup(void)
clk_always_enable("rtc0"); /* RTC */
clk_always_enable("veu0"); /* VEU */
clk_always_enable("vpu0"); /* VPU */
clk_always_enable("jpu0"); /* JPU */

platform_resource_setup_memory(&vpu_device, "vpu", 1 << 20);
platform_resource_setup_memory(&veu_device, "veu", 2 << 20);
platform_resource_setup_memory(&jpu_device, "jpu", 2 << 20);

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

0 comments on commit eb1dfd6

Please sign in to comment.