X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fahci.h;h=4876b41e9010cef3077493c014db4dc9a92eadd8;hb=2d8d190c8394b43c0989cdb04a50cb48d4e1f8da;hp=e8dee5357514c1cb33140da968626d8217f145ba;hpb=7375f4007f7f0be439e9956ae429cdd4dd80b537;p=platform%2Fkernel%2Fu-boot.git

diff --git a/include/ahci.h b/include/ahci.h
index e8dee53..4876b41 100644
--- 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,7 +164,7 @@ struct ahci_probe_ent {
 	u32	link_port_map; /*linkup port map*/
 };
 
-int ahci_init(u32 base);
-int ahci_reset(u32 base);
+int ahci_init(void __iomem *base);
+int ahci_reset(void __iomem *base);
 
 #endif