diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index 9eeff5c52..b5060bac1 100644
--- a/arch/arm/mach-clps711x/devices.c
+++ b/arch/arm/mach-clps711x/devices.c
@@ -121,13 +121,13 @@ coredevice_initcall(clps711x_gpio_init);
 static __init int clps711x_syscon_init(void)
 {
 	/* SYSCON1, SYSFLG1 */
-	add_generic_device("clps711x-syscon", 1, NULL, SYSCON1, SZ_128,
+	add_generic_device("syscon", 1, NULL, SYSCON1, SZ_128,
 			   IORESOURCE_MEM, NULL);
 	/* SYSCON2, SYSFLG2 */
-	add_generic_device("clps711x-syscon", 2, NULL, SYSCON2, SZ_128,
+	add_generic_device("syscon", 2, NULL, SYSCON2, SZ_128,
 			   IORESOURCE_MEM, NULL);
 	/* SYSCON3 */
-	add_generic_device("clps711x-syscon", 3, NULL, SYSCON3, SZ_64,
+	add_generic_device("syscon", 3, NULL, SYSCON3, SZ_64,
 			   IORESOURCE_MEM, NULL);
 
 	return 0;
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index 643734477..8fc84c34d 100644
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -92,9 +92,6 @@ static int syscon_probe(struct device_d *dev)
 
 static struct platform_device_id syscon_ids[] = {
 	{ "syscon", },
-#ifdef CONFIG_ARCH_CLPS711X
-	{ "clps711x-syscon", },
-#endif
 	{ }
 };
 
diff --git a/drivers/serial/serial_clps711x.c b/drivers/serial/serial_clps711x.c
index e43d14170..d8dec578c 100644
--- a/drivers/serial/serial_clps711x.c
+++ b/drivers/serial/serial_clps711x.c
@@ -110,7 +110,7 @@ static void clps711x_flush(struct console_device *cdev)
 static int clps711x_probe(struct device_d *dev)
 {
 	struct clps711x_uart *s;
-	char syscon_dev[18];
+	char syscon_dev[8];
 
 	BUG_ON(dev->num_resources != 2);
 	BUG_ON((dev->id != 0) && (dev->id != 1));
@@ -122,7 +122,7 @@ static int clps711x_probe(struct device_d *dev)
 	s->UBRLCR = dev_get_mem_region(dev, 0);
 	s->UARTDR = dev_get_mem_region(dev, 1);
 
-	sprintf(syscon_dev, "clps711x-syscon%i", dev->id + 1);
+	sprintf(syscon_dev, "syscon%i", dev->id + 1);
 	s->syscon = syscon_base_lookup_by_pdevname(syscon_dev);
 	BUG_ON(IS_ERR(s->syscon));