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>

6 files changed, 51 insertions, 26 deletions

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 04682a2c6ff..0ece1e4f1d8 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -888,9 +888,9 @@ static struct platform_device *mop500_platform_devs[] __initdata = {
 	&ux500_mmio_device,
 #endif
 	&ux500_hwmem_device,
-	&ux500_mcde_device,
-	&ux500_b2r2_device,
-	&ux500_thsens_device,
+	&u8500_mcde_device,
+	&u8500_b2r2_device,
+	&u8500_thsens_device,
 #ifdef CONFIG_STE_TRACE_MODEM
 	&u8500_trace_modem,
 #endif
@@ -1125,8 +1125,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
 	&snowball_led_dev,
 	&snowball_key_dev,
 	&snowball_sbnet_dev,
-	&ux500_mcde_device,
-	&ux500_b2r2_device,
+	&u8500_mcde_device,
+	&u8500_b2r2_device,
 };
 
 /*
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index 10f9bc3abcd..533f95ce2bd 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -527,14 +527,14 @@ static struct hash_platform_data u5500_hash1_platform_data = {
 
 static struct platform_device *u5500_platform_devices[] __initdata = {
 	&u5500_ab5500_device,
-	&ux500_mcde_device,
+	&u5500_mcde_device,
 	&ux500_hwmem_device,
-	&ux500_b2r2_device,
+	&u5500_b2r2_device,
 	&u5500_mloader_device,
 #ifdef CONFIG_U5500_MMIO
 	&u5500_mmio_device,
 #endif
-	&ux500_thsens_device,
+	&u5500_thsens_device,
 };
 
 /*
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index d2def0828a6..6a6753e4965 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -167,7 +167,7 @@ void __init u8500_init_devices(void)
 
 #ifdef CONFIG_STM_TRACE
 	/* Early init for STM tracing */
-	platform_device_register(&ux500_stm_device);
+	platform_device_register(&u8500_stm_device);
 #endif
 
 	db8500_dma_init();
diff --git a/arch/arm/mach-ux500/devices-db5500.c b/arch/arm/mach-ux500/devices-db5500.c
index 18e0c6fbde4..8572510217f 100644
--- a/arch/arm/mach-ux500/devices-db5500.c
+++ b/arch/arm/mach-ux500/devices-db5500.c
@@ -218,7 +218,7 @@ static struct mcde_platform_data mcde_pdata = {
 	.platform_disable_dsipll = mcde_platform_disable_dsipll,
 };
 
-struct platform_device ux500_mcde_device = {
+struct platform_device u5500_mcde_device = {
 	.name = "mcde",
 	.id = -1,
 	.dev = {
@@ -243,7 +243,7 @@ static struct resource b2r2_resources[] = {
 	},
 };
 
-struct platform_device ux500_b2r2_device = {
+struct platform_device u5500_b2r2_device = {
 	.name	= "b2r2",
 	.id	= 0,
 	.dev	= {
@@ -269,8 +269,8 @@ static struct resource u5500_thsens_resources[] = {
 	},
 };
 
-struct platform_device ux500_thsens_device = {
-	.name           = "dbx500_temp",
+struct platform_device u5500_thsens_device = {
+	.name           = "db5500_temp",
 	.resource       = u5500_thsens_resources,
 	.num_resources  = ARRAY_SIZE(u5500_thsens_resources),
 };
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 = {
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h
index 212660f1aba..27e6b5faaa0 100644
--- a/arch/arm/mach-ux500/include/mach/devices.h
+++ b/arch/arm/mach-ux500/include/mach/devices.h
@@ -13,19 +13,20 @@ struct amba_device;
 extern struct platform_device u5500_gpio_devs[];
 extern struct platform_device u8500_gpio_devs[];
 
-extern struct platform_device ux500_mcde_device;
-extern struct platform_device ux500_mcde_device;
+extern struct platform_device u8500_mcde_device;
+extern struct platform_device u5500_mcde_device;
 extern struct platform_device u8500_shrm_device;
-extern struct platform_device ux500_b2r2_device;
-extern struct platform_device ux500_b2r2_device;
+extern struct platform_device u8500_b2r2_device;
+extern struct platform_device u5500_b2r2_device;
 extern struct platform_device u8500_trace_modem;
 extern struct platform_device ux500_hwmem_device;
-extern struct platform_device ux500_stm_device;
+extern struct platform_device u8500_stm_device;
 extern struct amba_device ux500_pl031_device;
 extern struct platform_device ux500_hash1_device;
 extern struct platform_device ux500_cryp1_device;
 extern struct platform_device mloader_fw_device;
-extern struct platform_device ux500_thsens_device;
+extern struct platform_device u5500_thsens_device;
+extern struct platform_device u8500_thsens_device;
 extern struct platform_device ux500_ske_keypad_device;
 extern struct platform_device u8500_wdt_device;
 extern struct platform_device u8500_hsi_device;