On Mon, Sep 3, 2018 at 12:30 PM Jagan Teki jagan@amarulasolutions.com wrote:
This patch add SPL DM support for da8xxevm boards with SPL serial, SPI drivers supported via platdata.
Cc: Adam Ford aford173@gmail.com
I needed to massage one file a bit to get it to apply to master, but with that,
Tested-by: Adam Ford aford173@gmail.com #da850evm
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
board/davinci/da8xxevm/da850evm.c | 27 +++++++++++++++++++++++++++ configs/da850_am18xxevm_defconfig | 3 +++ configs/da850evm_defconfig | 3 +++ include/configs/da850evm.h | 3 --- 4 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index 5583b45792..4cecb53124 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -49,6 +49,33 @@ DECLARE_GLOBAL_DATA_PTR;
#define CFG_MAC_ADDR_OFFSET (flash->size - SZ_64K)
+#ifdef CONFIG_SPL_BUILD +#include <ns16550.h> +#include <dm/platform_data/spi_davinci.h>
+static const struct ns16550_platdata da850evm_serial = {
.base = DAVINCI_UART2_BASE,.reg_shift = 2,.clock = 150000000,.fcr = UART_FCR_DEFVAL,+};
+U_BOOT_DEVICE(da850evm_uart) = {
.name = "ns16550_serial",.platdata = &da850evm_serial,+};
+static const struct davinci_spi_platdata davinci_spi_data = {
.regs = (struct davinci_spi_regs *)0x01f0e000,.num_cs = 4,+};
+U_BOOT_DEVICE(davinci_spi) = {
.name = "davinci_spi",.platdata = &davinci_spi_data,+}; +#endif
#ifdef CONFIG_MAC_ADDR_IN_SPIFLASH static int get_mac_addr(u8 *addr) { diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig index c61d78e2fe..07bfcc15f5 100644 --- a/configs/da850_am18xxevm_defconfig +++ b/configs/da850_am18xxevm_defconfig @@ -8,6 +8,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y +CONFIG_SPL_DM=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" @@ -35,6 +36,8 @@ CONFIG_CRC32_VERIFY=y # CONFIG_CMD_FS_GENERIC is not set CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_DA8XX_GPIO=y diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 0b8bf2ad36..053173f2b1 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y +CONFIG_SPL_DM=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" @@ -37,6 +38,8 @@ CONFIG_MTDIDS_DEFAULT="nor0=spi0.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:512k(u-boot.ais),64k(u-boot-env),7552k(kernel-spare),64k(MAC-Address)" CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_SPL_OF_PLATDATA=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_DM_GPIO=y diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 7e52fea2a1..ebdadb44a8 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -23,8 +23,6 @@
- DM support in SPL
*/ #ifdef CONFIG_SPL_BUILD -#undef CONFIG_DM_SPI -#undef CONFIG_DM_SPI_FLASH #undef CONFIG_DM_I2C #undef CONFIG_DM_I2C_COMPAT #endif @@ -117,7 +115,6 @@
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_DIRECT_NOR_BOOT) #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size */ #define CONFIG_SYS_NS16550_COM1 DAVINCI_UART2_BASE /* Base address of UART2 */ #endif
#define CONFIG_SYS_NS16550_CLK clk_get(DAVINCI_UART2_CLKID)
2.18.0.321.gffc6fa0e3