diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-05 15:47:39 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-11-05 15:47:39 +0100 |
commit | 7b4cc54579f12cc6c9586e8c21e729dd220e7f45 (patch) | |
tree | 85adc78e0eb782f805113b2b48dd07be6555e532 /drivers/serial | |
parent | 254b64520b9a729da496cd8bf637d080de7af5a1 (diff) | |
parent | c202b7c8d9e66082853ac1b131ddcedf53e9ca99 (diff) | |
download | barebox-7b4cc54579f12cc6c9586e8c21e729dd220e7f45.tar.gz barebox-7b4cc54579f12cc6c9586e8c21e729dd220e7f45.tar.xz |
Merge branch 'for-next/tegra'
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/serial_ns16550.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 53d48a06c2..8f2e93fa68 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -311,6 +311,11 @@ static __maybe_unused struct ns16550_drvdata jz_drvdata = { .init_port = ns16550_jz_init_port, }; +static __maybe_unused struct ns16550_drvdata tegra_drvdata = { + .init_port = ns16550_serial_init_port, + .linux_console_name = "ttyS", +}; + static int ns16550_init_iomem(struct device_d *dev, struct ns16550_priv *priv) { struct resource *res; @@ -418,6 +423,7 @@ static int ns16550_probe(struct device_d *dev) ret = PTR_ERR(priv->clk); goto err; } + clk_enable(priv->clk); priv->plat.clock = clk_get_rate(priv->clk); } @@ -476,6 +482,12 @@ static struct of_device_id ns16550_serial_dt_ids[] = { .data = (unsigned long)&omap_drvdata, }, #endif +#if IS_ENABLED(CONFIG_ARCH_TEGRA) + { + .compatible = "nvidia,tegra20-uart", + .data = (unsigned long)&tegra_drvdata, + }, +#endif #if IS_ENABLED(CONFIG_MACH_MIPS_XBURST) { .compatible = "ingenic,jz4740-uart", |