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

[oweals/u-boot.git] / board / l+g / vinco / vinco.c

diff --git a/board/l+g/vinco/vinco.c b/board/l+g/vinco/vinco.c
index a938a2c2e1d468023388a0c177d95c97b868c690..029ab12391821daad8be6242ec0afaf626dd5a0a 100644 (file)
--- a/board/l+g/vinco/vinco.c
+++ b/board/l+g/vinco/vinco.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Board file for the VInCo platform
  * Based on the the SAMA5-EK board file
@@ -6,8 +7,6 @@
  *                   Bo Shen <voice.shen@atmel.com>
  * Copyright (C) 2015 Free Electrons
  *                   Gregory CLEMENT <gregory.clement@free-electrons.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -33,7 +32,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#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;
@@ -166,7 +166,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
        vinco_spi0_hw_init();
 #endif