summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorWills Wang <wills.wang@live.com>2016-04-12 11:09:19 +0800
committerDaniel Schwierzeck <daniel.schwierzeck@gmail.com>2016-05-21 01:36:38 +0200
commit773f3b25384363d53e457f1faae77c91db76e0c4 (patch)
tree51e142d44d485aa696c0da0a8a4c4043e79b168b /drivers/serial
parent5fabf2e7da1b738c6e0353b6a5a17b1a77ecc2e9 (diff)
downloadblackbird-obmc-uboot-773f3b25384363d53e457f1faae77c91db76e0c4.tar.gz
blackbird-obmc-uboot-773f3b25384363d53e457f1faae77c91db76e0c4.zip
ar933x: serial: Remove the explicit pinctrl setting
The correct pinctrl is handled automatically so we don't need to do it in the driver. Signed-off-by: Wills Wang <wills.wang@live.com>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/serial_ar933x.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/serial/serial_ar933x.c b/drivers/serial/serial_ar933x.c
index d43f9c97d7..aae66dc682 100644
--- a/drivers/serial/serial_ar933x.c
+++ b/drivers/serial/serial_ar933x.c
@@ -38,6 +38,7 @@ struct ar933x_serial_priv {
};
/*
+ * Baudrate algorithm come from Linux/drivers/tty/serial/ar933x_uart.c
* baudrate = (clk / (scale + 1)) * (step * (1 / 2^17))
*/
static u32 ar933x_serial_get_baud(u32 clk, u32 scale, u32 step)
@@ -145,27 +146,14 @@ static int ar933x_serial_pending(struct udevice *dev, bool input)
static int ar933x_serial_probe(struct udevice *dev)
{
struct ar933x_serial_priv *priv = dev_get_priv(dev);
- struct udevice *pinctrl;
fdt_addr_t addr;
u32 val;
- int ret;
-
- ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
- if (ret)
- return ret;
- ret = pinctrl_get_periph_id(pinctrl, dev);
- if (ret < 0)
- return ret;
- ret = pinctrl_request(pinctrl, ret, 0);
- if (ret < 0)
- return ret;
addr = dev_get_addr(dev);
if (addr == FDT_ADDR_T_NONE)
return -EINVAL;
- priv->regs = map_physmem(addr,
- AR933X_UART_SIZE,
+ priv->regs = map_physmem(addr, AR933X_UART_SIZE,
MAP_NOCACHE);
/*
OpenPOWER on IntegriCloud