sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM: clps711x: Remove the special name for the 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: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Alexander Shiyan 2014-01-23 21:22:05 +04:00 committed by Sascha Hauer
parent c2c5f48b91
commit 624454160b
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-clps711x/devices.c
View File

@ -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;

3
drivers/mfd/syscon.c
View File

@ -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
{ }
};

4
drivers/serial/serial_clps711x.c
View File

@ -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));