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

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

Merge "power: qcom: apm: Modify APM APCC mode check value for msmtitanium"

parents 550dd8bd 35a651d8

drivers/power/qcom/apm.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -564,7 +564,7 @@ static int msm8996_apm_switch_to_apcc(struct msm_apm_ctrl_dev *ctrl_dev) 
#define MSMTITANIUM_APM_MX_MODE_VAL            0x00

#define MSMTITANIUM_APM_APCC_MODE_VAL          0x02

#define MSMTITANIUM_APM_MX_DONE_VAL            0x00

#define MSMTITANIUM_APM_APCC_DONE_VAL          0x02

#define MSMTITANIUM_APM_APCC_DONE_VAL          0x03



/* Titanium register offset definitions */

#define MSMTITANIUM_APCC_APM_MODE              0x000002a8

drivers/regulator/cpr4-apss-regulator.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -367,7 +367,7 @@ static int cpr4_msmtitanium_apss_calculate_open_loop_voltages( 
		vreg->corner[i].open_loop_volt = fuse_volt[0];



	/* Interpolate voltages for the higher fuse corners. */

	for (i = 1; i < vreg->fuse_corner_count - 1; i++) {

	for (i = 1; i < vreg->fuse_corner_count; i++) {

		freq_low = vreg->corner[fmax_corner[i - 1]].proc_freq;

		volt_low = fuse_volt[i - 1];

		freq_high = vreg->corner[fmax_corner[i]].proc_freq;