Move spibar out of ich_init_spi()
Move spibar handling out of ich_init_spi() into enable_flash_ich_spi().
V.2: baytrail has a 0 offset && tunnelcreek has a 0x3020 offset.
V.3: Don't use integer for gen, rather use CHIPSET_TUNNEL_CREEK enum.
Backport part of the upstream `commit 92d6a861c`.
BUG=chromium:478356
BRANCH=none
TEST=still builds
Change-Id: I96480c76d6ed0b715dc87fde9dc3a04b3915750d
Signed-off-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/1787769
Reviewed-by: Sam McNally <sammc@chromium.org>
diff --git a/programmer.h b/programmer.h
index 2ddf3df..4e92ff9 100644
--- a/programmer.h
+++ b/programmer.h
@@ -639,8 +639,7 @@
*/
extern int ich_dry_run;
extern uint32_t ichspi_bbar;
-int ich_init_spi(struct pci_dev *dev, uint32_t base, void *rcrb,
- enum ich_chipset ich_generation);
+int ich_init_spi(struct pci_dev *dev, void *spibar, enum ich_chipset ich_generation);
int via_init_spi(struct pci_dev *dev);
/* ene_lpc.c */