ichspi: Add support for discrete Cannon Lake PCHs

Only minor differences in the Firmware Descriptor, compared to their
predecessors.

We extend our check on the `ICCRIBA` field in the descriptor to dis-
tinguish it from older generation. Alas, the `freq_read` field was
repurposed, so we can't use it as sanity check any more.

Change-Id: I1c2d1e8916cecd756e7ac1f0ba221d7cc361ba02
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/34072
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
diff --git a/chipset_enable.c b/chipset_enable.c
index 877b8b6..427182c 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -2035,16 +2035,16 @@
 	{0x8086, 0xa2c9, B_S,    NT,  "Intel", "Z370",				enable_flash_pch100},
 	{0x8086, 0xa2d2, B_S,    NT,  "Intel", "X299",				enable_flash_pch100},
 	{0x8086, 0x5ae8, B_S,    DEP, "Intel", "Apollo Lake",			enable_flash_apl},
-	{0x8086, 0xa303, B_S,    BAD, "Intel", "H310",				enable_flash_pch300},
-	{0x8086, 0xa304, B_S,    BAD, "Intel", "H370",				enable_flash_pch300},
-	{0x8086, 0xa305, B_S,    BAD, "Intel", "Z390",				enable_flash_pch300},
-	{0x8086, 0xa306, B_S,    BAD, "Intel", "Q370",				enable_flash_pch300},
-	{0x8086, 0xa308, B_S,    BAD, "Intel", "B360",				enable_flash_pch300},
-	{0x8086, 0xa309, B_S,    BAD, "Intel", "C246",				enable_flash_pch300},
-	{0x8086, 0xa30a, B_S,    BAD, "Intel", "C242",				enable_flash_pch300},
-	{0x8086, 0xa30c, B_S,    BAD, "Intel", "QM370",				enable_flash_pch300},
-	{0x8086, 0xa30d, B_S,    BAD, "Intel", "HM370",				enable_flash_pch300},
-	{0x8086, 0xa30e, B_S,    BAD, "Intel", "CM246",				enable_flash_pch300},
+	{0x8086, 0xa303, B_S,    NT,  "Intel", "H310",				enable_flash_pch300},
+	{0x8086, 0xa304, B_S,    NT,  "Intel", "H370",				enable_flash_pch300},
+	{0x8086, 0xa305, B_S,    NT,  "Intel", "Z390",				enable_flash_pch300},
+	{0x8086, 0xa306, B_S,    NT,  "Intel", "Q370",				enable_flash_pch300},
+	{0x8086, 0xa308, B_S,    NT,  "Intel", "B360",				enable_flash_pch300},
+	{0x8086, 0xa309, B_S,    NT,  "Intel", "C246",				enable_flash_pch300},
+	{0x8086, 0xa30a, B_S,    NT,  "Intel", "C242",				enable_flash_pch300},
+	{0x8086, 0xa30c, B_S,    NT,  "Intel", "QM370",				enable_flash_pch300},
+	{0x8086, 0xa30d, B_S,    NT,  "Intel", "HM370",				enable_flash_pch300},
+	{0x8086, 0xa30e, B_S,    NT,  "Intel", "CM246",				enable_flash_pch300},
 #endif
 	{0},
 };