Skip to contentSkip to conversation

x86: crownbay: Add SDHCI support

PATCH New Bin Meng 2 participants 3 messages Dec 4, 2014 – Dec 5, 2014 x86

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 24/25 x86: crownbay: Add SDHCI support

There are two standard SD card slots on the Crown Bay board, which are connected to the Topcliff PCH SDIO controllers. Enable the SDHC support so that we can use them.

---
 arch/x86/cpu/queensbay/Makefile   |  2 +-
 arch/x86/cpu/queensbay/topcliff.c | 44 +++++++++++++++++++++++++++++++++++++++
 include/configs/crownbay.h        |  6 ++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 arch/x86/cpu/queensbay/topcliff.c
arch/x86/cpu/queensbay/Makefile +1 -1
index ace04ca..2c2ec01 100644
@@ -4,6 +4,6 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y += tnc_car.o tnc_dram.o tnc.o
+obj-y += tnc_car.o tnc_dram.o tnc.o topcliff.o
 obj-y += fsp_configs.o fsp_support.o
 obj-$(CONFIG_PCI) += tnc_pci.o
arch/x86/cpu/queensbay/topcliff.c new file +44 -0

44 lines not on this page · raw message

include/configs/crownbay.h +6 -0
index 09a52ab..b9db6b7 100644
@@ -48,6 +48,12 @@
 
 #define CONFIG_SPI_FLASH_SST
 
+#define CONFIG_MMC
+#define CONFIG_SDHCI
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC_SDMA
+#define CONFIG_CMD_MMC
+
 /* Video is not supported */
 #undef CONFIG_VIDEO
 #undef CONFIG_CFB_CONSOLE
Signature · 1 line
1.8.2.1
#1 lore raw

PATCH 24/25 x86: crownbay: Add SDHCI support

Hi Bin,

Quoted 47 lines · Bin Meng

There are two standard SD card slots on the Crown Bay board, which are connected to the Topcliff PCH SDIO controllers. Enable the SDHC support so that we can use them.

---
 arch/x86/cpu/queensbay/Makefile   |  2 +-
 arch/x86/cpu/queensbay/topcliff.c | 44 +++++++++++++++++++++++++++++++++++++++
 include/configs/crownbay.h        |  6 ++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 arch/x86/cpu/queensbay/topcliff.c
arch/x86/cpu/queensbay/Makefile +1 -1
index ace04ca..2c2ec01 100644
@@ -4,6 +4,6 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-y += tnc_car.o tnc_dram.o tnc.o
+obj-y += tnc_car.o tnc_dram.o tnc.o topcliff.o
 obj-y += fsp_configs.o fsp_support.o
 obj-$(CONFIG_PCI) += tnc_pci.o
arch/x86/cpu/queensbay/topcliff.c new file +17 -0
new file mode 100644
index 0000000..4d2a24a
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2014, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <malloc.h>
+#include <pci.h>
+#include <pci_ids.h>
+#include <sdhci.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 },
+       { }

arch/x86/cpu/queensbay/topcliff.c line 27

Quoted 10 lines
arch/x86/cpu/queensbay/topcliff.c new file +10 -0
+};
+
+int cpu_mmc_init(bd_t *bis)
+{
+       struct sdhci_host *mmc_host;
+       pci_dev_t devbusfn;
+       u32 iobase;
+       int i;
+
+       for (i = 0; i < 2; i++) {

What is 2? Is it ARRAY_SIZE(mmc_supported)?

arch/x86/cpu/queensbay/topcliff.c line 40

Quoted 13 lines
arch/x86/cpu/queensbay/topcliff.c new file +13 -0
+               devbusfn =  pci_find_devices(mmc_supported, i);
+               if (devbusfn == -1)
+                       return -ENODEV;
+
+               mmc_host = (struct sdhci_host *)malloc(sizeof(struct sdhci_host));
+               if (!mmc_host)
+                       return -ENOMEM;
+
+               mmc_host->name = "Topcliff SDHCI";
+               pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, &iobase);
+               mmc_host->ioaddr = (void *)iobase;
+               mmc_host->quirks = 0;
+               add_sdhci(mmc_host, 0, 0);

Please check error retrun.

Quoted 22 lines
arch/x86/cpu/queensbay/topcliff.c new file +4 -0
+       }
+
+       return 1;
+}
include/configs/crownbay.h +6 -1
index 09a52ab..b9db6b7 100644
@@ -48,6 +48,12 @@
 
 #define CONFIG_SPI_FLASH_SST
 
