| Message ID | 20180314131644.9508-11-jagan@amarulasolutions.com |
|---|---|
| State | Accepted |
| Commit | 4dc04ebfa3dc4307a6fbe7348f4cacaeec306056 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | at91: Add boards with OF_CONTROL/DM/DM_SPI | expand |
On Wed, Mar 14, 2018 at 06:46:40PM +0530, Jagan Teki wrote: > AT91 ma5d4evk board uses atmel spi driver, enable DM_SPI to > use dm functionality. > > Kept few functions related to non-dm and gpio on board > files for reference and will be remove once code moved > to relevant drivers. > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 4dfddcc287..3621dfa760 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -201,6 +201,7 @@ config TARGET_MA5D4EVK select SAMA5D4 select SUPPORT_SPL select DM + select DM_SPI config TARGET_MEESC bool "Support meesc" diff --git a/board/aries/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c index 956c297e72..46c11d1a12 100644 --- a/board/aries/ma5d4evk/ma5d4evk.c +++ b/board/aries/ma5d4evk/ma5d4evk.c @@ -30,7 +30,8 @@ DECLARE_GLOBAL_DATA_PTR; static u8 boot_mode_sf; -#ifdef CONFIG_ATMEL_SPI +/* FIXME gpio code here need to handle through DM_GPIO */ +#ifndef CONFIG_DM_SPI int spi_cs_is_valid(unsigned int bus, unsigned int cs) { return bus == 0 && cs == 0; @@ -57,7 +58,7 @@ static void ma5d4evk_spi0_hw_init(void) /* Enable clock */ at91_periph_clk_enable(ATMEL_ID_SPI0); } -#endif /* CONFIG_ATMEL_SPI */ +#endif /* CONFIG_DM_SPI */ #ifdef CONFIG_CMD_USB static void ma5d4evk_usb_hw_init(void) @@ -292,7 +293,7 @@ int board_init(void) /* adress of boot parameters */ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; -#ifdef CONFIG_ATMEL_SPI +#ifndef CONFIG_DM_SPI ma5d4evk_spi0_hw_init(); #endif #ifdef CONFIG_GENERIC_ATMEL_MCI
AT91 ma5d4evk board uses atmel spi driver, enable DM_SPI to use dm functionality. Kept few functions related to non-dm and gpio on board files for reference and will be remove once code moved to relevant drivers. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- arch/arm/mach-at91/Kconfig | 1 + board/aries/ma5d4evk/ma5d4evk.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-)