eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

imx: ventana: remove nand field from common ventana struct

Browse Source 
NAND fdt fixups can be performed without knowing if NAND is present.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey
2021-07-24 10:40:33 -07:00
committed by Stefano Babic
parent 45c902c434
commit 706d910bbc
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
board/gateworks/gw_ventana/common.c
View File

@@ -989,7 +989,6 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.gps_shdn = IMX_GPIO_NR(1, 2),
.vidin_en = IMX_GPIO_NR(5, 20),
.wdis = IMX_GPIO_NR(7, 12),
.nand = true,
},
/* GW52xx */
@@ -1014,7 +1013,6 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.rs232_en = GP_RS232_EN,
.vsel_pin = IMX_GPIO_NR(6, 14),
.mmc_cd = IMX_GPIO_NR(7, 0),
.nand = true,
},
/* GW53xx */
@@ -1038,7 +1036,6 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.rs232_en = GP_RS232_EN,
.vsel_pin = IMX_GPIO_NR(6, 14),
.mmc_cd = IMX_GPIO_NR(7, 0),
.nand = true,
},
/* GW54xx */
@@ -1064,7 +1061,6 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.rs232_en = GP_RS232_EN,
.vsel_pin = IMX_GPIO_NR(6, 14),
.mmc_cd = IMX_GPIO_NR(7, 0),
.nand = true,
},
/* GW551x */
@@ -1078,7 +1074,6 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
},
.pcie_rst = IMX_GPIO_NR(1, 0),
.wdis = IMX_GPIO_NR(7, 12),
.nand = true,
},
/* GW552x */
@@ -1096,7 +1091,6 @@ 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 */
@@ -1114,7 +1108,6 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
.wdis = IMX_GPIO_NR(7, 12),
.vsel_pin = IMX_GPIO_NR(6, 14),
.mmc_cd = IMX_GPIO_NR(7, 0),
.nand = true,
},
/* GW560x */
@@ -1146,7 +1139,6 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
IMX_GPIO_NR(4, 15),
},
.pcie_rst = IMX_GPIO_NR(1, 29),
.nand = true,
},
/* GW5902 */
@@ -1159,7 +1151,6 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
},
.pcie_rst = IMX_GPIO_NR(1, 0),
.rs232_en = GP_RS232_EN,
.nand = true,
},
/* GW5903 */
@@ -1216,7 +1207,6 @@ 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,
},
/* GW5907 */
@@ -1231,7 +1221,6 @@ struct ventana gpio_cfg[GW_UNKNOWN] = {
},
.pcie_rst = IMX_GPIO_NR(1, 0),
.wdis = IMX_GPIO_NR(7, 12),
.nand = true,
},
/* GW5908 */

1
board/gateworks/gw_ventana/common.h
View File

@@ -78,7 +78,6 @@ struct ventana {
int mmc_cd;
/* various features */
bool usd_vsel;
bool nand;
};
extern struct ventana gpio_cfg[GW_UNKNOWN];

10
board/gateworks/gw_ventana/gw_ventana.c
View File

@@ -981,7 +981,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
{
struct ventana_board_info *info = &ventana_info;
struct ventana_eeprom_config *cfg;
static const struct node_info nodes[] = {
static const struct node_info nand_nodes[] = {
{ "sst,w25q256", MTD_DEV_TYPE_NOR, }, /* SPI flash */
{ "fsl,imx6q-gpmi-nand", MTD_DEV_TYPE_NAND, }, /* NAND flash */
};
@@ -1003,11 +1003,9 @@ int ft_board_setup(void *blob, struct bd_info *bd)
return 0;
}
if (gpio_cfg[board_type].nand) {
/* Update partition nodes using info from mtdparts env var */
puts(" Updating MTD partitions...\n");
fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes));
}
/* Update MTD partition nodes using info from mtdparts env var */
puts(" Updating MTD partitions...\n");
fdt_fixup_mtdparts(blob, nand_nodes, ARRAY_SIZE(nand_nodes));
/* Update display timings from display env var */
if (display) {