[U-Boot] [PATCH 06/14] imx: ventana: skip nand init for nandless boards

4 Feb 2019

Signed-off-by: Tim Harvey tharvey@gateworks.com
---
 board/gateworks/gw_ventana/common.c     |  7 +++++++
 board/gateworks/gw_ventana/common.h     |  1 +
 board/gateworks/gw_ventana/gw_ventana.c | 10 ++++++----
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c
index b962b4b29d..f54eab576c 100644
--- a/board/gateworks/gw_ventana/common.c
+++ b/board/gateworks/gw_ventana/common.c
@@ -859,6 +859,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
    	.vidin_en = IMX_GPIO_NR(5, 20),
    	.wdis = IMX_GPIO_NR(7, 12),
    	.otgpwr_en = IMX_GPIO_NR(3, 22),
+		.nand = true,
    },
/* GW52xx */
@@ -884,6 +885,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
    	.otgpwr_en = IMX_GPIO_NR(3, 22),
    	.vsel_pin = IMX_GPIO_NR(6, 14),
    	.mmc_cd = IMX_GPIO_NR(7, 0),
+		.nand = true,
    },
/* GW53xx */
@@ -908,6 +910,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
    	.otgpwr_en = IMX_GPIO_NR(3, 22),
    	.vsel_pin = IMX_GPIO_NR(6, 14),
    	.mmc_cd = IMX_GPIO_NR(7, 0),
+		.nand = true,
    },
/* GW54xx */
@@ -934,6 +937,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
    	.otgpwr_en = IMX_GPIO_NR(3, 22),
    	.vsel_pin = IMX_GPIO_NR(6, 14),
    	.mmc_cd = IMX_GPIO_NR(7, 0),
+		.nand = true,
    },
/* GW551x */
@@ -947,6 +951,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
    	},
    	.pcie_rst = IMX_GPIO_NR(1, 0),
    	.wdis = IMX_GPIO_NR(7, 12),
+		.nand = true,
    },
/* GW552x */
@@ -964,6 +969,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
    	.usb_sel = IMX_GPIO_NR(1, 7),
    	.wdis = IMX_GPIO_NR(7, 12),
    	.msata_en = GP_MSATA_SEL,
+		.nand = true,
    },
/* GW553x */
@@ -982,6 +988,7 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
    	.otgpwr_en = IMX_GPIO_NR(3, 22),
    	.vsel_pin = IMX_GPIO_NR(6, 14),
    	.mmc_cd = IMX_GPIO_NR(7, 0),
+		.nand = true,
    },
/* GW560x */
diff --git a/board/gateworks/gw_ventana/common.h b/board/gateworks/gw_ventana/common.h
index 027e972280..5cec01c838 100644
--- a/board/gateworks/gw_ventana/common.h
+++ b/board/gateworks/gw_ventana/common.h
@@ -80,6 +80,7 @@ struct ventana {
    int mmc_cd;
    /* various features */
    bool usd_vsel;
+	bool nand;
 };
extern struct ventana gpio_cfg[GW_UNKNOWN];
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index adccad8032..c4a16fff31 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -647,21 +647,23 @@ int board_init(void)
    /* address of linux boot parameters */
    gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
+	/* read Gateworks EEPROM into global struct (used later) */
+	setup_ventana_i2c(0);
+	board_type = read_eeprom(CONFIG_I2C_GSC, &ventana_info);
+
 #ifdef CONFIG_CMD_NAND
-	setup_gpmi_nand();
+	if (gpio_cfg[board_type].nand)
+		setup_gpmi_nand();
 #endif
 #ifdef CONFIG_MXC_SPI
    setup_spi();
 #endif
-	setup_ventana_i2c(0);
    setup_ventana_i2c(1);
    setup_ventana_i2c(2);
#ifdef CONFIG_SATA
    setup_sata();
 #endif
-	/* read Gateworks EEPROM into global struct (used later) */
-	board_type = read_eeprom(CONFIG_I2C_GSC, &ventana_info);
setup_iomux_gpio(board_type, &ventana_info);
-- 
2.17.1


    