1 files changed, 8 insertions, 54 deletions

diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c
index 010fb45e4a..64d9706551 100644
--- a/src/drivers/spi/gigadevice.c
+++ b/src/drivers/spi/gigadevice.c
@@ -39,133 +39,87 @@ static const struct spi_flash_part_id flash_table[] = {
 		.id				= 0x3114,
 		.name				= "GD25T80",
 		.nr_sectors_shift		= 8,
-		.sector_size_kib_shift		= 2,
 	},
 	{
 		.id				= 0x4014,
 		.name				= "GD25Q80",
 		.nr_sectors_shift		= 8,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},					/* also GD25Q80B */
 	{
 		.id				= 0x4015,
 		.name				= "GD25Q16",
 		.nr_sectors_shift		= 9,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},					/* also GD25Q16B */
 	{
 		.id				= 0x4016,
 		.name				= "GD25Q32B",
 		.nr_sectors_shift		= 10,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},					/* also GD25Q32B */
 	{
 		.id				= 0x4017,
 		.name				= "GD25Q64",
 		.nr_sectors_shift		= 11,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},					/* also GD25Q64B, GD25B64C */
 	{
 		.id				= 0x4018,
 		.name				= "GD25Q128",
 		.nr_sectors_shift		= 12,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},					/* also GD25Q128B */
 	{
 		.id				= 0x4214,
 		.name				= "GD25VQ80C",
 		.nr_sectors_shift		= 8,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},
 	{
 		.id				= 0x4215,
 		.name				= "GD25VQ16C",
 		.nr_sectors_shift		= 9,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},
 	{
 		.id				= 0x6014,
 		.name				= "GD25LQ80",
 		.nr_sectors_shift		= 8,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},
 	{
 		.id				= 0x6015,
 		.name				= "GD25LQ16",
 		.nr_sectors_shift		= 9,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},
 	{
 		.id				= 0x6016,
 		.name				= "GD25LQ32",
 		.nr_sectors_shift		= 10,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},
 	{
 		.id				= 0x6017,
 		.name				= "GD25LQ64C",
 		.nr_sectors_shift		= 11,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},					/* also GD25LB64C */
 	{
 		.id				= 0x6018,
 		.name				= "GD25LQ128",
 		.nr_sectors_shift		= 12,
-		.sector_size_kib_shift		= 2,
 		.fast_read_dual_output_support	= 1,
 	},
 };
 
-static const struct spi_flash_ops spi_flash_ops = {
-	.read = spi_flash_cmd_read,
-	.write = spi_flash_cmd_write_page_program,
-	.erase = spi_flash_cmd_erase,
-	.status = spi_flash_cmd_status,
+const struct spi_flash_vendor_info spi_flash_gigadevice_vi = {
+	.id = VENDOR_ID_GIGADEVICE,
+	.page_size_shift = 8,
+	.sector_size_kib_shift = 2,
+	.match_id_mask = 0xffff,
+	.ids = flash_table,
+	.nr_part_ids = ARRAY_SIZE(flash_table),
+	.desc = &spi_flash_pp_0x20_sector_desc,
 };
-
-int spi_flash_probe_gigadevice(const struct spi_slave *spi, u8 *idcode,
-				struct spi_flash *flash)
-{
-	const struct spi_flash_part_id *params;
-	unsigned int i;
-
-	for (i = 0; i < ARRAY_SIZE(flash_table); i++) {
-		params = &flash_table[i];
-		if (params->id == ((idcode[1] << 8) | idcode[2]))
-			break;
-	}
-
-	if (i == ARRAY_SIZE(flash_table)) {
-		printk(BIOS_WARNING,
-		       "SF gigadevice.c: Unsupported ID %#02x%02x\n",
-		       idcode[1], idcode[2]);
-		return -1;
-	}
-
-	memcpy(&flash->spi, spi, sizeof(*spi));
-	flash->name = params->name;
-
-	/* Assuming power-of-two page size initially. */
-	flash->page_size = 256;
-	flash->sector_size = (1U << params->sector_size_kib_shift) * KiB;
-	flash->size = flash->sector_size * (1U << params->nr_sectors_shift);
-	flash->erase_cmd = CMD_GD25_SE;
-	flash->status_cmd = CMD_GD25_RDSR;
-	flash->pp_cmd = CMD_GD25_PP;
-	flash->wren_cmd = CMD_GD25_WREN;
-
-	flash->ops = &spi_flash_ops;
-
-	return 0;
-}