mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-29 14:41:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86: apl: Drop support for !OF_PLATDATA_PARENT

Browse Source 
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>
This commit is contained in:
Simon Glass 2020-12-22 19:30:25 -07:00
parent 79ea8f749d
commit c238eeebc9
4 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/cpu/apollolake/Kconfig
View File

@ -19,6 +19,7 @@ config INTEL_APOLLOLAKE
select SMP_AP_WORK select SMP_AP_WORK
select INTEL_GMA_SWSMISCI select INTEL_GMA_SWSMISCI
select ACPI_GNVS_EXTERNAL select ACPI_GNVS_EXTERNAL
select TPL_OF_PLATDATA_PARENT
imply ENABLE_MRC_CACHE imply ENABLE_MRC_CACHE
imply AHCI_PCI imply AHCI_PCI
imply SCSI imply SCSI

28
arch/x86/cpu/apollolake/spl.c
View File

@ -83,33 +83,6 @@ static int apl_flash_probe(struct udevice *dev)
return spi_flash_std_probe(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 = { static const struct dm_spi_flash_ops apl_flash_ops = {
.read = apl_flash_std_read, .read = apl_flash_std_read,
}; };
@ -123,7 +96,6 @@ U_BOOT_DRIVER(winbond_w25q128fw) = {
.name = "winbond_w25q128fw", .name = "winbond_w25q128fw",
.id = UCLASS_SPI_FLASH, .id = UCLASS_SPI_FLASH,
.of_match = apl_flash_ids, .of_match = apl_flash_ids,
.bind = apl_flash_bind,
.probe = apl_flash_probe, .probe = apl_flash_probe,
.priv_auto = sizeof(struct spi_flash), .priv_auto = sizeof(struct spi_flash),
.ops = &apl_flash_ops, .ops = &apl_flash_ops,

15
drivers/misc/p2sb-uclass.c
View File

@ -168,26 +168,11 @@ int p2sb_get_port_id(struct udevice *dev)
int p2sb_set_port_id(struct udevice *dev, int portid) int p2sb_set_port_id(struct udevice *dev, int portid)
{ {
struct udevice *ps2b;
struct p2sb_child_plat *pplat; struct p2sb_child_plat *pplat;
if (!CONFIG_IS_ENABLED(OF_PLATDATA)) if (!CONFIG_IS_ENABLED(OF_PLATDATA))
return -ENOSYS; 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 = dev_get_parent_plat(dev);
pplat->pid = portid; pplat->pid = portid;

2
drivers/pinctrl/intel/pinctrl_apl.c
View File

@ -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 * linker list (i.e. alphabetical order by driver name). So the GPIO
* device may well be bound before its parent (p2sb), and this call * device may well be bound before its parent (p2sb), and this call
* will fail if p2sb is not bound yet. * 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); ret = p2sb_set_port_id(dev, plat->dtplat.intel_p2sb_port_id);
if (ret) if (ret)