From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: [PATCH 5/5] omap-serial: Request pins using pinctrl framework Date: Thu, 06 Sep 2012 11:58:32 -0700 Message-ID: <20120906185832.1172.31013.stgit@muffinssi.local> References: <20120906185615.1172.23588.stgit@muffinssi.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120906185615.1172.23588.stgit@muffinssi.local> Sender: linux-serial-owner@vger.kernel.org To: linux-arm-kernel@lists.infradead.org Cc: Greg Kroah-Hartman , linux-omap@vger.kernel.org, linux-serial@vger.kernel.org List-Id: linux-omap@vger.kernel.org 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. Cc: linux-serial@vger.kernel.org Cc: Greg Kroah-Hartman Signed-off-by: Tony Lindgren --- arch/arm/plat-omap/include/plat/omap-serial.h | 1 + drivers/tty/serial/omap-serial.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index 1a52725..0f4de14 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -106,6 +106,7 @@ struct uart_omap_port { struct uart_port port; struct uart_omap_dma uart_dma; struct platform_device *pdev; + struct pinctrl *pins; unsigned char ier; unsigned char lcr; diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index d3cda0c..068e88c 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -1492,6 +1493,13 @@ static int serial_omap_probe(struct platform_device *pdev) goto err_port_line; } + up->pins = 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, @@ -1570,6 +1578,8 @@ static int serial_omap_remove(struct platform_device *dev) pm_runtime_disable(&up->pdev->dev); uart_remove_one_port(&serial_omap_reg, &up->port); pm_qos_remove_request(&up->pm_qos_request); + if (up->pins) + pinctrl_put(up->pins); } platform_set_drvdata(dev, NULL);