Commit 8a86152db049f3df3f04e1112d7fe18f718c7d04
Committed by
Tom Rini
Tom Rini
1 parent
3f20321ad8
Exists in
smarc_8mq_lf_v2020.04
and in
11 other branches
omap3: pandora: Enable DM_SERIAL
This patch enables DM_SERIAL for the pandora board. Verified that the default kernel can still be booted with this. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Showing 3 changed files with 17 additions and 18 deletions Side-by-side Diff
board/pandora/pandora.c
| ... | ... | @@ -13,6 +13,8 @@ |
| 13 | 13 | * Texas Instruments, <www.ti.com> |
| 14 | 14 | */ |
| 15 | 15 | #include <common.h> |
| 16 | +#include <dm.h> | |
| 17 | +#include <ns16550.h> | |
| 16 | 18 | #include <twl4030.h> |
| 17 | 19 | #include <asm/io.h> |
| 18 | 20 | #include <asm/gpio.h> |
| ... | ... | @@ -32,6 +34,18 @@ |
| 32 | 34 | #define CONTROL_WKUP_CTRL 0x48002a5c |
| 33 | 35 | #define GPIO_IO_PWRDNZ (1 << 6) |
| 34 | 36 | #define PBIASLITEVMODE1 (1 << 8) |
| 37 | + | |
| 38 | +static const struct ns16550_platdata pandora_serial = { | |
| 39 | + .base = OMAP34XX_UART3, | |
| 40 | + .reg_shift = 2, | |
| 41 | + .clock = V_NS16550_CLK, | |
| 42 | + .fcr = UART_FCR_DEFVAL, | |
| 43 | +}; | |
| 44 | + | |
| 45 | +U_BOOT_DEVICE(pandora_uart) = { | |
| 46 | + "ns16550_serial", | |
| 47 | + &pandora_serial | |
| 48 | +}; | |
| 35 | 49 | |
| 36 | 50 | /* |
| 37 | 51 | * Routine: board_init |
configs/omap3_pandora_defconfig
| 1 | 1 | CONFIG_ARM=y |
| 2 | 2 | CONFIG_ARCH_OMAP2PLUS=y |
| 3 | 3 | CONFIG_SYS_TEXT_BASE=0x80008000 |
| 4 | +CONFIG_SYS_MALLOC_F_LEN=0x2000 | |
| 4 | 5 | CONFIG_TARGET_OMAP3_PANDORA=y |
| 5 | 6 | CONFIG_DISTRO_DEFAULTS=y |
| 6 | 7 | CONFIG_NR_DRAM_BANKS=2 |
| 7 | 8 | |
| ... | ... | @@ -25,11 +26,12 @@ |
| 25 | 26 | CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(xloader),1920k(uboot),128k(uboot-env),10m(boot),-(rootfs)" |
| 26 | 27 | CONFIG_CMD_UBI=y |
| 27 | 28 | CONFIG_ENV_IS_IN_NAND=y |
| 29 | +CONFIG_DM=y | |
| 28 | 30 | CONFIG_TWL4030_LED=y |
| 29 | 31 | CONFIG_MMC_OMAP_HS=y |
| 30 | 32 | CONFIG_NAND=y |
| 31 | 33 | CONFIG_SYS_NAND_BUSWIDTH_16BIT=y |
| 32 | -CONFIG_CONS_INDEX=3 | |
| 34 | +CONFIG_DM_SERIAL=y | |
| 33 | 35 | CONFIG_SYS_NS16550=y |
| 34 | 36 | CONFIG_SPI=y |
| 35 | 37 | CONFIG_OMAP3_SPI=y |
include/configs/omap3_pandora.h
| ... | ... | @@ -20,23 +20,6 @@ |
| 20 | 20 | #define CONFIG_SYS_DEVICE_NULLDEV 1 |
| 21 | 21 | |
| 22 | 22 | /* |
| 23 | - * Hardware drivers | |
| 24 | - */ | |
| 25 | - | |
| 26 | -/* TWL4030 LED */ | |
| 27 | - | |
| 28 | -/* | |
| 29 | - * NS16550 Configuration | |
| 30 | - */ | |
| 31 | -#undef CONFIG_SYS_NS16550_CLK | |
| 32 | -#define CONFIG_SYS_NS16550_SERIAL | |
| 33 | -#define CONFIG_SYS_NS16550_REG_SIZE (-4) | |
| 34 | -#define CONFIG_SYS_NS16550_CLK V_NS16550_CLK | |
| 35 | -#define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 | |
| 36 | - | |
| 37 | -/* commands to include */ | |
| 38 | - | |
| 39 | -/* | |
| 40 | 23 | * Board NAND Info. |
| 41 | 24 | */ |
| 42 | 25 | #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_HAM1_CODE_SW |