diff options
author | Tom Rini <trini@konsulko.com> | 2017-06-27 16:33:10 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-06-27 16:33:10 +0300 |
commit | 08546df976b79b1694af3ff12b26baf2931f371a (patch) | |
tree | 253cc05daee7d9070850ff0f1dcbe15739235cfb /arch | |
parent | 821560fd8e43eecc208c1c52ad24faadb6b52703 (diff) | |
parent | da2364cc14a0b34411c4a228ae687a23504afe04 (diff) | |
download | u-boot-08546df976b79b1694af3ff12b26baf2931f371a.tar.xz |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch')
-rw-r--r-- | arch/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/cpu/baytrail/valleyview.c | 12 | ||||
-rw-r--r-- | arch/x86/cpu/quark/quark.c | 10 | ||||
-rw-r--r-- | arch/x86/cpu/queensbay/Makefile | 2 | ||||
-rw-r--r-- | arch/x86/cpu/queensbay/topcliff.c | 20 |
5 files changed, 43 insertions, 2 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index e44767113d..d04ab9f177 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -96,7 +96,6 @@ config X86 select DM_SPI select DM_SPI_FLASH select USB_EHCI_HCD - select DM_MMC if MMC imply CMD_FPGA_LOADMK imply CMD_GETTIME imply CMD_IO diff --git a/arch/x86/cpu/baytrail/valleyview.c b/arch/x86/cpu/baytrail/valleyview.c index c58f6a86a8..87ba849c1c 100644 --- a/arch/x86/cpu/baytrail/valleyview.c +++ b/arch/x86/cpu/baytrail/valleyview.c @@ -11,6 +11,18 @@ #include <asm/mrccache.h> #include <asm/post.h> +static struct pci_device_id mmc_supported[] = { + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT_SDIO }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT_SD }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT_EMMC2 }, + {}, +}; + +int cpu_mmc_init(bd_t *bis) +{ + return pci_mmc_init("ValleyView SDHCI", mmc_supported); +} + #ifndef CONFIG_EFI_APP int arch_cpu_init(void) { diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c index c36a5892d5..0c2cea4ee9 100644 --- a/arch/x86/cpu/quark/quark.c +++ b/arch/x86/cpu/quark/quark.c @@ -16,6 +16,11 @@ #include <asm/arch/msg_port.h> #include <asm/arch/quark.h> +static struct pci_device_id mmc_supported[] = { + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_QRK_SDIO }, + {}, +}; + static void quark_setup_mtrr(void) { u32 base, mask; @@ -323,6 +328,11 @@ int arch_early_init_r(void) return 0; } +int cpu_mmc_init(bd_t *bis) +{ + return pci_mmc_init("Quark SDHCI", mmc_supported); +} + int arch_misc_init(void) { #ifdef CONFIG_ENABLE_MRC_CACHE diff --git a/arch/x86/cpu/queensbay/Makefile b/arch/x86/cpu/queensbay/Makefile index c0681995bd..af3ffad385 100644 --- a/arch/x86/cpu/queensbay/Makefile +++ b/arch/x86/cpu/queensbay/Makefile @@ -5,4 +5,4 @@ # obj-y += fsp_configs.o irq.o -obj-y += tnc.o +obj-y += tnc.o topcliff.o diff --git a/arch/x86/cpu/queensbay/topcliff.c b/arch/x86/cpu/queensbay/topcliff.c new file mode 100644 index 0000000000..b76dd7de69 --- /dev/null +++ b/arch/x86/cpu/queensbay/topcliff.c @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2014, Bin Meng <bmeng.cn@gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <mmc.h> +#include <pci_ids.h> + +static struct pci_device_id mmc_supported[] = { + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SDIO_0 }, + { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SDIO_1 }, + {}, +}; + +int cpu_mmc_init(bd_t *bis) +{ + return pci_mmc_init("Topcliff SDHCI", mmc_supported); +} |