Nokia RX-51: Convert to CONFIG_DM_SERIAL

For CONFIG_DM_SERIAL it is required to increase CONFIG_SYS_MALLOC_F_LEN as
default value is not enough for memory hungry CONFIG_DM_SERIAL code.

Signed-off-by: Pali Rohár <pali@kernel.org>
Tested-by: Merlijn Wajer <merlijn@wizzup.org>

diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 621cff09561928756d269f44d85ce8fa7b9e3e9c..460d248eaaebb2ea543de84953ca9fa59df363b7 100644 (file)
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -32,6 +32,7 @@
 #include <i2c.h>
 #include <video.h>
 #include <keyboard.h>
+#include <ns16550.h>
 #include <asm/global_data.h>
 #include <asm/io.h>
 #include <asm/setup.h>
@@ -788,3 +789,14 @@ U_BOOT_DRVINFOS(rx51_video) = {
 U_BOOT_DRVINFOS(rx51_kp) = {
        { "rx51_kp" },
 };
+
+static const struct ns16550_plat rx51_serial = {
+       .base = CONFIG_SYS_NS16550_COM3,
+       .reg_shift = 2,
+       .clock = CONFIG_SYS_NS16550_CLK,
+       .fcr = UART_FCR_DEFVAL,
+};
+
+U_BOOT_DRVINFOS(rx51_uart) = {
+       { "omap_serial", &rx51_serial },
+};

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 2e8068876eae1bc0d12d124a7f2fd32e47c6f114..ec0f2e89f878df693a81c943de2ee39820d4e731 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -11,12 +11,12 @@ CONFIG_STATIC_MACH_TYPE=y
 CONFIG_MACH_TYPE=1955
 CONFIG_SYS_TEXT_BASE=0x80008000
 CONFIG_SYS_MALLOC_LEN=0xc0000
+CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_TARGET_NOKIA_RX51=y
 CONFIG_SYS_LOAD_ADDR=0x80000000
 CONFIG_OPTIMIZE_INLINING=y
 CONFIG_LTO=y
-# CONFIG_SYS_MALLOC_F is not set
 # CONFIG_FIT is not set
 CONFIG_SUPPORT_RAW_INITRD=y
 CONFIG_BOOTDELAY=30
@@ -71,8 +71,7 @@ CONFIG_DM_KEYBOARD=y
 # CONFIG_MMC_VERBOSE is not set
 CONFIG_MMC_OMAP_HS=y
 CONFIG_MTD=y
-CONFIG_CONS_INDEX=3
-CONFIG_SYS_NS16550=y
+CONFIG_DM_SERIAL=y
 CONFIG_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_UDC=y

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index e837b12b568f53d90e3b9e511a11808b47dab67a..f273e243e55df79e138ade9ea566c848332b911f 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -43,7 +43,6 @@
 #define V_NS16550_CLK          48000000                /* 48MHz (APLL96/2) */
 
 #define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
 
 /*