mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-10 21:26:19 +09:00
Merge branch 'master' of git://git.denx.de/u-boot-sh
This commit is contained in:
commit
26b068280f
|
@ -374,7 +374,7 @@ static int renesas_sdhi_probe(struct udevice *dev)
|
||||||
ret = tmio_sd_probe(dev, quirks);
|
ret = tmio_sd_probe(dev, quirks);
|
||||||
#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)
|
#if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)
|
||||||
if (!ret)
|
if (!ret)
|
||||||
renesas_sdhi_reset_tuning(dev_get_priv(dev));
|
renesas_sdhi_reset_tuning(priv);
|
||||||
#endif
|
#endif
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,7 +97,7 @@ static int rcar_gen2_pci_addr_valid(pci_dev_t d, uint offset)
|
||||||
|
|
||||||
/* Only one EHCI/OHCI device built-in */
|
/* Only one EHCI/OHCI device built-in */
|
||||||
slot = PCI_DEV(d);
|
slot = PCI_DEV(d);
|
||||||
if (slot > 2)
|
if (slot != 1 && slot != 2)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
/* bridge logic only has registers to 0x40 */
|
/* bridge logic only has registers to 0x40 */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user