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

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

Merge "msm: pm: cleanup spm code related to SAW2_V1"

parents 6760c1ae 049d2bd5

arch/arm/mach-msm/spm.h

+3 −41
Original line number Diff line number Diff line
@@ -28,43 +28,6 @@ enum { 
	MSM_SPM_L2_MODE_POWER_COLLAPSE,

};



#if defined(CONFIG_MSM_SPM_V1)



enum {

	MSM_SPM_REG_SAW_AVS_CTL,

	MSM_SPM_REG_SAW_CFG,

	MSM_SPM_REG_SAW_SPM_CTL,

	MSM_SPM_REG_SAW_SPM_SLP_TMR_DLY,

	MSM_SPM_REG_SAW_SPM_WAKE_TMR_DLY,

	MSM_SPM_REG_SAW_SLP_CLK_EN,

	MSM_SPM_REG_SAW_SLP_HSFS_PRECLMP_EN,

	MSM_SPM_REG_SAW_SLP_HSFS_POSTCLMP_EN,

	MSM_SPM_REG_SAW_SLP_CLMP_EN,

	MSM_SPM_REG_SAW_SLP_RST_EN,

	MSM_SPM_REG_SAW_SPM_MPM_CFG,

	MSM_SPM_REG_NR_INITIALIZE,



	MSM_SPM_REG_SAW_VCTL = MSM_SPM_REG_NR_INITIALIZE,

	MSM_SPM_REG_SAW_STS,

	MSM_SPM_REG_SAW_SPM_PMIC_CTL,

	MSM_SPM_REG_NR

};



struct msm_spm_platform_data {

	void __iomem *reg_base_addr;

	uint32_t reg_init_values[MSM_SPM_REG_NR_INITIALIZE];



	uint8_t awake_vlevel;

	uint8_t retention_vlevel;

	uint8_t collapse_vlevel;

	uint8_t retention_mid_vlevel;

	uint8_t collapse_mid_vlevel;



	uint32_t vctl_timeout_us;

};



#elif defined(CONFIG_MSM_SPM_V2)



enum {

	MSM_SPM_REG_SAW2_CFG,

	MSM_SPM_REG_SAW2_AVS_CTL,
@@ -123,9 +86,8 @@ struct msm_spm_platform_data { 
	uint32_t num_modes;

	struct msm_spm_seq_entry *modes;

};

#endif



#if defined(CONFIG_MSM_SPM_V1) || defined(CONFIG_MSM_SPM_V2)

#if defined(CONFIG_MSM_SPM_V2)



/* Public functions */
@@ -181,7 +143,7 @@ static inline int msm_spm_enable_fts_lpm(uint32_t mode) 
	return -ENOSYS;

}

#endif /* defined(CONFIG_MSM_L2_SPM) */

#else /* defined(CONFIG_MSM_SPM_V1) || defined(CONFIG_MSM_SPM_V2) */

#else /* defined(CONFIG_MSM_SPM_V2) */

static inline int msm_spm_set_low_power_mode(unsigned int mode, bool notify_rpm)

{

	return -ENOSYS;
@@ -212,5 +174,5 @@ static inline int msm_spm_device_init(void) 
	return -ENOSYS;

}



#endif  /*defined(CONFIG_MSM_SPM_V1) || defined (CONFIG_MSM_SPM_V2) */

#endif  /* defined (CONFIG_MSM_SPM_V2) */

#endif  /* __ARCH_ARM_MACH_MSM_SPM_H */