Merge branch 'master' of git://git.denx.de/u-boot-spi

[u-boot] / board / aries / ma5d4evk / ma5d4evk.c

diff --git a/board/aries/ma5d4evk/ma5d4evk.c b/board/aries/ma5d4evk/ma5d4evk.c
index 956c297e72de6c4e9244ff9556d0c429f800195f..c2b6845edc9ca16319fad733183dcf09d09ff18a 100644 (file)
--- a/board/aries/ma5d4evk/ma5d4evk.c
+++ b/board/aries/ma5d4evk/ma5d4evk.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015 Marek Vasut <marex@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -30,7 +29,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 +57,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 +292,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
@@ -358,7 +358,7 @@ int board_eth_init(bd_t *bis)
 #ifdef CONFIG_SPL_BUILD
 void spl_board_init(void)
 {
-#ifdef CONFIG_ATMEL_SPI
+#ifndef CONFIG_DM_SPI
        ma5d4evk_spi0_hw_init();
 #endif
 #ifdef CONFIG_GENERIC_ATMEL_MCI