diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-15 11:06:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-15 11:06:24 -0400 |
| commit | d3fc3da9a4fb98104d004b025149ec6dadccc2cd (patch) | |
| tree | dfe357a19bc480ea1bd5c9732bc82b3c7441790c /drivers/spi/ich.c | |
| parent | 18e7ebf7555203e26066c6264b2275c34e03632d (diff) | |
| parent | 2f91fc40039d2ef6f433d5c56c4f4701975f510f (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- x86: various improvements made in getting Chromium OS verified boot
running on top of coreboot, booting into U-Boot.
Diffstat (limited to 'drivers/spi/ich.c')
| -rw-r--r-- | drivers/spi/ich.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/ich.c b/drivers/spi/ich.c index 1cd410493b..3d49c22a9d 100644 --- a/drivers/spi/ich.c +++ b/drivers/spi/ich.c @@ -114,7 +114,7 @@ static bool ich9_can_do_33mhz(struct udevice *dev) struct ich_spi_priv *priv = dev_get_priv(dev); u32 fdod, speed; - if (!CONFIG_IS_ENABLED(PCI)) + if (!CONFIG_IS_ENABLED(PCI) || !priv->pch) return false; /* Observe SPI Descriptor Component Section 0 */ dm_pci_write_config32(priv->pch, 0xb0, 0x1000); @@ -632,7 +632,7 @@ static int ich_spi_get_basics(struct udevice *bus, bool can_probe, if (device_get_uclass_id(pch) != UCLASS_PCH) { uclass_first_device(UCLASS_PCH, &pch); if (!pch) - return log_msg_ret("uclass", -EPROTOTYPE); + ; /* ignore this error since we don't need it */ } } |