ARM: clps711x: Remove the special name for the syscon driver

This is a partial revert of the patch:
"6597619f9c ARM: clps711x: Add support for SYSCON driver".
No reason to make SYSCON driver name unique to that processor.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index 856b81c..fb77d14 100644 (file)
--- a/arch/arm/mach-clps711x/devices.c
+++ b/arch/arm/mach-clps711x/devices.c
@@ -57,7 +57,7 @@ static void __init clps711x_add_syscon(void)
        unsigned i;
 
        for (i = 0; i < ARRAY_SIZE(clps711x_syscon_res); i++)
-               platform_device_register_simple("clps711x-syscon", i + 1,
+               platform_device_register_simple("syscon", i + 1,
                                                &clps711x_syscon_res[i], 1);
 }
 

diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index 1a31512..962a6e1 100644 (file)
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -159,9 +159,6 @@ static int syscon_probe(struct platform_device *pdev)
 
 static const struct platform_device_id syscon_ids[] = {
        { "syscon", },
-#ifdef CONFIG_ARCH_CLPS711X
-       { "clps711x-syscon", },
-#endif
        { }
 };