serial: uniphier: drop platform data support

This driver is enabled only for UniPhier SoCs and ARCH_UNIPHIER now
selects OF_CONTROL and SPL_OF_CONTROL.

This driver no longer needs to support platform data configuration.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/serial/serial_uniphier.c b/drivers/serial/serial_uniphier.c
index abf362a8458512e4c627d929dd0af79fe5032ded..edb9203858814bd41f8d2460c3c702e59137b5d6 100644 (file)
--- a/drivers/serial/serial_uniphier.c
+++ b/drivers/serial/serial_uniphier.c
@@ -8,7 +8,6 @@
 #include <linux/serial_reg.h>
 #include <asm/errno.h>
 #include <dm/device.h>
-#include <dm/platform_data/serial-uniphier.h>
 #include <mapmem.h>
 #include <serial.h>
 #include <fdtdec.h>
@@ -34,6 +33,7 @@ struct uniphier_serial {
 
 struct uniphier_serial_private_data {
        struct uniphier_serial __iomem *membase;
+       unsigned int uartclk;
 };
 
 #define uniphier_serial_port(dev)      \
@@ -41,12 +41,12 @@ struct uniphier_serial_private_data {
 
 static int uniphier_serial_setbrg(struct udevice *dev, int baudrate)
 {
-       struct uniphier_serial_platform_data *plat = dev_get_platdata(dev);
+       struct uniphier_serial_private_data *priv = dev_get_priv(dev);
        struct uniphier_serial __iomem *port = uniphier_serial_port(dev);
        const unsigned int mode_x_div = 16;
        unsigned int divisor;
 
-       divisor = DIV_ROUND_CLOSEST(plat->uartclk, mode_x_div * baudrate);
+       divisor = DIV_ROUND_CLOSEST(priv->uartclk, mode_x_div * baudrate);
 
        writel(divisor, &port->dlr);
 
@@ -87,17 +87,24 @@ static int uniphier_serial_pending(struct udevice *dev, bool input)
 
 static int uniphier_serial_probe(struct udevice *dev)
 {
-       u32 tmp;
+       DECLARE_GLOBAL_DATA_PTR;
        struct uniphier_serial_private_data *priv = dev_get_priv(dev);
-       struct uniphier_serial_platform_data *plat = dev_get_platdata(dev);
        struct uniphier_serial __iomem *port;
+       fdt_addr_t base;
+       fdt_size_t size;
+       u32 tmp;
 
-       port = map_sysmem(plat->base, sizeof(struct uniphier_serial));
+       base = fdtdec_get_addr_size(gd->fdt_blob, dev->of_offset, "reg", &size);
+
+       port = map_sysmem(base, size);
        if (!port)
                return -ENOMEM;
 
        priv->membase = port;
 
+       priv->uartclk = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+                                      "clock-frequency", 0);
+
        tmp = readl(&port->lcr_mcr);
        tmp &= ~LCR_MASK;
        tmp |= UART_LCR_WLEN8 << LCR_SHIFT;
@@ -113,25 +120,11 @@ static int uniphier_serial_remove(struct udevice *dev)
        return 0;
 }
 
-#if CONFIG_IS_ENABLED(OF_CONTROL)
 static const struct udevice_id uniphier_uart_of_match[] = {
        { .compatible = "socionext,uniphier-uart" },
        { /* sentinel */ }
 };
 
-static int uniphier_serial_ofdata_to_platdata(struct udevice *dev)
-{
-       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
-
 static const struct dm_serial_ops uniphier_serial_ops = {
        .setbrg = uniphier_serial_setbrg,
        .getc = uniphier_serial_getc,
@@ -140,15 +133,11 @@ static const struct dm_serial_ops uniphier_serial_ops = {
 };
 
 U_BOOT_DRIVER(uniphier_serial) = {
-       .name = DRIVER_NAME,
+       .name = "uniphier-uart",
        .id = UCLASS_SERIAL,
-       .of_match = of_match_ptr(uniphier_uart_of_match),
-       .ofdata_to_platdata = of_match_ptr(uniphier_serial_ofdata_to_platdata),
+       .of_match = uniphier_uart_of_match,
        .probe = uniphier_serial_probe,
        .remove = uniphier_serial_remove,
        .priv_auto_alloc_size = sizeof(struct uniphier_serial_private_data),
-       .platdata_auto_alloc_size =
-                               sizeof(struct uniphier_serial_platform_data),
        .ops = &uniphier_serial_ops,
-       .flags = DM_FLAG_PRE_RELOC,
 };

diff --git a/include/dm/platform_data/serial-uniphier.h b/include/dm/platform_data/serial-uniphier.h
deleted file mode 100644 (file)
index 52343e3..0000000
--- a/include/dm/platform_data/serial-uniphier.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2014 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef __PLAT_UNIPHIER_SERIAL_H
-#define __PLAT_UNIPHIER_SERIAL_H
-
-#define DRIVER_NAME    "uniphier-uart"
-
-struct uniphier_serial_platform_data {
-       unsigned long base;
-       unsigned int uartclk;
-};
-
-#endif /* __PLAT_UNIPHIER_SERIAL_H */