From 9707fe127c6875bce0b0b639f5133038f0e0813d Mon Sep 17 00:00:00 2001 From: Marcel Ziswiler Date: Tue, 21 Oct 2014 16:50:03 +0200 Subject: 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 (cherry picked from commit 4b97c4173ef96cfa4eb3ba4ea9121320efa90091) --- arch/arm/mach-tegra/Kconfig | 4 +++- include/configs/tegra-common.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 5bdbc700a4..db98946ea8 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -31,7 +31,6 @@ config TEGRA_COMMON select DM_MMC select DM_PWM select DM_RESET - select DM_SERIAL select DM_SPI select DM_SPI_FLASH select MISC @@ -113,6 +112,9 @@ config TEGRA_DISCONNECT_UDC_ON_BOOT config SYS_MALLOC_F_LEN default 0x1800 +config DM_SERIAL + default n + source "arch/arm/mach-tegra/tegra20/Kconfig" source "arch/arm/mach-tegra/tegra30/Kconfig" source "arch/arm/mach-tegra/tegra114/Kconfig" diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 63b711be0f..a7c0bb6892 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -33,6 +33,8 @@ /* * NS16550 Configuration */ +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_REG_SIZE (-4) #define CONFIG_SYS_NS16550_CLK V_NS16550_CLK /* -- cgit v1.2.3