Revert "dm: tegra: Enable driver model for serial"

Migrating our BSPs towards mainline U-Boot I noticed it suddenly booting
slower. With mainline Linux I noticed about a 1 to 2 second increase
while booting downstream L4T takes 10 to 15 seconds longer!

This reverts commit 858530a8c0a7ce7e573e513934804a00d6676813.

Conflicts:
	drivers/serial/Makefile

(cherry picked from commit 752aae30a791326581efafbb761c0cebaba8d3ea)

Conflicts:
	drivers/serial/serial_tegra.c
	include/configs/tegra-common.h

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index fce1c1dc8785af397376cd2005f986fdb2bfff37..7c712f765a5c21826bb41d062d37089d1bfa5c30 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -30,7 +30,7 @@ config SPL_DM
        default y
 
 config DM_SERIAL
-       default y
+       default n
 
 config DM_SPI
        default y

diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index b385852eee4d94d19a6163570f4b45bc2f6c819a..a138364da7a0d1a6116abd7bfae833ae79772300 100644 (file)
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -40,7 +40,6 @@ obj-$(CONFIG_BFIN_SERIAL) += serial_bfin.o
 obj-$(CONFIG_FSL_LPUART) += serial_lpuart.o
 obj-$(CONFIG_MXS_AUART) += mxs_auart.o
 obj-$(CONFIG_ARC_SERIAL) += serial_arc.o
-obj-$(CONFIG_TEGRA_SERIAL) += serial_tegra.o
 obj-$(CONFIG_UNIPHIER_SERIAL) += serial_uniphier.o
 obj-$(CONFIG_OMAP_SERIAL) += serial_omap.o
 obj-$(CONFIG_X86_SERIAL) += serial_x86.o

diff --git a/drivers/serial/serial_tegra.c b/drivers/serial/serial_tegra.c
deleted file mode 100644 (file)
index b9227f0..0000000
--- a/drivers/serial/serial_tegra.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#include <common.h>
-#include <dm.h>
-#include <ns16550.h>
-#include <serial.h>
-
-#ifdef CONFIG_OF_CONTROL
-static const struct udevice_id tegra_serial_ids[] = {
-       { .compatible = "nvidia,tegra20-uart" },
-       { }
-};
-
-static int tegra_serial_ofdata_to_platdata(struct udevice *dev)
-{
-       struct ns16550_platdata *plat = dev_get_platdata(dev);
-       int ret;
-
-       ret = ns16550_serial_ofdata_to_platdata(dev);
-       if (ret)
-               return ret;
-       plat->clock = V_NS16550_CLK;
-
-       return 0;
-}
-#else
-struct ns16550_platdata tegra_serial = {
-       .base = CONFIG_SYS_NS16550_COM1,
-       .reg_shift = 2,
-       .clock = V_NS16550_CLK,
-};
-
-U_BOOT_DEVICE(ns16550_serial) = {
-       "serial_tegra20", &tegra_serial
-};
-#endif
-
-U_BOOT_DRIVER(serial_ns16550) = {
-       .name   = "serial_tegra20",
-       .id     = UCLASS_SERIAL,
-#ifdef CONFIG_OF_CONTROL
-       .of_match = tegra_serial_ids,
-       .ofdata_to_platdata = tegra_serial_ofdata_to_platdata,
-       .platdata_auto_alloc_size = sizeof(struct ns16550_platdata),
-#endif
-       .priv_auto_alloc_size = sizeof(struct NS16550),
-       .probe = ns16550_serial_probe,
-       .ops    = &ns16550_serial_ops,
-       .flags  = DM_FLAG_PRE_RELOC,
-};

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 2cf1f68404b138395bd45ac02979c264d041e6eb..530cba6be0343872ca597c21c76385eaf0ecdf9a 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -48,8 +48,10 @@
 /*
  * NS16550 Configuration
  */
-#define CONFIG_TEGRA_SERIAL
 #define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
+#define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
 
 /*
  * Common HW configuration.