common: arm: davinci: Move header file out of common

[people/ms/u-boot.git] / include / ahci.h

diff --git a/include/ahci.h b/include/ahci.h
index 6d917121c67bc5e60b11ccb06bb094e8bbfbc159..4876b41e9010cef3077493c014db4dc9a92eadd8 100644 (file)
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -135,17 +135,21 @@ struct ahci_sg {
 };
 
 struct ahci_ioports {
-       u32     cmd_addr;
-       u32     scr_addr;
-       u32     port_mmio;
+       void __iomem    *cmd_addr;
+       void __iomem    *scr_addr;
+       void __iomem    *port_mmio;
        struct ahci_cmd_hdr     *cmd_slot;
        struct ahci_sg          *cmd_tbl_sg;
-       u32     cmd_tbl;
+       ulong   cmd_tbl;
        u32     rx_fis;
 };
 
 struct ahci_probe_ent {
+#if defined(CONFIG_DM_PCI) || defined(CONFIG_DM_SCSI)
+       struct udevice *dev;
+#else
        pci_dev_t       dev;
+#endif
        struct ahci_ioports     port[AHCI_MAX_PORTS];
        u32     n_ports;
        u32     hard_port_no;