diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:18 +0200 |
| commit | 90118343e46fecac78b6351ce25bb610b15fc077 (patch) | |
| tree | 06f596eedd8fa95c96320a8e185c86a1f33cf5fa /drivers | |
| parent | 3522192d6da091dfae912a28ed9377913b596299 (diff) | |
| parent | c053e2414c2a6c2de81cbbc4e49933042613191b (diff) | |
| download | barebox-90118343e46fecac78b6351ce25bb610b15fc077.tar.gz barebox-90118343e46fecac78b6351ce25bb610b15fc077.tar.xz | |
Merge branch 'for-next/console'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/serial_imx.c | 4 | ||||
| -rw-r--r-- | drivers/usb/gadget/u_serial.c | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index cb106271d5..474bfafff0 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -313,6 +313,7 @@ static int imx_serial_probe(struct device_d *dev) uint32_t val; struct imx_serial_devtype_data *devtype; int ret; + const char *devname; ret = dev_get_drvdata(dev, (unsigned long *)&devtype); if (ret) @@ -337,6 +338,9 @@ static int imx_serial_probe(struct device_d *dev) cdev->flush = imx_serial_flush; cdev->setbrg = imx_serial_setbaudrate; cdev->linux_console_name = "ttymxc"; + devname = of_alias_get(dev->device_node); + if (devname) + cdev->devname = xstrdup(devname); imx_serial_init_port(cdev); diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index c2072dc6e9..375ec65141 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c @@ -483,7 +483,12 @@ int gserial_connect(struct gserial *gser, u8 port_num) cdev->getc = serial_getc; cdev->flush = serial_flush; cdev->setbrg = serial_setbaudrate; - console_register(cdev); + cdev->devname = "usbserial"; + + status = console_register(cdev); + if (status) + goto fail_out; + mycdev = cdev; return status; |