summaryrefslogtreecommitdiffstats
path: root/drivers/serial/serial_uniphier.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-27 13:10:04 -0500
committerTom Rini <trini@ti.com>2014-11-27 13:10:04 -0500
commite17e998d7fee2e7d381b7bff21aca3714387d5d7 (patch)
tree082fb0e66aa0463886d18294f0e29504626019a6 /drivers/serial/serial_uniphier.c
parent38cd8c4253013ccdd4052ee021f6066fe9a52551 (diff)
parent25e274e20208e047ea93afde04040e8c87430904 (diff)
downloadtalos-obmc-uboot-e17e998d7fee2e7d381b7bff21aca3714387d5d7.tar.gz
talos-obmc-uboot-e17e998d7fee2e7d381b7bff21aca3714387d5d7.zip
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'drivers/serial/serial_uniphier.c')
-rw-r--r--drivers/serial/serial_uniphier.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index 6046efb51f..e8a1608b99 100644
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -11,6 +11,7 @@
#include <dm/device.h>
#include <dm/platform_data/serial-uniphier.h>
#include <serial.h>
+#include <fdtdec.h>
#define UART_REG(x) \
u8 x; \
@@ -113,19 +114,21 @@ static int uniphier_serial_remove(struct udevice *dev)
}
#ifdef CONFIG_OF_CONTROL
-static const struct udevice_id uniphier_uart_of_match = {
- { .compatible = "panasonic,uniphier-uart"},
+static const struct udevice_id uniphier_uart_of_match[] = {
+ { .compatible = "panasonic,uniphier-uart" },
{},
};
static int uniphier_serial_ofdata_to_platdata(struct udevice *dev)
{
- /*
- * TODO: Masahiro Yamada (yamada.m@jp.panasonic.com)
- *
- * Implement conversion code from DTB to platform data
- * when supporting CONFIG_OF_CONTROL on UniPhir platform.
- */
+ struct uniphier_serial_platform_data *plat = dev_get_platdata(dev);
+ DECLARE_GLOBAL_DATA_PTR;
+
+ plat->base = fdtdec_get_addr(gd->fdt_blob, dev->of_offset, "reg");
+ plat->uartclk = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+ "clock-frequency", 0);
+
+ return 0;
}
#endif
OpenPOWER on IntegriCloud