From da2364cc14a0b34411c4a228ae687a23504afe04 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Mon, 26 Jun 2017 16:36:15 -0700 Subject: Revert "x86: Convert MMC to driver model" This reverts commit ddb3ac3c716f56cead695444e65a7ba7b0946555. With MMC converted to driver model, SCSI driver is broken due to zero address access at (ops->read) in block_dread() function. The fix (SCSI driver converted to DM) is ready in u-boot-dm branch, but it is too late for this relese to get that in. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- include/mmc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include/mmc.h') diff --git a/include/mmc.h b/include/mmc.h index 6a0ea0a..00576fa 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -585,6 +585,18 @@ int cpu_mmc_init(bd_t *bis); int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr); int mmc_get_env_dev(void); +struct pci_device_id; + +/** + * pci_mmc_init() - set up PCI MMC devices + * + * This finds all the matching PCI IDs and sets them up as MMC devices. + * + * @name: Name to use for devices + * @mmc_supported: PCI IDs to search for, terminated by {0, 0} + */ +int pci_mmc_init(const char *name, struct pci_device_id *mmc_supported); + /* Set block count limit because of 16 bit register limit on some hardware*/ #ifndef CONFIG_SYS_MMC_MAX_BLK_COUNT #define CONFIG_SYS_MMC_MAX_BLK_COUNT 65535 -- cgit v1.1