diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-22 21:42:56 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-23 08:32:21 +0200 |
| commit | 4b557daac9ca11b9ee4af54657caeb5674dd26fc (patch) | |
| tree | e6184781593320236dc24eea572bb012dac8c5dd /drivers | |
| parent | 38438d4a0f27e6fc8637819bc47ec00a87cefab6 (diff) | |
| download | barebox-4b557daac9ca11b9ee4af54657caeb5674dd26fc.tar.gz barebox-4b557daac9ca11b9ee4af54657caeb5674dd26fc.tar.xz | |
serial: ns16550: Add clk support and make platform_data optional
The clockrate was the only really needed field from platform data.
Add clk support to retrieve the clockrate and make platform data
optional.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/serial_ns16550.c | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index dd50fc5589..b010785757 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -38,6 +38,7 @@ #include <errno.h> #include <malloc.h> #include <io.h> +#include <linux/clk.h> #include "serial_ns16550.h" #include <ns16550.h> @@ -46,6 +47,7 @@ struct ns16550_priv { struct console_device cdev; struct NS16550_plat plat; int access_width; + struct clk *clk; }; static inline struct ns16550_priv *to_ns16550_priv(struct console_device *cdev) @@ -243,10 +245,8 @@ static int ns16550_probe(struct device_d *dev) struct ns16550_priv *priv; struct console_device *cdev; struct NS16550_plat *plat = (struct NS16550_plat *)dev->platform_data; + int ret; - /* we do expect platform specific data */ - if (plat == NULL) - return -EINVAL; dev->priv = dev_request_mem_region(dev, 0); priv = xzalloc(sizeof(*priv)); @@ -254,6 +254,21 @@ static int ns16550_probe(struct device_d *dev) cdev = &priv->cdev; priv->plat = *plat; + if (!plat || !plat->clock) { + priv->clk = clk_get(dev, NULL); + if (IS_ERR(priv->clk)) { + ret = PTR_ERR(priv->clk); + goto err; + } + priv->plat.clock = clk_get_rate(priv->clk); + } + + if (priv->plat.clock == 0) { + dev_err(dev, "no valid clockrate\n"); + ret = -EINVAL; + goto err; + } + priv->access_width = dev->resource[0].flags & IORESOURCE_MEM_TYPE_MASK; cdev->dev = dev; @@ -266,6 +281,11 @@ static int ns16550_probe(struct device_d *dev) ns16550_serial_init_port(cdev); return console_register(cdev); + +err: + free(priv); + + return ret; } /** |