diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 07:59:18 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 07:59:18 +0200 |
commit | 574947ef76428803c3a2cbe8a02f294e3227d8e0 (patch) | |
tree | 20ef37824aa8b169faf6cb87868aa7de912811a8 /drivers | |
parent | fb0c2ee1ae85b9f5127c37e604b92899a907082c (diff) | |
parent | 6a5121f74894ed2d3514b59bd287d126eb7f1488 (diff) | |
download | barebox-574947ef76428803c3a2cbe8a02f294e3227d8e0.tar.gz barebox-574947ef76428803c3a2cbe8a02f294e3227d8e0.tar.xz |
Merge branch 'for-next/console'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/gpio_keys.c | 1 | ||||
-rw-r--r-- | drivers/input/imx_keypad.c | 1 | ||||
-rw-r--r-- | drivers/input/qt1070.c | 1 | ||||
-rw-r--r-- | drivers/input/twl6030_pwrbtn.c | 1 | ||||
-rw-r--r-- | drivers/serial/amba-pl011.c | 5 | ||||
-rw-r--r-- | drivers/serial/arm_dcc.c | 1 | ||||
-rw-r--r-- | drivers/serial/atmel.c | 3 | ||||
-rw-r--r-- | drivers/serial/linux_console.c | 10 | ||||
-rw-r--r-- | drivers/serial/serial_altera.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_altera_jtag.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_auart.c | 2 | ||||
-rw-r--r-- | drivers/serial/serial_blackfin.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_cadence.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_clps711x.c | 4 | ||||
-rw-r--r-- | drivers/serial/serial_imx.c | 2 | ||||
-rw-r--r-- | drivers/serial/serial_mpc5xxx.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_netx.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_ns16550.c | 3 | ||||
-rw-r--r-- | drivers/serial/serial_omap4_usbboot.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_pl010.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_pxa.c | 1 | ||||
-rw-r--r-- | drivers/serial/serial_s3c.c | 1 | ||||
-rw-r--r-- | drivers/serial/stm-serial.c | 1 | ||||
-rw-r--r-- | drivers/usb/gadget/u_serial.c | 1 |
24 files changed, 6 insertions, 40 deletions
diff --git a/drivers/input/gpio_keys.c b/drivers/input/gpio_keys.c index b43911149e..18a29f0e94 100644 --- a/drivers/input/gpio_keys.c +++ b/drivers/input/gpio_keys.c @@ -95,7 +95,6 @@ static int __init gpio_keys_probe(struct device_d *dev) cdev = &pdata->cdev; dev->type_data = cdev; cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN; cdev->tstc = gpio_keys_tstc; cdev->getc = gpio_keys_getc; diff --git a/drivers/input/imx_keypad.c b/drivers/input/imx_keypad.c index 2ee3d0fa00..e6870dfcc2 100644 --- a/drivers/input/imx_keypad.c +++ b/drivers/input/imx_keypad.c @@ -441,7 +441,6 @@ static int __init imx_keypad_probe(struct device_d *dev) cdev->dev = dev; cdev->tstc = imx_keypad_tstc; cdev->getc = imx_keypad_getc; - cdev->f_caps = CONSOLE_STDIN; cdev->f_active = CONSOLE_STDIN; console_register(&keypad->cdev); diff --git a/drivers/input/qt1070.c b/drivers/input/qt1070.c index ada330a6d2..7b72965df7 100644 --- a/drivers/input/qt1070.c +++ b/drivers/input/qt1070.c @@ -265,7 +265,6 @@ static int qt1070_probe(struct device_d *dev) cdev = &data->cdev; cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN; cdev->tstc = qt1070_tstc; cdev->getc = qt1070_getc; diff --git a/drivers/input/twl6030_pwrbtn.c b/drivers/input/twl6030_pwrbtn.c index ca51dee605..fc4c728778 100644 --- a/drivers/input/twl6030_pwrbtn.c +++ b/drivers/input/twl6030_pwrbtn.c @@ -93,7 +93,6 @@ static int __init twl6030_pwrbtn_probe(struct device_d *dev) dev->type_data = &idata->cdev; idata->cdev.dev = dev; - idata->cdev.f_caps = CONSOLE_STDIN; idata->cdev.tstc = twl6030_pwrbtn_tstc; idata->cdev.getc = twl6030_pwrbtn_getc; console_register(&idata->cdev); diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 0e075880e0..fc7723ea8a 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c @@ -164,10 +164,6 @@ int pl011_init_port (struct console_device *cdev) uart->uartclk = clk_get_rate(uart->clk); /* - * set baud rate - */ - pl011_setbaudrate(cdev, 115200); - /* ** Set the UART to be 8 bits, 1 stop bit, no parity, fifo enabled. */ pl011_rlcr(uart, UART01x_LCRH_WLEN_8 | UART01x_LCRH_FEN); @@ -196,7 +192,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id) cdev = &uart->uart; cdev->dev = &dev->dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = pl011_tstc; cdev->putc = pl011_putc; cdev->getc = pl011_getc; diff --git a/drivers/serial/arm_dcc.c b/drivers/serial/arm_dcc.c index bab72990df..e5f2bbe5e2 100644 --- a/drivers/serial/arm_dcc.c +++ b/drivers/serial/arm_dcc.c @@ -133,7 +133,6 @@ static int arm_dcc_probe(struct device_d *dev) cdev = &arm_dcc_dev; cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = arm_dcc_tstc; cdev->putc = arm_dcc_putc; cdev->getc = arm_dcc_getc; diff --git a/drivers/serial/atmel.c b/drivers/serial/atmel.c index 89c141eafe..8392e78ce3 100644 --- a/drivers/serial/atmel.c +++ b/drivers/serial/atmel.c @@ -379,8 +379,6 @@ static int atmel_serial_init_port(struct console_device *cdev) writel(USART3_BIT(RSTRX) | USART3_BIT(RSTTX), uart->base + USART3_CR); - atmel_serial_setbaudrate(cdev, 115200); - writel(USART3_BIT(RXEN) | USART3_BIT(TXEN), uart->base + USART3_CR); writel((USART3_BF(USART_MODE, USART3_USART_MODE_NORMAL) | USART3_BF(USCLKS, USART3_USCLKS_MCK) @@ -399,7 +397,6 @@ static int atmel_serial_probe(struct device_d *dev) uart = xzalloc(sizeof(struct atmel_uart_port)); cdev = &uart->uart; cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = atmel_serial_tstc; cdev->putc = atmel_serial_putc; cdev->getc = atmel_serial_getc; diff --git a/drivers/serial/linux_console.c b/drivers/serial/linux_console.c index 7ded091790..760b3b81fe 100644 --- a/drivers/serial/linux_console.c +++ b/drivers/serial/linux_console.c @@ -64,10 +64,12 @@ static int linux_console_probe(struct device_d *dev) cdev = xzalloc(sizeof(struct console_device)); cdev->dev = dev; - cdev->f_caps = data->flags; - cdev->tstc = linux_console_tstc; - cdev->putc = linux_console_putc; - cdev->getc = linux_console_getc; + if (data->stdinfd >= 0) { + cdev->tstc = linux_console_tstc; + cdev->getc = linux_console_getc; + } + if (data->stdoutfd >= 0) + cdev->putc = linux_console_putc; console_register(cdev); diff --git a/drivers/serial/serial_altera.c b/drivers/serial/serial_altera.c index 7ff38d7f1d..d519a87928 100644 --- a/drivers/serial/serial_altera.c +++ b/drivers/serial/serial_altera.c @@ -86,7 +86,6 @@ static int altera_serial_probe(struct device_d *dev) priv->regs = dev_request_mem_region(dev, 0); cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = altera_serial_tstc; cdev->putc = altera_serial_putc; cdev->getc = altera_serial_getc; diff --git a/drivers/serial/serial_altera_jtag.c b/drivers/serial/serial_altera_jtag.c index edc3c768dd..4219a4bbb9 100644 --- a/drivers/serial/serial_altera_jtag.c +++ b/drivers/serial/serial_altera_jtag.c @@ -91,7 +91,6 @@ static int altera_serial_jtag_probe(struct device_d *dev) { priv->regs = dev_request_mem_region(dev, 0); cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = altera_serial_jtag_tstc; cdev->putc = altera_serial_jtag_putc; cdev->getc = altera_serial_jtag_getc; diff --git a/drivers/serial/serial_auart.c b/drivers/serial/serial_auart.c index 0e1ab83f21..19805166bb 100644 --- a/drivers/serial/serial_auart.c +++ b/drivers/serial/serial_auart.c @@ -187,7 +187,6 @@ static int auart_serial_probe(struct device_d *dev) priv = xzalloc(sizeof *priv); cdev = &priv->cdev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = auart_serial_tstc; cdev->putc = auart_serial_putc; cdev->getc = auart_serial_getc; @@ -202,7 +201,6 @@ static int auart_serial_probe(struct device_d *dev) return PTR_ERR(priv->clk); auart_serial_init_port(priv); - auart_serial_setbaudrate(cdev, CONFIG_BAUDRATE); /* Disable RTS/CTS, enable Rx, Tx, UART */ writel(BM_UARTAPP_CTRL2_RTSEN | BM_UARTAPP_CTRL2_CTSEN | diff --git a/drivers/serial/serial_blackfin.c b/drivers/serial/serial_blackfin.c index 7373a03775..2122226734 100644 --- a/drivers/serial/serial_blackfin.c +++ b/drivers/serial/serial_blackfin.c @@ -113,7 +113,6 @@ static int blackfin_serial_probe(struct device_d *dev) cdev = xzalloc(sizeof(struct console_device)); cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = blackfin_serial_tstc; cdev->putc = blackfin_serial_putc; cdev->getc = blackfin_serial_getc; diff --git a/drivers/serial/serial_cadence.c b/drivers/serial/serial_cadence.c index c29c391023..a1b76d07dc 100644 --- a/drivers/serial/serial_cadence.c +++ b/drivers/serial/serial_cadence.c @@ -246,7 +246,6 @@ static int cadence_serial_probe(struct device_d *dev) } cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = cadence_serial_tstc; cdev->putc = cadence_serial_putc; cdev->getc = cadence_serial_getc; diff --git a/drivers/serial/serial_clps711x.c b/drivers/serial/serial_clps711x.c index ffbb6f80b3..e43d141703 100644 --- a/drivers/serial/serial_clps711x.c +++ b/drivers/serial/serial_clps711x.c @@ -58,9 +58,6 @@ static void clps711x_init_port(struct console_device *cdev) tmp |= UBRLCR_FIFOEN | UBRLCR_WRDLEN8; /* FIFO on, 8N1 mode */ writel(tmp, s->UBRLCR); - /* Set default baudrate on initialization */ - clps711x_setbaudrate(cdev, CONFIG_BAUDRATE); - /* Enable the UART */ writel(readl(SYSCON(s)) | SYSCON_UARTEN, SYSCON(s)); } @@ -131,7 +128,6 @@ static int clps711x_probe(struct device_d *dev) dev->priv = s; s->cdev.dev = dev; - s->cdev.f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; s->cdev.tstc = clps711x_tstc; s->cdev.putc = clps711x_putc; s->cdev.getc = clps711x_getc; diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 8553c2e6af..01c7cc7fea 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -330,7 +330,6 @@ static int imx_serial_probe(struct device_d *dev) priv->regs = dev_request_mem_region(dev, 0); cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = imx_serial_tstc; cdev->putc = imx_serial_putc; cdev->getc = imx_serial_getc; @@ -338,7 +337,6 @@ static int imx_serial_probe(struct device_d *dev) cdev->setbrg = imx_serial_setbaudrate; imx_serial_init_port(cdev); - imx_serial_setbaudrate(cdev, 115200); /* Enable UART */ val = readl(priv->regs + UCR1); diff --git a/drivers/serial/serial_mpc5xxx.c b/drivers/serial/serial_mpc5xxx.c index 532eea3e5f..18aca8736d 100644 --- a/drivers/serial/serial_mpc5xxx.c +++ b/drivers/serial/serial_mpc5xxx.c @@ -149,7 +149,6 @@ static int mpc5xxx_serial_probe(struct device_d *dev) cdev = xzalloc(sizeof(struct console_device)); dev->priv = dev_request_mem_region(dev, 0); cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = mpc5xxx_serial_tstc; cdev->putc = mpc5xxx_serial_putc; cdev->getc = mpc5xxx_serial_getc; diff --git a/drivers/serial/serial_netx.c b/drivers/serial/serial_netx.c index 037b9980ba..c659cfaaf3 100644 --- a/drivers/serial/serial_netx.c +++ b/drivers/serial/serial_netx.c @@ -138,7 +138,6 @@ static int netx_serial_probe(struct device_d *dev) cdev = xzalloc(sizeof(struct console_device)); dev->priv = dev_request_mem_region(dev, 0); cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = netx_serial_tstc; cdev->putc = netx_serial_putc; cdev->getc = netx_serial_getc; diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 5899d57110..59b509c280 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -183,8 +183,6 @@ static void ns16550_serial_init_port(struct console_device *cdev) ns16550_write(cdev, 0x07, mdr1); /* Disable */ #endif - ns16550_setbaudrate(cdev, CONFIG_BAUDRATE); - #ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS ns16550_write(cdev, 0x00, mdr1); #endif @@ -291,7 +289,6 @@ static int ns16550_probe(struct device_d *dev) cdev = &priv->cdev; cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = ns16550_tstc; cdev->putc = ns16550_putc; cdev->getc = ns16550_getc; diff --git a/drivers/serial/serial_omap4_usbboot.c b/drivers/serial/serial_omap4_usbboot.c index 51b2d13003..2ef026c24d 100644 --- a/drivers/serial/serial_omap4_usbboot.c +++ b/drivers/serial/serial_omap4_usbboot.c @@ -62,7 +62,6 @@ static int serial_omap4_usbboot_probe(struct device_d *dev) priv = xzalloc(sizeof(*priv)); priv->cdev.dev = dev; - priv->cdev.f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; priv->cdev.tstc = serial_omap4_usbboot_tstc; priv->cdev.putc = serial_omap4_usbboot_putc; priv->cdev.getc = serial_omap4_usbboot_getc; diff --git a/drivers/serial/serial_pl010.c b/drivers/serial/serial_pl010.c index 9158774de9..81cea776a6 100644 --- a/drivers/serial/serial_pl010.c +++ b/drivers/serial/serial_pl010.c @@ -140,7 +140,6 @@ static int pl010_probe(struct device_d *dev) cdev = xzalloc(sizeof(struct console_device)); dev->priv = dev_request_mem_region(dev, 0); cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = pl010_tstc; cdev->putc = pl010_putc; cdev->getc = pl010_getc; diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index 42355cedf2..20ac4beb96 100644 --- a/drivers/serial/serial_pxa.c +++ b/drivers/serial/serial_pxa.c @@ -170,7 +170,6 @@ static int pxa_serial_probe(struct device_d *dev) dev->priv = priv; cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = pxa_serial_tstc; cdev->putc = pxa_serial_putc; cdev->getc = pxa_serial_getc; diff --git a/drivers/serial/serial_s3c.c b/drivers/serial/serial_s3c.c index cc7b33e101..038193dcf4 100644 --- a/drivers/serial/serial_s3c.c +++ b/drivers/serial/serial_s3c.c @@ -184,7 +184,6 @@ static int s3c_serial_probe(struct device_d *dev) priv->regs = dev_request_mem_region(dev, 0); dev->priv = priv; cdev->dev = dev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = s3c_serial_tstc; cdev->putc = s3c_serial_putc; cdev->getc = s3c_serial_getc; diff --git a/drivers/serial/stm-serial.c b/drivers/serial/stm-serial.c index 0d7484f4bd..3fec1ceeff 100644 --- a/drivers/serial/stm-serial.c +++ b/drivers/serial/stm-serial.c @@ -153,7 +153,6 @@ static int stm_serial_probe(struct device_d *dev) cdev = &priv->cdev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = stm_serial_tstc; cdev->putc = stm_serial_putc; cdev->getc = stm_serial_getc; diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index 9717c3b202..dbadbe4603 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c @@ -478,7 +478,6 @@ int gserial_connect(struct gserial *gser, u8 port_num) gser->connect(gser); cdev = &port->cdev; - cdev->f_caps = CONSOLE_STDIN | CONSOLE_STDOUT | CONSOLE_STDERR; cdev->tstc = serial_tstc; cdev->putc = serial_putc; cdev->getc = serial_getc; |