summaryrefslogtreecommitdiff
path: root/common/board_r.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-03-05 12:25:25 -0700
committerSimon Glass <sjg@chromium.org>2015-04-16 19:27:43 -0600
commitff3e077bd23c37c83d01aad105e528194e33d75e (patch)
tree187c45a9cc100b90e9d3dc3cf623178e928f73c1 /common/board_r.c
parentaab6724c90c39e1f599d4ee6354c9f2cf553dc61 (diff)
dm: pci: Add a uclass for PCI
Add a uclass for PCI controllers and a generic one for PCI devices. Adjust the 'pci' command and the existing PCI support to work with this new uclass. Keep most of the compatibility code in a separate file so that it can be removed one day. TODO: Add more header file comments to the new parts of pci.h Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/board_r.c')
-rw-r--r--common/board_r.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/board_r.c b/common/board_r.c
index 0335f6bde6..af01e1cb99 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -230,7 +230,9 @@ static int initr_unlock_ram_in_cache(void)
#ifdef CONFIG_PCI
static int initr_pci(void)
{
+#ifndef CONFIG_DM_PCI
pci_init();
+#endif
return 0;
}