diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2014-01-23 21:22:05 +0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-24 23:10:04 +0100 |
| commit | 624454160b4b7d482e351d6d0feda69a015bcf8b (patch) | |
| tree | f043f13686cccebd5d950ef43850cf37e7e9ef23 /drivers | |
| parent | c2c5f48b91cdbb963bb50e77ae57dd6071cb3b92 (diff) | |
| download | barebox-624454160b4b7d482e351d6d0feda69a015bcf8b.tar.gz barebox-624454160b4b7d482e351d6d0feda69a015bcf8b.tar.xz | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/syscon.c | 3 | ||||
| -rw-r--r-- | drivers/serial/serial_clps711x.c | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c index 6437344775..8fc84c34d8 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 e43d141703..d8dec578ca 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)); |