From: Alexander Shiyan Date: Thu, 18 Jul 2013 18:34:52 +0000 (+0400) Subject: ARM: clps711x: Remove the special name for the syscon driver X-Git-Tag: v3.12-rc1~118^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5104d2656d4874c51868dc7182016e9501ec99ca;p=thirdparty%2Flinux.git 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 Signed-off-by: Olof Johansson --- diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c index 856b81cf2f8a5..fb77d1448fec8 100644 --- 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 1a31512369f9a..962a6e17a01a1 100644 --- 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 { } };