Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0da8194d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "scsi: ufs: move power definitions to unipro header file"

parents 99ee6491 51625ff4

drivers/scsi/ufs/ufs-msm.c

+0 −18
Original line number Diff line number Diff line
@@ -1298,24 +1298,6 @@ struct ufs_msm_dev_params { 
	u32 desired_working_mode;

};



enum ufs_pwm_gear_tag {

	UFS_PWM_DONT_CHANGE,	/* Don't change Gear */

	UFS_PWM_G1,		/* PWM Gear 1 (default for reset) */

	UFS_PWM_G2,		/* PWM Gear 2 */

	UFS_PWM_G3,		/* PWM Gear 3 */

	UFS_PWM_G4,		/* PWM Gear 4 */

	UFS_PWM_G5,		/* PWM Gear 5 */

	UFS_PWM_G6,		/* PWM Gear 6 */

	UFS_PWM_G7,		/* PWM Gear 7 */

};



enum ufs_hs_gear_tag {

	UFS_HS_DONT_CHANGE,	/* Don't change Gear */

	UFS_HS_G1,		/* HS Gear 1 (default for reset) */

	UFS_HS_G2,		/* HS Gear 2 */

	UFS_HS_G3,		/* HS Gear 3 */

};



/**

 * as every power mode, according to the UFS spec, have a defined

 * number that are not corresponed to their order or power

drivers/scsi/ufs/unipro.h

+18 −0
Original line number Diff line number Diff line
@@ -92,6 +92,24 @@ enum { 
	PA_HS_MODE_B	= 2,

};



enum ufs_pwm_gear_tag {

	UFS_PWM_DONT_CHANGE,	/* Don't change Gear */

	UFS_PWM_G1,		/* PWM Gear 1 (default for reset) */

	UFS_PWM_G2,		/* PWM Gear 2 */

	UFS_PWM_G3,		/* PWM Gear 3 */

	UFS_PWM_G4,		/* PWM Gear 4 */

	UFS_PWM_G5,		/* PWM Gear 5 */

	UFS_PWM_G6,		/* PWM Gear 6 */

	UFS_PWM_G7,		/* PWM Gear 7 */

};



enum ufs_hs_gear_tag {

	UFS_HS_DONT_CHANGE,	/* Don't change Gear */

	UFS_HS_G1,		/* HS Gear 1 (default for reset) */

	UFS_HS_G2,		/* HS Gear 2 */

	UFS_HS_G3,		/* HS Gear 3 */

};



/*

 * Data Link Layer Attributes

 */