From 9c4f107c35a77c12a70f5b9aa36600a75b93b358 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 8 Jul 2014 15:02:53 +0200 Subject: console: Allow persistent device names Add a devname field to struct console_device so that the device name can be set by the driver. This makes it possible to have persistent device names. Signed-off-by: Sascha Hauer --- common/console.c | 10 ++++++++-- include/console.h | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/console.c b/common/console.c index aa9e3ce0f5..f9823661f0 100644 --- a/common/console.c +++ b/common/console.c @@ -170,8 +170,14 @@ int console_register(struct console_device *newcdev) if (initialized == CONSOLE_UNINITIALIZED) console_init_early(); - dev->id = DEVICE_ID_DYNAMIC; - strcpy(dev->name, "cs"); + if (newcdev->devname) { + dev->id = DEVICE_ID_SINGLE; + strcpy(dev->name, newcdev->devname); + } else { + dev->id = DEVICE_ID_DYNAMIC; + strcpy(dev->name, "cs"); + } + if (newcdev->dev) dev->parent = newcdev->dev; platform_device_register(dev); diff --git a/include/console.h b/include/console.h index 6da0199aba..7535a56121 100644 --- a/include/console.h +++ b/include/console.h @@ -44,6 +44,8 @@ struct console_device { void (*flush)(struct console_device *cdev); int (*set_mode)(struct console_device *cdev, enum console_mode mode); + char *devname; + struct list_head list; unsigned char f_active; -- cgit v1.2.3