diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
commit | 19ac97ff701ae3c0eda09dd88f590806f1c4eb2d (patch) | |
tree | 62bb6b6358783dc9d6c26f480fa378843abb0235 /drivers/scsi/ufs/ufshci.h | |
parent | 24c20f10583647e30afe87b6f6d5e14bc7b1cbc6 (diff) | |
parent | e785060ea3a1c8e37a8bc1449c79e36bff2b5b13 (diff) |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-linus
Diffstat (limited to 'drivers/scsi/ufs/ufshci.h')
-rw-r--r-- | drivers/scsi/ufs/ufshci.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/scsi/ufs/ufshci.h b/drivers/scsi/ufs/ufshci.h index e1b844bc9460..d5721199e9cc 100644 --- a/drivers/scsi/ufs/ufshci.h +++ b/drivers/scsi/ufs/ufshci.h @@ -124,8 +124,11 @@ enum { #define CONTROLLER_FATAL_ERROR UFS_BIT(16) #define SYSTEM_BUS_FATAL_ERROR UFS_BIT(17) -#define UFSHCD_UIC_MASK (UIC_COMMAND_COMPL |\ - UIC_POWER_MODE) +#define UFSHCD_UIC_PWR_MASK (UIC_HIBERNATE_ENTER |\ + UIC_HIBERNATE_EXIT |\ + UIC_POWER_MODE) + +#define UFSHCD_UIC_MASK (UIC_COMMAND_COMPL | UFSHCD_UIC_PWR_MASK) #define UFSHCD_ERROR_MASK (UIC_ERROR |\ DEVICE_FATAL_ERROR |\ @@ -210,7 +213,7 @@ enum { #define UIC_GET_ATTR_ID(v) (((v) >> 16) & 0xFFFF) /* UIC Commands */ -enum { +enum uic_cmd_dme { UIC_CMD_DME_GET = 0x01, UIC_CMD_DME_SET = 0x02, UIC_CMD_DME_PEER_GET = 0x03, |