aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-11-11 14:19:04 -0500
committerTom Rini <trini@konsulko.com>2019-11-11 14:19:04 -0500
commit0b73ef0c02313e651af4b0a8e206c7c4a198e7f8 (patch)
tree6e84ad48ccdb4b02b3a272ec30e7967426c15e13 /drivers/pci
parenta4b7485e2f311b1319b1b9cd59f5666536e24a28 (diff)
parentbef18454044e62800ece687b8d50ddd853117660 (diff)
downloadu-boot-0b73ef0c02313e651af4b0a8e206c7c4a198e7f8.zip
u-boot-0b73ef0c02313e651af4b0a8e206c7c4a198e7f8.tar.gz
u-boot-0b73ef0c02313e651af4b0a8e206c7c4a198e7f8.tar.bz2
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq
- Rename CONFIG_SECURE_BOOT to CONFIG_NXP_ESBC. - Few bug fixes and updates related to SPI, hwconfig, ethernet, fsl-layerscape, pci, icid, PSCI
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pcie_layerscape.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c
index db1375a..5ad7c28 100644
--- a/drivers/pci/pcie_layerscape.c
+++ b/drivers/pci/pcie_layerscape.c
@@ -406,7 +406,11 @@ static void ls_pcie_ep_setup_bars(void *bar_base)
static void ls_pcie_ep_enable_cfg(struct ls_pcie *pcie)
{
- ctrl_writel(pcie, PCIE_CONFIG_READY, PCIE_PF_CONFIG);
+ u32 config;
+
+ config = ctrl_readl(pcie, PCIE_PF_CONFIG);
+ config |= PCIE_CONFIG_READY;
+ ctrl_writel(pcie, config, PCIE_PF_CONFIG);
}
static void ls_pcie_setup_ep(struct ls_pcie *pcie)