diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-20 12:28:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-20 12:28:40 -0500 |
| commit | 0c41e59a37fbd5b10d4837ae30c288a084997465 (patch) | |
| tree | d67fad6104715409d83073752a67cea273727249 /drivers/core/syscon-uclass.c | |
| parent | 176b32cd4fec52307dd8234ec1c86d2f340e7a36 (diff) | |
| parent | e2c901c99e2622005f98a9623c4b5339257bfad3 (diff) | |
Merge git://git.denx.de/u-boot-x86
- Add support for sound.
Albeit the big changeset, changes are pretty limited to x86 only and a
few new sound drivers used by x86 so I think it would be good to have
this in the next release.
Diffstat (limited to 'drivers/core/syscon-uclass.c')
| -rw-r--r-- | drivers/core/syscon-uclass.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/core/syscon-uclass.c b/drivers/core/syscon-uclass.c index 3cf9dd9dbe4..afac6d6e37e 100644 --- a/drivers/core/syscon-uclass.c +++ b/drivers/core/syscon-uclass.c @@ -37,6 +37,10 @@ static int syscon_pre_probe(struct udevice *dev) { struct syscon_uc_info *priv = dev_get_uclass_priv(dev); + /* Special case for PCI devices, which don't have a regmap */ + if (device_get_uclass_id(dev->parent) == UCLASS_PCI) + return 0; + /* * With OF_PLATDATA we really have no way of knowing the format of * the device-specific platform data. So we assume that it starts with |