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

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

Merge "defconfig: msmtitanium: enable apss cpr4 driver"

parents b9a2c1fc 5509581c

arch/arm/configs/msmcortex-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ CONFIG_REGULATOR_QPNP=y 
CONFIG_REGULATOR_QPNP_LABIBB=y

CONFIG_REGULATOR_SPM=y

CONFIG_REGULATOR_CPR=y

CONFIG_REGULATOR_CPR4_APSS=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_RADIO_SUPPORT=y

arch/arm/configs/msmcortex_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ CONFIG_REGULATOR_QPNP=y 
CONFIG_REGULATOR_QPNP_LABIBB=y

CONFIG_REGULATOR_SPM=y

CONFIG_REGULATOR_CPR=y

CONFIG_REGULATOR_CPR4_APSS=y

CONFIG_MEDIA_SUPPORT=y

CONFIG_MEDIA_CAMERA_SUPPORT=y

CONFIG_MEDIA_RADIO_SUPPORT=y

drivers/regulator/cpr3-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
@@ -2087,7 +2087,7 @@ static int cpr3_regulator_wait_for_idle(struct cpr3_controller *ctrl, 
		time_ns = ktime_to_ns(ktime_sub(end, start));

		if (time_ns > max_wait_ns) {

			cpr3_err(ctrl, "CPR controller still busy after %lld us\n",

				time_ns / 1000);

				div_s64(time_ns, 1000));

			return -ETIMEDOUT;

		}

		usleep_range(50, 100);

drivers/regulator/cpr3-util.c

+5 −5
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
@@ -329,7 +329,7 @@ int cpr3_parse_array_property(struct cpr3_regulator *vreg, 
		offset = tuple_size * vreg->speed_bin_fuse;

	} else {

		if (vreg->speed_bins_supported > 0)

			cpr3_err(vreg, "property %s has invalid length=%d, should be %lu, %lu, or %lu\n",

			cpr3_err(vreg, "property %s has invalid length=%d, should be %zu, %zu, or %zu\n",

				prop_name, len,

				tuple_size * sizeof(u32),

				tuple_size * vreg->speed_bins_supported
@@ -337,7 +337,7 @@ int cpr3_parse_array_property(struct cpr3_regulator *vreg, 
				tuple_size * vreg->fuse_combos_supported

					   * sizeof(u32));

		else

			cpr3_err(vreg, "property %s has invalid length=%d, should be %lu or %lu\n",

			cpr3_err(vreg, "property %s has invalid length=%d, should be %zu or %zu\n",

				prop_name, len,

				tuple_size * sizeof(u32),

				tuple_size * vreg->fuse_combos_supported
@@ -404,7 +404,7 @@ int cpr3_parse_corner_array_property(struct cpr3_regulator *vreg, 
		offset = tuple_size * vreg->speed_bin_offset;

	} else {

		if (vreg->speed_bin_corner_sum > 0)

			cpr3_err(vreg, "property %s has invalid length=%d, should be %lu, %lu, or %lu\n",

			cpr3_err(vreg, "property %s has invalid length=%d, should be %zu, %zu, or %zu\n",

				prop_name, len,

				tuple_size * vreg->corner_count * sizeof(u32),

				tuple_size * vreg->speed_bin_corner_sum
@@ -412,7 +412,7 @@ int cpr3_parse_corner_array_property(struct cpr3_regulator *vreg, 
				tuple_size * vreg->fuse_combo_corner_sum

					   * sizeof(u32));

		else

			cpr3_err(vreg, "property %s has invalid length=%d, should be %lu or %lu\n",

			cpr3_err(vreg, "property %s has invalid length=%d, should be %zu or %zu\n",

				prop_name, len,

				tuple_size * vreg->corner_count * sizeof(u32),

				tuple_size * vreg->fuse_combo_corner_sum