x86: apl: Drop support for !OF_PLATDATA_PARENT

This code was kept around after of-platdata started supporting parent
devices. That feature seems stable now, so let's drop it.

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

diff --git a/arch/x86/cpu/apollolake/Kconfig b/arch/x86/cpu/apollolake/Kconfig
index c6c1350f4f082a16049bb9326158aef10b746fd4..f5dbd6cbd349d3c68d24e48005d263f8cf874901 100644 (file)
--- a/arch/x86/cpu/apollolake/Kconfig
+++ b/arch/x86/cpu/apollolake/Kconfig
@@ -19,6 +19,7 @@ config INTEL_APOLLOLAKE
        select SMP_AP_WORK
        select INTEL_GMA_SWSMISCI
        select ACPI_GNVS_EXTERNAL
+       select TPL_OF_PLATDATA_PARENT
        imply ENABLE_MRC_CACHE
        imply AHCI_PCI
        imply SCSI

diff --git a/arch/x86/cpu/apollolake/spl.c b/arch/x86/cpu/apollolake/spl.c
index 3a1588bbd8b98894a29a3c03a66954ec36d19e4c..16a2f15c6bcc885843b6cc438c5d35611324f0a5 100644 (file)
--- a/arch/x86/cpu/apollolake/spl.c
+++ b/arch/x86/cpu/apollolake/spl.c
@@ -83,33 +83,6 @@ static int apl_flash_probe(struct udevice *dev)
        return spi_flash_std_probe(dev);
 }
 
-/*
- * Manually set the parent of the SPI flash to SPI, since dtoc doesn't. We also
- * need to allocate the parent_plat since by the time this function is
- * called device_bind() has already gone past that step.
- */
-static int apl_flash_bind(struct udevice *dev)
-{
-       if (CONFIG_IS_ENABLED(OF_PLATDATA) &&
-           !CONFIG_IS_ENABLED(OF_PLATDATA_PARENT)) {
-               struct dm_spi_slave_plat *plat;
-               struct udevice *spi;
-               int ret;
-
-               ret = uclass_first_device_err(UCLASS_SPI, &spi);
-               if (ret)
-                       return ret;
-               dev->parent = spi;
-
-               plat = calloc(sizeof(*plat), 1);
-               if (!plat)
-                       return -ENOMEM;
-               dev->parent_plat = plat;
-       }
-
-       return 0;
-}
-
 static const struct dm_spi_flash_ops apl_flash_ops = {
        .read           = apl_flash_std_read,
 };
@@ -123,7 +96,6 @@ U_BOOT_DRIVER(winbond_w25q128fw) = {
        .name           = "winbond_w25q128fw",
        .id             = UCLASS_SPI_FLASH,
        .of_match       = apl_flash_ids,
-       .bind           = apl_flash_bind,
        .probe          = apl_flash_probe,
        .priv_auto      = sizeof(struct spi_flash),
        .ops            = &apl_flash_ops,

diff --git a/drivers/misc/p2sb-uclass.c b/drivers/misc/p2sb-uclass.c
index 8f9ec027a2e87c7693216b56413d02c2b531639f..ac2852559f57cf629ce5e25bf2a2d4cfddb5c273 100644 (file)
--- a/drivers/misc/p2sb-uclass.c
+++ b/drivers/misc/p2sb-uclass.c
@@ -168,26 +168,11 @@ int p2sb_get_port_id(struct udevice *dev)
 
 int p2sb_set_port_id(struct udevice *dev, int portid)
 {
-       struct udevice *ps2b;
        struct p2sb_child_plat *pplat;
 
        if (!CONFIG_IS_ENABLED(OF_PLATDATA))
                return -ENOSYS;
 
-       if (!CONFIG_IS_ENABLED(OF_PLATDATA_PARENT)) {
-               uclass_find_first_device(UCLASS_P2SB, &ps2b);
-               if (!ps2b)
-                       return -EDEADLK;
-               dev->parent = ps2b;
-
-               /*
-                * We must allocate this, since when the device was bound it did
-                * not have a parent.
-                */
-               dev->parent_plat = malloc(sizeof(*pplat));
-               if (!dev->parent_plat)
-                       return -ENOMEM;
-       }
        pplat = dev_get_parent_plat(dev);
        pplat->pid = portid;
 

diff --git a/drivers/pinctrl/intel/pinctrl_apl.c b/drivers/pinctrl/intel/pinctrl_apl.c
index 48b0e9a161b2673c4980318d12b80ac172be2936..2bb654c8a1846b6a0bd79198e80fd43e290a77fc 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl_apl.c
+++ b/drivers/pinctrl/intel/pinctrl_apl.c
@@ -152,8 +152,6 @@ static int apl_pinctrl_of_to_plat(struct udevice *dev)
         * linker list (i.e. alphabetical order by driver name). So the GPIO
         * device may well be bound before its parent (p2sb), and this call
         * will fail if p2sb is not bound yet.
-        *
-        * TODO(sjg@chromium.org): Add a parent pointer to child devices in dtoc
         */
        ret = p2sb_set_port_id(dev, plat->dtplat.intel_p2sb_port_id);
        if (ret)