Luc Verhaegen has uploaded this change for review. ( https://review.coreboot.org/29216
Change subject: ati: add iceland family ......................................................................
ati: add iceland family
Change-Id: I6f02d0db4408fcad5cde19c4f4c27484fad3598f Signed-off-by: Luc Verhaegen libv@skynet.be --- M ati_spi.c 1 file changed, 20 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/16/29216/1
diff --git a/ati_spi.c b/ati_spi.c index f327da1..4cfa1b1 100644 --- a/ati_spi.c +++ b/ati_spi.c @@ -36,6 +36,7 @@ ATI_SPI_TYPE_SOUTHERN_ISLAND, ATI_SPI_TYPE_BONAIRE, /* First of sea island type spi interface */ ATI_SPI_TYPE_HAWAII, + ATI_SPI_TYPE_ICELAND, };
struct ati_spi_pci_private { @@ -586,8 +587,10 @@ mmio_mask(CI_GPIOPAD_A, 0x40000000, 0x40000000); }
- /* disable open drain pads */ - smc_mask(CI_GENERAL_PWRMGT, 0, 0x0800); + if ((private->type != ATI_SPI_TYPE_BONAIRE) && + (private->type != ATI_SPI_TYPE_HAWAII)) + /* disable open drain pads */ + smc_mask(CI_GENERAL_PWRMGT, 0, 0x0800);
programmer_delay(1000);
@@ -769,6 +772,18 @@ .master = &ci_spi_master, };
+/* + * Used by Iceland + */ +static const struct ati_spi_pci_private iceland_spi_pci_private = { + .io_bar = CI_MMIO_BAR, + .type = ATI_SPI_TYPE_ICELAND, + .save = ci_spi_save, + .restore = ci_spi_restore, + .enable = ci_spi_enable, + .master = &ci_spi_master, +}; + const struct flashrom_pci_match ati_spi_pci_devices[] = { {0x1002, 0x6640, NT, &bonaire_spi_pci_private}, {0x1002, 0x6641, NT, &bonaire_spi_pci_private}, @@ -875,6 +890,9 @@ {0x1002, 0x68F9, NT, &evergreen_spi_pci_private}, {0x1002, 0x68FA, NT, &evergreen_spi_pci_private}, {0x1002, 0x68FE, NT, &evergreen_spi_pci_private}, + {0x1002, 0x6900, NT, &iceland_spi_pci_private}, + {0x1002, 0x6901, NT, &iceland_spi_pci_private}, + {0x1002, 0x6907, NT, &iceland_spi_pci_private}, {0x1002, 0x9400, NT, &r600_spi_pci_private}, {0x1002, 0x9401, NT, &r600_spi_pci_private}, {0x1002, 0x9402, NT, &r600_spi_pci_private},