+#define CONFIG_MMC
+#define CONFIG_SDHCI
+#define CONFIG_GENERIC_MMC
+#define CONFIG_MMC_SDMA
+#define CONFIG_CMD_MMC
+
 /* Video is not supported */
 #undef CONFIG_VIDEO
 #undef CONFIG_CFB_CONSOLE
--
Quoted 2 lines

1.8.2.1

Regards,
Simon

author
#2 lore raw

PATCH 24/25 x86: crownbay: Add SDHCI support

Hi Simon,

Quoted 54 lines · Simon Glass

Hi Bin,

Quoted 51 lines · Bin Meng

There are two standard SD card slots on the Crown Bay board, which are connected to the Topcliff PCH SDIO controllers. Enable the SDHC support so that we can use them.

---
 arch/x86/cpu/queensbay/Makefile   |  2 +-
 arch/x86/cpu/queensbay/topcliff.c | 44 +++++++++++++++++++++++++++++++++++++++
 include/configs/crownbay.h        |  6 ++++++
 3 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 arch/x86/cpu/queensbay/topcliff.c
arch/x86/cpu/queensbay/Makefile +1 -1
index ace04ca..2c2ec01 100644
@@ -4,6 +4,6 @@
 # SPDX-License-Identifier:     GPL-2.0+
 #
 
-obj-y += tnc_car.o tnc_dram.o tnc.o
+obj-y += tnc_car.o tnc_dram.o tnc.o topcliff.o
 obj-y += fsp_configs.o fsp_support.o
 obj-$(CONFIG_PCI) += tnc_pci.o
arch/x86/cpu/queensbay/topcliff.c new file +21 -0
new file mode 100644
index 0000000..4d2a24a
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2014, Bin Meng <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <errno.h>
+#include <malloc.h>
+#include <pci.h>
+#include <pci_ids.h>
+#include <sdhci.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)
+{
Quoted 8 lines

arch/x86/cpu/queensbay/topcliff.c line 27

Quoted 6 lines
arch/x86/cpu/queensbay/topcliff.c new file +6 -0
+       struct sdhci_host *mmc_host;
+       pci_dev_t devbusfn;
+       u32 iobase;
+       int i;
+
+       for (i = 0; i < 2; i++) {

What is 2? Is it ARRAY_SIZE(mmc_supported)?

Yes, will change it to that.

Quoted 7 lines
Quoted 7 lines
arch/x86/cpu/queensbay/topcliff.c new file +7 -0
+               devbusfn =  pci_find_devices(mmc_supported, i);
+               if (devbusfn == -1)
+                       return -ENODEV;
+
+               mmc_host = (struct sdhci_host *)malloc(sizeof(struct sdhci_host));
+               if (!mmc_host)
+                       return -ENOMEM;
Quoted 8 lines

arch/x86/cpu/queensbay/topcliff.c line 40

Quoted 6 lines
arch/x86/cpu/queensbay/topcliff.c new file +6 -0
+
+               mmc_host->name = "Topcliff SDHCI";
+               pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, &iobase);
+               mmc_host->ioaddr = (void *)iobase;
+               mmc_host->quirks = 0;
+               add_sdhci(mmc_host, 0, 0);

Please check error retrun.

OK.

[snip]

Regards,
Bin