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

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

Merge "ARM: dts: msm: update max level of CX/MX rail for MDM9650"

parents 12e2d1d2 78022502

arch/arm/boot/dts/qcom/mdm9650-regulator.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
			regulator-min-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

					<RPM_SMD_REGULATOR_LEVEL_TURBO_NO_CPR>;

			qcom,use-voltage-level;

		};
@@ -80,7 +80,7 @@ 
			regulator-min-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

					<RPM_SMD_REGULATOR_LEVEL_TURBO_NO_CPR>;

			qcom,use-voltage-level;

		};
@@ -91,7 +91,7 @@ 
			regulator-min-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

					<RPM_SMD_REGULATOR_LEVEL_TURBO_NO_CPR>;

			qcom,use-voltage-floor-level;

		};

	};
@@ -194,7 +194,7 @@ 
			regulator-min-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_RETENTION>;

			regulator-max-microvolt =

					<RPM_SMD_REGULATOR_LEVEL_TURBO>;

					<RPM_SMD_REGULATOR_LEVEL_TURBO_NO_CPR>;

			qcom,use-voltage-level;

		};

	};

include/dt-bindings/regulator/qcom,rpm-smd-regulator.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015, 2017 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
@@ -23,6 +23,7 @@ 
#define RPM_SMD_REGULATOR_LEVEL_NOM		256

#define RPM_SMD_REGULATOR_LEVEL_NOM_PLUS	320

#define RPM_SMD_REGULATOR_LEVEL_TURBO		384

#define RPM_SMD_REGULATOR_LEVEL_TURBO_NO_CPR	416

#define RPM_SMD_REGULATOR_LEVEL_BINNING		512



#endif

include/linux/regulator/rpm-smd-regulator.h

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2013, 2015 The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2013, 2015, 2017 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
@@ -58,6 +59,7 @@ enum rpm_regulator_voltage_level { 
	RPM_REGULATOR_LEVEL_NOM			= 256,

	RPM_REGULATOR_LEVEL_NOM_PLUS		= 320,

	RPM_REGULATOR_LEVEL_TURBO		= 384,

	RPM_REGULATOR_LEVEL_TURBO_NO_CPR	= 416,

	RPM_REGULATOR_LEVEL_BINNING		= 512,

	RPM_REGULATOR_LEVEL_MAX			= 65535,

};