Merge tag 'rpmsg-v4.7' of git://github.com/andersson/remoteproc

[mirror_ubuntu-zesty-kernel.git] / include / linux / ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index c1a2f345cbe6146352fff77080019eba5d0fe76e..f310ec0f072e5e9ada48935d9c0c1b362424598f 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -371,7 +371,8 @@ enum {
        SETFEATURES_AAM_ON      = 0x42,
        SETFEATURES_AAM_OFF     = 0xC2,
 
-       SETFEATURES_SPINUP      = 0x07, /* Spin-up drive */
+       SETFEATURES_SPINUP              = 0x07, /* Spin-up drive */
+       SETFEATURES_SPINUP_TIMEOUT      = 30000, /* 30s timeout for drive spin-up from PUIS */
 
        SETFEATURES_SATA_ENABLE = 0x10, /* Enable use of SATA feature */
        SETFEATURES_SATA_DISABLE = 0x90, /* Disable use of SATA feature */