Index: ichspi.c
===================================================================
--- ichspi.c	(revision 1463)
+++ ichspi.c	(working copy)
@@ -1562,8 +1562,6 @@
 	/* Assign Virtual Address */
 	ich_spibar = rcrb + spibar_offset;
 
-	ich_init_opcodes();
-
 	switch (ich_generation) {
 	case CHIPSET_ICH7:
 		msg_pdbg("0x00: 0x%04x     (SPIS)\n",
@@ -1603,6 +1601,7 @@
 		}
 		ich_set_bbar(0);
 		register_spi_programmer(&spi_programmer_ich7);
+		ich_init_opcodes();
 		break;
 	case CHIPSET_ICH8:
 	default:		/* Future version might behave the same */
@@ -1754,6 +1753,7 @@
 			register_opaque_programmer(&opaque_programmer_ich_hwseq);
 		} else {
 			register_spi_programmer(&spi_programmer_ich9);
+			ich_init_opcodes();
 		}
 		break;
 	}