diff mbox series

[U-Boot,1/3] pci: Don't use pci_indirect when DM is active

Message ID 20180328124012.17163-1-mario.six@gdsys.cc
State Changes Requested
Delegated to: Mario Six
Headers show
Series [U-Boot,1/3] pci: Don't use pci_indirect when DM is active | expand

Commit Message

Mario Six March 28, 2018, 12:40 p.m. UTC
Declaration of indirect PCI bridges is not compatible with DM: Both
define PCI operations, but in different ways. Hence, don't use indirect
bridges if DM is active.

Signed-off-by: Mario Six <mario.six@gdsys.cc>
---
 drivers/pci/pci_indirect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Simon Glass March 29, 2018, 10:43 p.m. UTC | #1
+Bin

On 28 March 2018 at 20:40, Mario Six <mario.six@gdsys.cc> wrote:
> Declaration of indirect PCI bridges is not compatible with DM: Both
> define PCI operations, but in different ways. Hence, don't use indirect
> bridges if DM is active.
>
> Signed-off-by: Mario Six <mario.six@gdsys.cc>
> ---
>  drivers/pci/pci_indirect.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox series

Patch

diff --git a/drivers/pci/pci_indirect.c b/drivers/pci/pci_indirect.c
index 4a36749aa4..2db73f92de 100644
--- a/drivers/pci/pci_indirect.c
+++ b/drivers/pci/pci_indirect.c
@@ -8,7 +8,7 @@ 
 
 #include <common.h>
 
-#if !defined(__I386__)
+#if !defined(__I386__) && !defined(CONFIG_DM_PCI)
 
 #include <asm/processor.h>
 #include <asm/io.h>