5 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 7bd012d39a7..ce1cfef9fd2 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -798,8 +798,8 @@ static struct platform_device *mop500_platform_devs[] __initdata = {
 	&ux500_mmio_device,
 #endif
 	&ux500_hwmem_device,
-	&u8500_mcde_device,
-	&u8500_b2r2_device,
+	&ux500_mcde_device,
+	&ux500_b2r2_device,
 	&u8500_thsens_device,
 #ifdef CONFIG_STE_TRACE_MODEM
 	&u8500_trace_modem,
@@ -1023,8 +1023,8 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
 	&snowball_led_dev,
 	&snowball_key_dev,
 	&snowball_sbnet_dev,
-	&u8500_mcde_device,
-	&u8500_b2r2_device,
+	&ux500_mcde_device,
+	&ux500_b2r2_device,
 };
 
 /*
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index 4384bb03de4..f56a87e810b 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -358,9 +358,9 @@ static struct platform_device u5500_mloader_device = {
 
 static struct platform_device *u5500_platform_devices[] __initdata = {
 	&u5500_ab5500_device,
-	&u5500_mcde_device,
+	&ux500_mcde_device,
 	&ux500_hwmem_device,
-	&u5500_b2r2_device,
+	&ux500_b2r2_device,
 	&u5500_mloader_device,
 #ifdef CONFIG_U5500_MMIO
 	&u5500_mmio_device,
diff --git a/arch/arm/mach-ux500/devices-db5500.c b/arch/arm/mach-ux500/devices-db5500.c
index f6391460f8c..593852a2098 100644
--- a/arch/arm/mach-ux500/devices-db5500.c
+++ b/arch/arm/mach-ux500/devices-db5500.c
@@ -217,7 +217,7 @@ static struct mcde_platform_data mcde_pdata = {
 	.platform_disable_dsipll = mcde_platform_disable_dsipll,
 };
 
-struct platform_device u5500_mcde_device = {
+struct platform_device ux500_mcde_device = {
 	.name = "mcde",
 	.id = -1,
 	.dev = {
@@ -242,7 +242,7 @@ static struct resource b2r2_resources[] = {
 	},
 };
 
-struct platform_device u5500_b2r2_device = {
+struct platform_device ux500_b2r2_device = {
 	.name	= "b2r2",
 	.id	= 0,
 	.dev	= {
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 3cf6b4340ee..cd432240fce 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -226,7 +226,7 @@ static struct mcde_platform_data mcde_pdata = {
 	.platform_disable_dsipll = mcde_platform_disable_dsipll,
 };
 
-struct platform_device u8500_mcde_device = {
+struct platform_device ux500_mcde_device = {
 	.name = "mcde",
 	.id = -1,
 	.dev = {
@@ -251,7 +251,7 @@ static struct resource b2r2_resources[] = {
 	},
 };
 
-struct platform_device u8500_b2r2_device = {
+struct platform_device ux500_b2r2_device = {
 	.name	= "b2r2",
 	.id	= 0,
 	.dev	= {
diff --git a/arch/arm/mach-ux500/include/mach/devices.h b/arch/arm/mach-ux500/include/mach/devices.h
index 1d2becf288e..70caa794fa6 100644
--- a/arch/arm/mach-ux500/include/mach/devices.h
+++ b/arch/arm/mach-ux500/include/mach/devices.h
@@ -13,11 +13,11 @@ struct amba_device;
 extern struct platform_device u5500_gpio_devs[];
 extern struct platform_device u8500_gpio_devs[];
 
-extern struct platform_device u8500_mcde_device;
-extern struct platform_device u5500_mcde_device;
+extern struct platform_device ux500_mcde_device;
+extern struct platform_device ux500_mcde_device;
 extern struct platform_device u8500_shrm_device;
-extern struct platform_device u8500_b2r2_device;
-extern struct platform_device u5500_b2r2_device;
+extern struct platform_device ux500_b2r2_device;
+extern struct platform_device ux500_b2r2_device;
 extern struct platform_device u8500_trace_modem;
 extern struct platform_device ux500_hwmem_device;
 extern struct amba_device ux500_pl031_device;