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

spi: ich: Add Apollo Lake support

Browse Source 
Add support for Apollo Lake to the ICH driver. This involves adjusting the
mmio address and skipping setting of the bbar.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2019-12-06 21:42:49 -07:00 committed by Bin Meng
parent 636555a4c4
commit 3937df3d6c
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/spi/ich.c
View File

@ -106,10 +106,12 @@ static void ich_set_bbar(struct ich_spi_priv *ctlr, uint32_t minaddr)
const uint32_t bbar_mask = 0x00ffff00;
uint32_t ichspi_bbar;
minaddr &= bbar_mask;
ichspi_bbar = ich_readl(ctlr, ctlr->bbar) & ~bbar_mask;
ichspi_bbar |= minaddr;
ich_writel(ctlr, ichspi_bbar, ctlr->bbar);
if (ctlr->bbar) {
minaddr &= bbar_mask;
ichspi_bbar = ich_readl(ctlr, ctlr->bbar) & ~bbar_mask;
ichspi_bbar |= minaddr;
ich_writel(ctlr, ichspi_bbar, ctlr->bbar);
}
}
/* @return 1 if the SPI flash supports the 33MHz speed */
@ -750,6 +752,7 @@ static int ich_init_controller(struct udevice *dev,
ctlr->preop = offsetof(struct ich9_spi_regs, preop);
ctlr->bcr = offsetof(struct ich9_spi_regs, bcr);
ctlr->pr = &ich9_spi->pr[0];
} else if (plat->ich_version == ICHV_APL) {
} else {
debug("ICH SPI: Unrecognised ICH version %d\n",
plat->ich_version);
@ -878,7 +881,12 @@ static int ich_spi_ofdata_to_platdata(struct udevice *dev)
plat->ich_version = dev_get_driver_data(dev);
plat->lockdown = dev_read_bool(dev, "intel,spi-lock-down");
pch_get_spi_base(priv->pch, &plat->mmio_base);
if (plat->ich_version == ICHV_APL) {
plat->mmio_base = dm_pci_read_bar32(dev, 0);
} else {
/* SBASE is similar */
pch_get_spi_base(priv->pch, &plat->mmio_base);
}
/*
* Use an int so that the property is present in of-platdata even
* when false.
@ -916,6 +924,7 @@ static const struct dm_spi_ops ich_spi_ops = {
static const struct udevice_id ich_spi_ids[] = {
{ .compatible = "intel,ich7-spi", ICHV_7 },
{ .compatible = "intel,ich9-spi", ICHV_9 },
{ .compatible = "intel,fast-spi", ICHV_APL },
{ }
};

1
drivers/spi/ich.h
View File

@ -205,6 +205,7 @@ enum hsfsts_cycle_t {
enum ich_version {
ICHV_7,
ICHV_9,
ICHV_APL,
};
struct ich_spi_priv {