Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 358841
b: refs/heads/master
c: 9a27dee
h: refs/heads/master
i:
  358839: 4a9d2d5
v: v3
  • Loading branch information
Hideki EIRAKU authored and Joerg Roedel committed Feb 6, 2013
1 parent 403e806 commit 3bcd3ab
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: 3cfb8439e4799896eae22743463f11fb0cc2f0a4
refs/heads/master: 9a27dee73f558a026e9bbfb5f8af6ae7ba6b7bdc
31 changes: 31 additions & 0 deletions trunk/arch/arm/mach-shmobile/setup-sh73a0.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <linux/sh_dma.h>
#include <linux/sh_intc.h>
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <mach/dma-register.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
Expand Down Expand Up @@ -754,6 +755,35 @@ static struct platform_device pmu_device = {
.resource = pmu_resources,
};

/* an IPMMU module for ICB */
static struct resource ipmmu_resources[] = {
[0] = {
.name = "IPMMU",
.start = 0xfe951000,
.end = 0xfe9510ff,
.flags = IORESOURCE_MEM,
},
};

static const char * const ipmmu_dev_names[] = {
"sh_mobile_lcdc_fb.0",
};

static struct shmobile_ipmmu_platform_data ipmmu_platform_data = {
.dev_names = ipmmu_dev_names,
.num_dev_names = ARRAY_SIZE(ipmmu_dev_names),
};

static struct platform_device ipmmu_device = {
.name = "ipmmu",
.id = -1,
.dev = {
.platform_data = &ipmmu_platform_data,
},
.resource = ipmmu_resources,
.num_resources = ARRAY_SIZE(ipmmu_resources),
};

static struct platform_device *sh73a0_early_devices[] __initdata = {
&scif0_device,
&scif1_device,
Expand All @@ -767,6 +797,7 @@ static struct platform_device *sh73a0_early_devices[] __initdata = {
&cmt10_device,
&tmu00_device,
&tmu01_device,
&ipmmu_device,
};

static struct platform_device *sh73a0_late_devices[] __initdata = {
Expand Down

0 comments on commit 3bcd3ab

Please sign in to comment.