forked from Minki/linux
serial: omap: Request pins using pinctrl framework
Request pins using pinctrl framework. Only show a warning on error as some boards set the pins in the bootloader even if CONFIG_PINCTRL is enabled. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
ce2f08ded2
commit
3dbc5ce2bf
@ -40,6 +40,7 @@
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/pinctrl/consumer.h>
|
||||
|
||||
#include <plat/omap-serial.h>
|
||||
|
||||
@ -108,6 +109,7 @@ struct uart_omap_port {
|
||||
u32 latency;
|
||||
u32 calc_latency;
|
||||
struct work_struct qos_work;
|
||||
struct pinctrl *pins;
|
||||
};
|
||||
|
||||
#define to_uart_omap_port(p) ((container_of((p), struct uart_omap_port, port)))
|
||||
@ -1377,6 +1379,13 @@ static int __devinit serial_omap_probe(struct platform_device *pdev)
|
||||
goto err_port_line;
|
||||
}
|
||||
|
||||
up->pins = devm_pinctrl_get_select_default(&pdev->dev);
|
||||
if (IS_ERR(up->pins)) {
|
||||
dev_warn(&pdev->dev, "did not get pins for uart%i error: %li\n",
|
||||
up->port.line, PTR_ERR(up->pins));
|
||||
up->pins = NULL;
|
||||
}
|
||||
|
||||
sprintf(up->name, "OMAP UART%d", up->port.line);
|
||||
up->port.mapbase = mem->start;
|
||||
up->port.membase = devm_ioremap(&pdev->dev, mem->start,
|
||||
|
Loading…
Reference in New Issue
Block a user