Merge branch 'drm-tda998x-fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...

[deliverable/linux.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index bfbc817c34eee29be2749f2b7ab39f8b0d657ca8..91f705de2c0be743dac06dac565817516058fc56 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -191,7 +191,8 @@ enum {
        ATA_DEV_PMP_UNSUP       = 6,    /* SATA port multiplier (unsupported) */
        ATA_DEV_SEMB            = 7,    /* SEMB */
        ATA_DEV_SEMB_UNSUP      = 8,    /* SEMB (unsupported) */
-       ATA_DEV_NONE            = 9,    /* no device */
+       ATA_DEV_ZAC             = 9,    /* ZAC device */
+       ATA_DEV_NONE            = 10,   /* no device */
 
        /* struct ata_link flags */
        ATA_LFLAG_NO_HRST       = (1 << 1), /* avoid hardreset */
@@ -230,6 +231,7 @@ enum {
        ATA_FLAG_SW_ACTIVITY    = (1 << 22), /* driver supports sw activity
                                              * led */
        ATA_FLAG_NO_DIPM        = (1 << 23), /* host not happy with DIPM */
+       ATA_FLAG_LOWTAG         = (1 << 24), /* host wants lowest available tag */
 
        /* bits 24:31 of ap->flags are reserved for LLD specific flags */
 
@@ -421,6 +423,7 @@ enum {
        ATA_HORKAGE_NO_NCQ_TRIM = (1 << 19),    /* don't use queued TRIM */
        ATA_HORKAGE_NOLPM       = (1 << 20),    /* don't use LPM */
        ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21),  /* some WDs have broken LPM */
+       ATA_HORKAGE_ZERO_AFTER_TRIM = (1 << 22),/* guarantees zero after trim */
 
         /* DMA mask for user DMA control: User visible values; DO NOT
            renumber */
@@ -1491,7 +1494,8 @@ static inline unsigned int ata_tag_internal(unsigned int tag)
 static inline unsigned int ata_class_enabled(unsigned int class)
 {
        return class == ATA_DEV_ATA || class == ATA_DEV_ATAPI ||
-               class == ATA_DEV_PMP || class == ATA_DEV_SEMB;
+               class == ATA_DEV_PMP || class == ATA_DEV_SEMB ||
+               class == ATA_DEV_ZAC;
 }
 
 static inline unsigned int ata_class_disabled(unsigned int class)