mfd: Rename twl5031 sih modules

[safe/jmp/linux-2.6] / drivers / ata / ahci.h

diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 111a878..7113c57 100644 (file)
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -208,6 +208,7 @@ enum {
        AHCI_HFLAG_SRST_TOUT_IS_OFFLINE = (1 << 11), /* treat SRST timeout as
                                                        link offline */
        AHCI_HFLAG_NO_SNTF              = (1 << 12), /* no sntf */
+       AHCI_HFLAG_NO_FPDMA_AA          = (1 << 13), /* no FPDMA AA */
 
        /* ap->flags bits */
 
@@ -223,9 +224,18 @@ enum {
        EM_MAX_RETRY                    = 5,
 
        /* em_ctl bits */
-       EM_CTL_RST                      = (1 << 9), /* Reset */
-       EM_CTL_TM                       = (1 << 8), /* Transmit Message */
-       EM_CTL_ALHD                     = (1 << 26), /* Activity LED */
+       EM_CTL_RST              = (1 << 9), /* Reset */
+       EM_CTL_TM               = (1 << 8), /* Transmit Message */
+       EM_CTL_MR               = (1 << 0), /* Message Recieved */
+       EM_CTL_ALHD             = (1 << 26), /* Activity LED */
+       EM_CTL_XMT              = (1 << 25), /* Transmit Only */
+       EM_CTL_SMB              = (1 << 24), /* Single Message Buffer */
+
+       /* em message type */
+       EM_MSG_TYPE_LED         = (1 << 0), /* LED */
+       EM_MSG_TYPE_SAFTE       = (1 << 1), /* SAF-TE */
+       EM_MSG_TYPE_SES2        = (1 << 2), /* SES-2 */
+       EM_MSG_TYPE_SGPIO       = (1 << 3), /* SGPIO */
 };
 
 struct ahci_cmd_hdr {
@@ -281,9 +291,10 @@ struct ahci_host_priv {
        u32                     saved_cap2;     /* saved initial cap2 */
        u32                     saved_port_map; /* saved initial port_map */
        u32                     em_loc; /* enclosure management location */
+       u32                     em_buf_sz;      /* EM buffer size in byte */
+       u32                     em_msg_type;    /* EM message type */
 };
 
-extern int ahci_em_messages;
 extern int ahci_ignore_sss;
 
 extern struct scsi_host_template ahci_sht;