diff mbox

[U-Boot,5/6] x86: Add SD/MMC support to quark/galileo

Message ID 1423038374-2530-6-git-send-email-bmeng.cn@gmail.com
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Bin Meng Feb. 4, 2015, 8:26 a.m. UTC
Intel Galileo board has a microSD slot which is routed from Quark SoC
SDIO controller. Enable SD/MMC support so that we can use an SD card.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/cpu/quark/quark.c | 11 +++++++++++
 include/configs/galileo.h  |  7 +++++++
 2 files changed, 18 insertions(+)

Comments

Simon Glass Feb. 5, 2015, 3:26 a.m. UTC | #1
On 4 February 2015 at 01:26, Bin Meng <bmeng.cn@gmail.com> wrote:
> Intel Galileo board has a microSD slot which is routed from Quark SoC
> SDIO controller. Enable SD/MMC support so that we can use an SD card.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/cpu/quark/quark.c | 11 +++++++++++
>  include/configs/galileo.h  |  7 +++++++
>  2 files changed, 18 insertions(+)

Acked-by: Simon Glass <sjg@chromium.org>
Simon Glass Feb. 6, 2015, 8:27 p.m. UTC | #2
On 4 February 2015 at 20:26, Simon Glass <sjg@chromium.org> wrote:
> On 4 February 2015 at 01:26, Bin Meng <bmeng.cn@gmail.com> wrote:
>> Intel Galileo board has a microSD slot which is routed from Quark SoC
>> SDIO controller. Enable SD/MMC support so that we can use an SD card.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  arch/x86/cpu/quark/quark.c | 11 +++++++++++
>>  include/configs/galileo.h  |  7 +++++++
>>  2 files changed, 18 insertions(+)
>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/arch/x86/cpu/quark/quark.c b/arch/x86/cpu/quark/quark.c
index 0d593d9..dccf7ac 100644
--- a/arch/x86/cpu/quark/quark.c
+++ b/arch/x86/cpu/quark/quark.c
@@ -5,6 +5,7 @@ 
  */
 
 #include <common.h>
+#include <mmc.h>
 #include <asm/io.h>
 #include <asm/pci.h>
 #include <asm/post.h>
@@ -13,6 +14,10 @@ 
 #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 },
+};
+
 /*
  * TODO:
  *
@@ -105,3 +110,9 @@  void reset_cpu(ulong addr)
 	/* cold reset */
 	outb(0x08, PORT_RESET);
 }
+
+int cpu_mmc_init(bd_t *bis)
+{
+	return pci_mmc_init("Quark SDHCI", mmc_supported,
+			    ARRAY_SIZE(mmc_supported));
+}
diff --git a/include/configs/galileo.h b/include/configs/galileo.h
index bead2fc..d745f4e 100644
--- a/include/configs/galileo.h
+++ b/include/configs/galileo.h
@@ -50,4 +50,11 @@ 
 #undef CONFIG_VIDEO
 #undef CONFIG_CFB_CONSOLE
 
+/* SD/MMC support */
+#define CONFIG_MMC
+#define CONFIG_SDHCI
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC_SDMA
+#define CONFIG_CMD_MMC
+
 #endif	/* __CONFIG_H */