Merge branch 'master' of git://git.denx.de/u-boot-sh

drivers/mmc/renesas-sdhi.c

@@ -374,7 +374,7 @@ static int renesas_sdhi_probe(struct udevice *dev)
 	ret = tmio_sd_probe(dev, quirks);
 #if CONFIG_IS_ENABLED(MMC_HS200_SUPPORT)
 	if (!ret)
-		renesas_sdhi_reset_tuning(dev_get_priv(dev));
+		renesas_sdhi_reset_tuning(priv);
 #endif
 	return ret;
 }

drivers/pci/pci-rcar-gen2.c

@@ -97,7 +97,7 @@ static int rcar_gen2_pci_addr_valid(pci_dev_t d, uint offset)
 
 	/* Only one EHCI/OHCI device built-in */
 	slot = PCI_DEV(d);
-	if (slot > 2)
+	if (slot != 1 && slot != 2)
 		return -EINVAL;
 
 	/* bridge logic only has registers to 0x40 */