[PATCH 1/4] console: Allow persistent device names

Sascha Hauer s.hauer at pengutronix.de
Fri Jul 11 01:02:10 PDT 2014


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 <s.hauer at pengutronix.de>
---
 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 aa9e3ce..f982366 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 6da0199..7535a56 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;
-- 
2.0.0




More information about the barebox mailing list