diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-09-28 09:53:58 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 15:09:14 +0200 |
| commit | 8e6bca8255e39f169827b5988c0737f290ee7308 (patch) | |
| tree | b46704a3532e19b4556be9f93509dd03b1a7202a /arch/arm/mach-ux500/devices-db8500.c | |
| parent | 91606c1f3e602e5a519136556f07db04b77433d1 (diff) | |
mach-ux500: Change device names for ux500
Fix the device names to they dont collide for u5500
and u8500. This way they can be built in the same build.
Change-Id: I4e109532c7ff58fc6d75792378ec782a8ac52f26
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'arch/arm/mach-ux500/devices-db8500.c')
| -rw-r--r-- | arch/arm/mach-ux500/devices-db8500.c | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c index 266196f1810..94353bc0c9f 100644 --- a/arch/arm/mach-ux500/devices-db8500.c +++ b/arch/arm/mach-ux500/devices-db8500.c @@ -207,7 +207,7 @@ static int mcde_platform_set_display_clocks(void) return prcmu_set_display_clocks(); } -static struct mcde_platform_data mcde_pdata = { +static struct mcde_platform_data mcde_u8500_pdata = { .num_dsilinks = 3, /* * [0] = 3: 24 bits DPI: connect LSB Ch B to D[0:7] @@ -238,11 +238,11 @@ static struct mcde_platform_data mcde_pdata = { .platform_disable_dsipll = mcde_platform_disable_dsipll, }; -struct platform_device ux500_mcde_device = { +struct platform_device u8500_mcde_device = { .name = "mcde", .id = -1, .dev = { - .platform_data = &mcde_pdata, + .platform_data = &mcde_u8500_pdata, }, .num_resources = ARRAY_SIZE(mcde_resources), .resource = mcde_resources, @@ -263,7 +263,7 @@ static struct resource b2r2_resources[] = { }, }; -struct platform_device ux500_b2r2_device = { +struct platform_device u8500_b2r2_device = { .name = "b2r2", .id = 0, .dev = { @@ -274,8 +274,32 @@ struct platform_device ux500_b2r2_device = { .resource = b2r2_resources, }; +/* + * WATCHDOG + */ + +static struct resource u8500_wdt_resources[] = { + [0] = { + .start = U8500_TWD_BASE, + .end = U8500_TWD_BASE+0x37, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = IRQ_LOCALWDOG, + .end = IRQ_LOCALWDOG, + .flags = IORESOURCE_IRQ, + } +}; + struct platform_device u8500_wdt_device = { - .name = "u8500_wdt", + .name = "mpcore_wdt", + .id = -1, + .resource = u8500_wdt_resources, + .num_resources = ARRAY_SIZE(u8500_wdt_resources), +}; + +struct platform_device u8500_prcmu_wdt_device = { + .name = "ux500_wdt", .id = -1, }; @@ -415,7 +439,7 @@ static struct resource u8500_thsens_resources[] = { }, }; -struct platform_device ux500_thsens_device = { +struct platform_device u8500_thsens_device = { .name = "dbx500_temp", .resource = u8500_thsens_resources, .num_resources = ARRAY_SIZE(u8500_thsens_resources), @@ -616,7 +640,7 @@ static struct stm_platform_data stm_pdata = { .stm_connection = stm_ste_connection, }; -struct platform_device ux500_stm_device = { +struct platform_device u8500_stm_device = { .name = "stm", .id = -1, .dev = { |