Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / linux / ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 5c4e54a2a8d65361aaf7ff9ee691baab67cb642e..72ab80801ef61d3f82c3a3cb7e980a2ca6c0f275 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -190,6 +190,8 @@ enum {
        ATA_CMD_READ_LOG_EXT    = 0x2f,
        ATA_CMD_PMP_READ        = 0xE4,
        ATA_CMD_PMP_WRITE       = 0xE8,
+       ATA_CMD_CONF_OVERLAY    = 0xB1,
+       ATA_CMD_SEC_FREEZE_LOCK = 0xF5,
 
        /* READ_LOG_EXT pages */
        ATA_LOG_SATA_NCQ        = 0x10,
@@ -239,6 +241,19 @@ enum {
        SATA_AN                 = 0x05,  /* Asynchronous Notification */
        SATA_DIPM               = 0x03,  /* Device Initiated Power Management */
 
+       /* feature values for SET_MAX */
+       ATA_SET_MAX_ADDR        = 0x00,
+       ATA_SET_MAX_PASSWD      = 0x01,
+       ATA_SET_MAX_LOCK        = 0x02,
+       ATA_SET_MAX_UNLOCK      = 0x03,
+       ATA_SET_MAX_FREEZE_LOCK = 0x04,
+
+       /* feature values for DEVICE CONFIGURATION OVERLAY */
+       ATA_DCO_RESTORE         = 0xC0,
+       ATA_DCO_FREEZE_LOCK     = 0xC1,
+       ATA_DCO_IDENTIFY        = 0xC2,
+       ATA_DCO_SET             = 0xC3,
+
        /* ATAPI stuff */
        ATAPI_PKT_DMA           = (1 << 0),
        ATAPI_DMADIR            = (1 << 2),     /* ATAPI data dir: