Commit d3d654ef authored by Stephen Warren's avatar Stephen Warren

serial: tegra: use reset framework

Tegra's clock driver now provides an implementation of the common
reset API (include/linux/reset.h). Use this instead of the old Tegra-
specific API; that will soon be removed.
Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
parent a915d150
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/of_device.h> #include <linux/of_device.h>
#include <linux/pagemap.h> #include <linux/pagemap.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/reset.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_8250.h> #include <linux/serial_8250.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
...@@ -44,8 +45,6 @@ ...@@ -44,8 +45,6 @@
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/tty_flip.h> #include <linux/tty_flip.h>
#include <linux/clk/tegra.h>
#define TEGRA_UART_TYPE "TEGRA_UART" #define TEGRA_UART_TYPE "TEGRA_UART"
#define TX_EMPTY_STATUS (UART_LSR_TEMT | UART_LSR_THRE) #define TX_EMPTY_STATUS (UART_LSR_TEMT | UART_LSR_THRE)
#define BYTES_TO_ALIGN(x) ((unsigned long)(x) & 0x3) #define BYTES_TO_ALIGN(x) ((unsigned long)(x) & 0x3)
...@@ -103,6 +102,7 @@ struct tegra_uart_port { ...@@ -103,6 +102,7 @@ struct tegra_uart_port {
const struct tegra_uart_chip_data *cdata; const struct tegra_uart_chip_data *cdata;
struct clk *uart_clk; struct clk *uart_clk;
struct reset_control *rst;
unsigned int current_baud; unsigned int current_baud;
/* Register shadow */ /* Register shadow */
...@@ -832,9 +832,9 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup) ...@@ -832,9 +832,9 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup)
clk_prepare_enable(tup->uart_clk); clk_prepare_enable(tup->uart_clk);
/* Reset the UART controller to clear all previous status.*/ /* Reset the UART controller to clear all previous status.*/
tegra_periph_reset_assert(tup->uart_clk); reset_control_assert(tup->rst);
udelay(10); udelay(10);
tegra_periph_reset_deassert(tup->uart_clk); reset_control_deassert(tup->rst);
tup->rx_in_progress = 0; tup->rx_in_progress = 0;
tup->tx_in_progress = 0; tup->tx_in_progress = 0;
...@@ -1320,6 +1320,12 @@ static int tegra_uart_probe(struct platform_device *pdev) ...@@ -1320,6 +1320,12 @@ static int tegra_uart_probe(struct platform_device *pdev)
return PTR_ERR(tup->uart_clk); return PTR_ERR(tup->uart_clk);
} }
tup->rst = devm_reset_control_get(&pdev->dev, "serial");
if (IS_ERR(tup->rst)) {
dev_err(&pdev->dev, "Couldn't get the reset\n");
return PTR_ERR(tup->rst);
}
u->iotype = UPIO_MEM32; u->iotype = UPIO_MEM32;
u->irq = platform_get_irq(pdev, 0); u->irq = platform_get_irq(pdev, 0);
u->regshift = 2; u->regshift = 2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment