summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-03-31 09:01:36 +0200
committerWolfgang Denk <wd@denx.de>2011-03-31 09:01:36 +0200
commitb12fee010cff9738735e0f213205906ff68aead8 (patch)
tree2866f540a80650bf2e036d159bd7a2972666ec20 /drivers
parent53ce77eef1090e3f4004398c1d2abb410b63235c (diff)
parentb03a466d6ceb9dbfd1a1638f355e9c8b4833259f (diff)
downloadu-boot-imx-b12fee010cff9738735e0f213205906ff68aead8.zip
u-boot-imx-b12fee010cff9738735e0f213205906ff68aead8.tar.gz
u-boot-imx-b12fee010cff9738735e0f213205906ff68aead8.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/fsl_pci_init.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index 3118b85..dc34bd6 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -317,6 +317,13 @@ void fsl_pci_init(struct pci_controller *hose, struct fsl_pci_info *pci_info)
temp32 |= 0xf000e; /* set URR, FER, NFER (but not CER) */
pci_hose_write_config_dword(hose, dev, PCI_DCR, temp32);
+#if defined(CONFIG_FSL_PCIE_DISABLE_ASPM)
+ temp32 = 0;
+ pci_hose_read_config_dword(hose, dev, PCI_LCR, &temp32);
+ temp32 &= ~0x03; /* Disable ASPM */
+ pci_hose_write_config_dword(hose, dev, PCI_LCR, temp32);
+ udelay(1);
+#endif
if (pcie_cap == PCI_CAP_ID_EXP) {
pci_hose_read_config_word(hose, dev, PCI_LTSSM, &ltssm);
enabled = ltssm >= PCI_LTSSM_L0;