leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mmc: arm_pl180_mmci: Sync compatible with kernel

Browse Source 
Initially the compatible string was wrongly set to "st,stm32f4xx-sdio".
Use compatible string used by kernel instead and identify mmci variant
using "arm,primecell-periphid" property.

Currently, the DM part of mmci driver is only used by STM32 SoCs,
that's why the switch case gets only one entry. It will be populated
easily with new variant in the future.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Patrice Chotard 2018-12-05 14:04:32 +01:00
parent dd18df440a
commit 6f41d1a17e
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/mmc/arm_pl180_mmci.c
View File

@ -422,6 +422,7 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
struct mmc_config *cfg = &pdata->cfg; struct mmc_config *cfg = &pdata->cfg;
struct clk clk; struct clk clk;
u32 bus_width; u32 bus_width;
u32 periphid;
int ret; int ret;
ret = clk_get_by_index(dev, 0, &clk); ret = clk_get_by_index(dev, 0, &clk);
@ -439,7 +440,15 @@ static int arm_pl180_mmc_probe(struct udevice *dev)
host->clkdiv_init = SDI_CLKCR_CLKDIV_INIT_V1 | SDI_CLKCR_CLKEN | host->clkdiv_init = SDI_CLKCR_CLKDIV_INIT_V1 | SDI_CLKCR_CLKEN |
SDI_CLKCR_HWFC_EN; SDI_CLKCR_HWFC_EN;
host->clock_in = clk_get_rate(&clk); host->clock_in = clk_get_rate(&clk);
host->version2 = dev_get_driver_data(dev);
periphid = dev_read_u32_default(dev, "arm,primecell-periphid", 0);
switch (periphid) {
case STM32_MMCI_ID: /* stm32 variant */
host->version2 = false;
break;
default:
host->version2 = true;
}
cfg->name = dev->name; cfg->name = dev->name;
cfg->voltages = VOLTAGE_WINDOW_SD; cfg->voltages = VOLTAGE_WINDOW_SD;
@ -526,7 +535,8 @@ static int arm_pl180_mmc_ofdata_to_platdata(struct udevice *dev)
} }
static const struct udevice_id arm_pl180_mmc_match[] = { static const struct udevice_id arm_pl180_mmc_match[] = {
{ .compatible = "st,stm32f4xx-sdio", .data = VERSION1 }, { .compatible = "arm,pl180" },
{ .compatible = "arm,primecell" },
{ /* sentinel */ } { /* sentinel */ }
}; };

3
drivers/mmc/arm_pl180_mmci.h
View File

@ -141,8 +141,7 @@
#define SDI_FIFO_BURST_SIZE 8 #define SDI_FIFO_BURST_SIZE 8
#define VERSION1 false #define STM32_MMCI_ID 0x00880180
#define VERSION2 true
struct sdi_registers { struct sdi_registers {
u32 power; /* 0x00*/ u32 power; /* 0x00*/