commit 8d5bcef8780e79200bd1a55119a6b16ea8d9bd8a
author Simon Glass <sjg@chromium.org> Sat Oct 03 11:31:39 2020 -0600
committer Simon Glass <sjg@chromium.org> Thu Oct 29 14:42:18 2020 -0600
tree 8df7643fc7155e6fd1ff71cc0be512c333a333da
parent ecdc4b3f315cb93bd7cce5be5d89d726fa3e48ff

x86: apl: Take advantage of the of-platdata parent support

Now that parent devices are supported with of-platadata, we don't need the
messy code to fix up the parent pointers and allocations on Apollo Lake.
Put the code behind a condition.

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

arch/x86/cpu/apollolake/spl.c

diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 5a53831..089b37c 100644
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -90,7 +90,8 @@
  */
 static int apl_flash_bind(struct udevice *dev)
 {
-	if (CONFIG_IS_ENABLED(OF_PLATDATA)) {
+	if (CONFIG_IS_ENABLED(OF_PLATDATA) &&
+	    !CONFIG_IS_ENABLED(OF_PLATDATA_PARENT)) {
 		struct dm_spi_slave_platdata *plat;
 		struct udevice *spi;
 		int ret;