Merge branch 'master' of git://git.denx.de/u-boot-mmc

[J-u-boot.git] / include / ahci.h

diff --git a/include/ahci.h b/include/ahci.h
index 35b8a8c09b1879530e971f9583e40e253a980f9a..4876b41e9010cef3077493c014db4dc9a92eadd8 100644 (file)
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -135,23 +135,27 @@ 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;
        u32     host_flags;
        u32     host_set_flags;
-       u32     mmio_base;
+       void __iomem *mmio_base;
        u32     pio_mask;
        u32     udma_mask;
        u32     flags;
@@ -160,6 +164,7 @@ struct ahci_probe_ent {
        u32     link_port_map; /*linkup port map*/
 };
 
-int ahci_init(u32 base);
+int ahci_init(void __iomem *base);
+int ahci_reset(void __iomem *base);
 
 #endif