[PATCH 087/108] x86: apl: Add a check for reading the FSP-S config

[Simon Glass]

This currently fails as two required items are commented out. Put them
back in and add a check that reading the config succeeds.

Both of these items need a little more work to put them in an appropriate
driver at some point.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 arch/x86/cpu/apollolake/fsp_s.c   |  6 ++++--
 arch/x86/dts/chromebook_coral.dts | 12 ++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/arch/x86/cpu/apollolake/fsp_s.c b/arch/x86/cpu/apollolake/fsp_s.c
index e7e0c30873..d1aad7a094 100644
--- a/arch/x86/cpu/apollolake/fsp_s.c
+++ b/arch/x86/cpu/apollolake/fsp_s.c
@@ -350,8 +350,10 @@ int fsps_update_config(struct udevice *dev, ulong rom_offset,
 
 	apl = malloc(sizeof(*apl));
 	if (!apl)
-		return log_msg_ret("config", -ENOMEM);
-	get_config(dev, apl);
+		return log_msg_ret("alloc", -ENOMEM);
+	ret = get_config(dev, apl);
+	if (ret)
+		return log_msg_ret("config", ret);
 
 	cfg->ish_enable = 0;
 	cfg->enable_sata = 0;
diff --git a/arch/x86/dts/chromebook_coral.dts b/arch/x86/dts/chromebook_coral.dts
index 7ba38d7791..3c6f14310f 100644
--- a/arch/x86/dts/chromebook_coral.dts
+++ b/arch/x86/dts/chromebook_coral.dts
@@ -497,13 +497,13 @@
 	 * If the Board has PERST_0 signal, assign the GPIO
 	 * If the Board does not have PERST_0, assign GPIO_PRT0_UDEF
 	 *
-	 * This are not used yet, so comment them out for now.
-	 *
-	 * prt0-gpio = <GPIO_122>;
-	 *
-	 * GPIO for SD card detect
-	 * sdcard-cd-gpio = <GPIO_177>;
+	 * This should be converted to real GPIOs and ideally stored in the
+	 * device they relate to.
 	 */
+	prt0-gpio = <GPIO_122>;
+
+	/* GPIO for SD card detect */
+	sdcard-cd-gpio = <GPIO_177>;
 
 	/*
 	 * Order is emmc-tx-data-cntl1, emmc-tx-data-cntl2,
-- 
2.25.0.341.g760bfbb309-goog