Commit ad6b010d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'cpuidle-v5.14-rc1' of https://git.linaro.org/people/daniel.lezcano/linux 

Pull ARM cpuidle updates for v5.14 from Daniel Lezcano:

"- Add support for Qcom MSM8226 (Bartosz Dudziak)"

* tag 'cpuidle-v5.14-rc1' of https://git.linaro.org/people/daniel.lezcano/linux:
  cpuidle: qcom: Add SPM register data for MSM8226
  dt-bindings: arm: msm: Add SAW2 for MSM8226
parents 3563f55c 0f0ac1e4

Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ PROPERTIES 
			"qcom,saw2"

		    A more specific value could be one of:

			"qcom,apq8064-saw2-v1.1-cpu"

			"qcom,msm8226-saw2-v2.1-cpu"

			"qcom,msm8974-saw2-v2.1-cpu"

			"qcom,apq8084-saw2-v2.1-cpu"

drivers/cpuidle/cpuidle-qcom-spm.c

+14 −0
Original line number Diff line number Diff line
@@ -87,6 +87,18 @@ static const struct spm_reg_data spm_reg_8974_8084_cpu = { 
	.start_index[PM_SLEEP_MODE_SPC] = 3,

};



/* SPM register data for 8226 */

static const struct spm_reg_data spm_reg_8226_cpu  = {

	.reg_offset = spm_reg_offset_v2_1,

	.spm_cfg = 0x0,

	.spm_dly = 0x3C102800,

	.seq = { 0x60, 0x03, 0x60, 0x0B, 0x0F, 0x20, 0x10, 0x80, 0x30, 0x90,

		0x5B, 0x60, 0x03, 0x60, 0x3B, 0x76, 0x76, 0x0B, 0x94, 0x5B,

		0x80, 0x10, 0x26, 0x30, 0x0F },

	.start_index[PM_SLEEP_MODE_STBY] = 0,

	.start_index[PM_SLEEP_MODE_SPC] = 5,

};



static const u8 spm_reg_offset_v1_1[SPM_REG_NR] = {

	[SPM_REG_CFG]		= 0x08,

	[SPM_REG_SPM_CTL]	= 0x20,
@@ -259,6 +271,8 @@ static struct spm_driver_data *spm_get_drv(struct platform_device *pdev, 
}



static const struct of_device_id spm_match_table[] = {

	{ .compatible = "qcom,msm8226-saw2-v2.1-cpu",

	  .data = &spm_reg_8226_cpu },

	{ .compatible = "qcom,msm8974-saw2-v2.1-cpu",

	  .data = &spm_reg_8974_8084_cpu },

	{ .compatible = "qcom,apq8084-saw2-v2.1-cpu",