ARM: uniphier: change UNIPHIER_SERIAL to default y option

[people/ms/u-boot.git] / drivers / serial / serial_rockchip.c

diff --git a/drivers/serial/serial_rockchip.c b/drivers/serial/serial_rockchip.c
index 0e7bbfc69042d2f9cf0631bb07b42b2d7cd9487a..6bac95a414cec02082979978ff1dfed84f1ef515 100644 (file)
--- a/drivers/serial/serial_rockchip.c
+++ b/drivers/serial/serial_rockchip.c
@@ -5,39 +5,39 @@
  */
 
 #include <common.h>
+#include <debug_uart.h>
 #include <dm.h>
+#include <dt-structs.h>
 #include <ns16550.h>
 #include <serial.h>
 #include <asm/arch/clock.h>
 
-static const struct udevice_id rockchip_serial_ids[] = {
-       { .compatible = "rockchip,rk3288-uart" },
-       { }
+struct rockchip_uart_platdata {
+       struct dtd_rockchip_rk3288_uart dtplat;
+       struct ns16550_platdata plat;
 };
 
-static int rockchip_serial_ofdata_to_platdata(struct udevice *dev)
-{
-       struct ns16550_platdata *plat = dev_get_platdata(dev);
-       int ret;
+struct dtd_rockchip_rk3288_uart *dtplat, s_dtplat;
 
-       ret = ns16550_serial_ofdata_to_platdata(dev);
-       if (ret)
-               return ret;
+static int rockchip_serial_probe(struct udevice *dev)
+{
+       struct rockchip_uart_platdata *plat = dev_get_platdata(dev);
 
-       /* Do all Rockchip parts use 24MHz? */
-       plat->clock = 24 * 1000000;
+       /* Create some new platform data for the standard driver */
+       plat->plat.base = plat->dtplat.reg[0];
+       plat->plat.reg_shift = plat->dtplat.reg_shift;
+       plat->plat.clock = plat->dtplat.clock_frequency;
+       dev->platdata = &plat->plat;
 
-       return 0;
+       return ns16550_serial_probe(dev);
 }
 
-U_BOOT_DRIVER(serial_ns16550) = {
-       .name   = "serial_rockchip",
+U_BOOT_DRIVER(rockchip_rk3288_uart) = {
+       .name   = "rockchip_rk3288_uart",
        .id     = UCLASS_SERIAL,
-       .of_match = rockchip_serial_ids,
-       .ofdata_to_platdata = rockchip_serial_ofdata_to_platdata,
-       .platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
        .priv_auto_alloc_size = sizeof(struct NS16550),
-       .probe = ns16550_serial_probe,
+       .platdata_auto_alloc_size = sizeof(struct rockchip_uart_platdata),
+       .probe  = rockchip_serial_probe,
        .ops    = &ns16550_serial_ops,
        .flags  = DM_FLAG_PRE_RELOC,
 };