Serial driver fixes for 3.5-rc4
Here are 3 patches resolving a boot regression (the mop500 fix), a build warning fix, and a kernel-doc fix. All tiny, but should go into the final 3.5 release. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iEYEABECAAYFAk/iNosACgkQMUfUDdst+ykedgCeLhpFrq5dI19tbhEmCroFs4sx f+4An29dz2bGkjeViDNkmaBC7msPzLNc =EBge -----END PGP SIGNATURE----- Merge tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty Pull serial driver fixes from Greg Kroah-Hartman: "Here are 3 patches resolving a boot regression (the mop500 fix), a build warning fix, and a kernel-doc fix. All tiny, but should go into the final 3.5 release. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" * tag 'tty-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: serial/amba-pl011: move custom pin control to driver serial: fix serial_txx9.c build warning/typo serial: fix kernel-doc warnings in 8250.c
This commit is contained in:
Linus Torvalds
commit
a1821f774d
4 changed files with 44 additions and 59 deletions
|
|
@ -580,43 +580,12 @@ static void ux500_uart0_reset(void)
|
|||
udelay(1);
|
||||
}
|
||||
|
||||
/* This needs to be referenced by callbacks */
|
||||
struct pinctrl *u0_p;
|
||||
struct pinctrl_state *u0_def;
|
||||
struct pinctrl_state *u0_sleep;
|
||||
|
||||
static void ux500_uart0_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (IS_ERR(u0_p) || IS_ERR(u0_def))
|
||||
return;
|
||||
|
||||
ret = pinctrl_select_state(u0_p, u0_def);
|
||||
if (ret)
|
||||
pr_err("could not set UART0 defstate\n");
|
||||
}
|
||||
|
||||
static void ux500_uart0_exit(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (IS_ERR(u0_p) || IS_ERR(u0_sleep))
|
||||
return;
|
||||
|
||||
ret = pinctrl_select_state(u0_p, u0_sleep);
|
||||
if (ret)
|
||||
pr_err("could not set UART0 idlestate\n");
|
||||
}
|
||||
|
||||
static struct amba_pl011_data uart0_plat = {
|
||||
#ifdef CONFIG_STE_DMA40
|
||||
.dma_filter = stedma40_filter,
|
||||
.dma_rx_param = &uart0_dma_cfg_rx,
|
||||
.dma_tx_param = &uart0_dma_cfg_tx,
|
||||
#endif
|
||||
.init = ux500_uart0_init,
|
||||
.exit = ux500_uart0_exit,
|
||||
.reset = ux500_uart0_reset,
|
||||
};
|
||||
|
||||
|
|
@ -638,28 +607,7 @@ static struct amba_pl011_data uart2_plat = {
|
|||
|
||||
static void __init mop500_uart_init(struct device *parent)
|
||||
{
|
||||
struct amba_device *uart0_device;
|
||||
|
||||
uart0_device = db8500_add_uart0(parent, &uart0_plat);
|
||||
if (uart0_device) {
|
||||
u0_p = pinctrl_get(&uart0_device->dev);
|
||||
if (IS_ERR(u0_p))
|
||||
dev_err(&uart0_device->dev,
|
||||
"could not get UART0 pinctrl\n");
|
||||
else {
|
||||
u0_def = pinctrl_lookup_state(u0_p,
|
||||
PINCTRL_STATE_DEFAULT);
|
||||
if (IS_ERR(u0_def)) {
|
||||
dev_err(&uart0_device->dev,
|
||||
"could not get UART0 defstate\n");
|
||||
}
|
||||
u0_sleep = pinctrl_lookup_state(u0_p,
|
||||
PINCTRL_STATE_SLEEP);
|
||||
if (IS_ERR(u0_sleep))
|
||||
dev_err(&uart0_device->dev,
|
||||
"could not get UART0 idlestate\n");
|
||||
}
|
||||
}
|
||||
db8500_add_uart0(parent, &uart0_plat);
|
||||
db8500_add_uart1(parent, &uart1_plat);
|
||||
db8500_add_uart2(parent, &uart2_plat);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3113,7 +3113,7 @@ static struct uart_8250_port *serial8250_find_match_or_unused(struct uart_port *
|
|||
|
||||
/**
|
||||
* serial8250_register_8250_port - register a serial port
|
||||
* @port: serial port template
|
||||
* @up: serial port template
|
||||
*
|
||||
* Configure the serial port specified by the request. If the
|
||||
* port exists and is in use, it is hung up and unregistered
|
||||
|
|
|
|||
|
|
@ -133,6 +133,10 @@ struct pl011_dmatx_data {
|
|||
struct uart_amba_port {
|
||||
struct uart_port port;
|
||||
struct clk *clk;
|
||||
/* Two optional pin states - default & sleep */
|
||||
struct pinctrl *pinctrl;
|
||||
struct pinctrl_state *pins_default;
|
||||
struct pinctrl_state *pins_sleep;
|
||||
const struct vendor_data *vendor;
|
||||
unsigned int dmacr; /* dma control reg */
|
||||
unsigned int im; /* interrupt mask */
|
||||
|
|
@ -1312,6 +1316,14 @@ static int pl011_startup(struct uart_port *port)
|
|||
unsigned int cr;
|
||||
int retval;
|
||||
|
||||
/* Optionaly enable pins to be muxed in and configured */
|
||||
if (!IS_ERR(uap->pins_default)) {
|
||||
retval = pinctrl_select_state(uap->pinctrl, uap->pins_default);
|
||||
if (retval)
|
||||
dev_err(port->dev,
|
||||
"could not set default pins\n");
|
||||
}
|
||||
|
||||
retval = clk_prepare(uap->clk);
|
||||
if (retval)
|
||||
goto out;
|
||||
|
|
@ -1420,6 +1432,7 @@ static void pl011_shutdown(struct uart_port *port)
|
|||
{
|
||||
struct uart_amba_port *uap = (struct uart_amba_port *)port;
|
||||
unsigned int cr;
|
||||
int retval;
|
||||
|
||||
/*
|
||||
* disable all interrupts
|
||||
|
|
@ -1462,6 +1475,14 @@ static void pl011_shutdown(struct uart_port *port)
|
|||
*/
|
||||
clk_disable(uap->clk);
|
||||
clk_unprepare(uap->clk);
|
||||
/* Optionally let pins go into sleep states */
|
||||
if (!IS_ERR(uap->pins_sleep)) {
|
||||
retval = pinctrl_select_state(uap->pinctrl, uap->pins_sleep);
|
||||
if (retval)
|
||||
dev_err(port->dev,
|
||||
"could not set pins to sleep state\n");
|
||||
}
|
||||
|
||||
|
||||
if (uap->port.dev->platform_data) {
|
||||
struct amba_pl011_data *plat;
|
||||
|
|
@ -1792,6 +1813,14 @@ static int __init pl011_console_setup(struct console *co, char *options)
|
|||
if (!uap)
|
||||
return -ENODEV;
|
||||
|
||||
/* Allow pins to be muxed in and configured */
|
||||
if (!IS_ERR(uap->pins_default)) {
|
||||
ret = pinctrl_select_state(uap->pinctrl, uap->pins_default);
|
||||
if (ret)
|
||||
dev_err(uap->port.dev,
|
||||
"could not set default pins\n");
|
||||
}
|
||||
|
||||
ret = clk_prepare(uap->clk);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
|
@ -1844,7 +1873,6 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
|
|||
{
|
||||
struct uart_amba_port *uap;
|
||||
struct vendor_data *vendor = id->data;
|
||||
struct pinctrl *pinctrl;
|
||||
void __iomem *base;
|
||||
int i, ret;
|
||||
|
||||
|
|
@ -1869,11 +1897,20 @@ static int pl011_probe(struct amba_device *dev, const struct amba_id *id)
|
|||
goto free;
|
||||
}
|
||||
|
||||
pinctrl = devm_pinctrl_get_select_default(&dev->dev);
|
||||
if (IS_ERR(pinctrl)) {
|
||||
ret = PTR_ERR(pinctrl);
|
||||
uap->pinctrl = devm_pinctrl_get(&dev->dev);
|
||||
if (IS_ERR(uap->pinctrl)) {
|
||||
ret = PTR_ERR(uap->pinctrl);
|
||||
goto unmap;
|
||||
}
|
||||
uap->pins_default = pinctrl_lookup_state(uap->pinctrl,
|
||||
PINCTRL_STATE_DEFAULT);
|
||||
if (IS_ERR(uap->pins_default))
|
||||
dev_err(&dev->dev, "could not get default pinstate\n");
|
||||
|
||||
uap->pins_sleep = pinctrl_lookup_state(uap->pinctrl,
|
||||
PINCTRL_STATE_SLEEP);
|
||||
if (IS_ERR(uap->pins_sleep))
|
||||
dev_dbg(&dev->dev, "could not get sleep pinstate\n");
|
||||
|
||||
uap->clk = clk_get(&dev->dev, NULL);
|
||||
if (IS_ERR(uap->clk)) {
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@ static void serial_txx9_break_ctl(struct uart_port *port, int break_state)
|
|||
spin_unlock_irqrestore(&up->port.lock, flags);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || (CONFIG_CONSOLE_POLL)
|
||||
#if defined(CONFIG_SERIAL_TXX9_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
|
||||
/*
|
||||
* Wait for transmitter & holding register to empty
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue