aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Cai <R63905@freescale.com>2010-07-28 15:49:49 +0800
committerRobby Cai <R63905@freescale.com>2010-07-28 17:32:02 +0800
commita1a5cef4f7e2cb2db0a67d76c4b33f1d688207ff (patch)
tree078ebba74eee81aae099362fa59a44bd4ace37a4
parent441fd8dfa4e468772d35c69c5289fb81556073a6 (diff)
ENGR00125657-1 [MX50] Add VIIM driver support
Add VIIM driver support -- MSL part Signed-off-by: Robby Cai <R63905@freescale.com>
-rw-r--r--arch/arm/mach-mx5/devices.c19
-rw-r--r--arch/arm/mach-mx5/devices.h1
-rw-r--r--arch/arm/mach-mx5/mx50_arm2.c1
3 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c
index e8db7963c2a..d9a425880f2 100644
--- a/arch/arm/mach-mx5/devices.c
+++ b/arch/arm/mach-mx5/devices.c
@@ -1266,6 +1266,25 @@ struct platform_device mxc_v4l2out_device = {
.id = 0,
};
+struct resource viim_resources[] = {
+ [0] = {
+ .start = (GPT1_BASE_ADDR - 0x20000000),
+ .end = (GPT1_BASE_ADDR - 0x20000000) + PAGE_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+ [1] = {
+ .start = OCOTP_CTRL_BASE_ADDR,
+ .end = OCOTP_CTRL_BASE_ADDR + PAGE_SIZE - 1,
+ .flags = IORESOURCE_MEM,
+ },
+};
+struct platform_device mxs_viim = {
+ .name = "mxs_viim",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(viim_resources),
+ .resource = viim_resources,
+};
+
void __init mx5_init_irq(void)
{
unsigned long tzic_addr;
diff --git a/arch/arm/mach-mx5/devices.h b/arch/arm/mach-mx5/devices.h
index b61ebcba22a..e91cbf02fe1 100644
--- a/arch/arm/mach-mx5/devices.h
+++ b/arch/arm/mach-mx5/devices.h
@@ -72,3 +72,4 @@ extern struct platform_device epdc_device;
extern struct platform_device elcdif_device;
extern struct platform_device mxc_v4l2_device;
extern struct platform_device mxc_v4l2out_device;
+extern struct platform_device mxs_viim;
diff --git a/arch/arm/mach-mx5/mx50_arm2.c b/arch/arm/mach-mx5/mx50_arm2.c
index d9e37be9aa5..d91aefe710c 100644
--- a/arch/arm/mach-mx5/mx50_arm2.c
+++ b/arch/arm/mach-mx5/mx50_arm2.c
@@ -765,6 +765,7 @@ static void __init mxc_board_init(void)
mxc_register_device(&epdc_device, NULL);
mxc_register_device(&lcd_wvga_device, &lcd_wvga_data);
mxc_register_device(&elcdif_device, &fb_data[0]);
+ mxc_register_device(&mxs_viim, NULL);
mx50_arm2_init_mc13892();
/*