Merge series "regulator: mt6397: Implement of_map_mode regulator_desc... (8cc31dc9) · Commits · 戴 / test

Merge series "regulator: mt6397: Implement of_map_mode regulator_desc function" from Anand K Mistry <amistry@google.com>: This patchset adds support for being able to change regulator modes for the mt6397 regulator. This is needed to allow the voltage scaling support in the MT8173 SoC to be used on the elm (Acer Chromebook R13) and hana (several Lenovo Chromebooks) devices. Without a of_map_mode implementation, the regulator-allowed-modes devicetree field is skipped, and attempting to change the regulator mode results in an error: [ 1.439165] vpca15: mode operation not allowed Changes in v2: - Introduce constants in dt-bindings - Improve conditional readability Anand K Mistry (4): regulator: mt6397: Move buck modes into header file dt-bindings: regulator: mt6397: Document valid modes regulator: mt6397: Implement of_map_mode arm64: dts: mediatek: Update allowed mt6397 regulator modes for elm boards .../bindings/regulator/mt6397-regulator.txt | 3 +++ arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 4 +++- drivers/regulator/mt6397-regulator.c | 17 ++++++++++++++--- .../regulator/mediatek,mt6397-regulator.h | 15 +++++++++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 include/dt-bindings/regulator/mediatek,mt6397-regulator.h -- 2.27.0.212.ge8ba1cc988-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Documentation/devicetree/bindings/regulator/mt6397-regulator.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,9 @@ LDO:
		ldo_vemc3v3, ldo_vgp1, ldo_vgp2, ldo_vgp3, ldo_vgp4, ldo_vgp5, ldo_vgp6,
		ldo_vibr

		BUCK regulators can set regulator-initial-mode and regulator-allowed-modes to
		values specified in dt-bindings/regulator/mediatek,mt6397-regulator.h

		Example:
		pmic {
		compatible = "mediatek,mt6397";

drivers/regulator/mt6397-regulator.c

+14 −3

Original line number	Diff line number	Diff line
		@@ -13,9 +13,7 @@
		#include <linux/regulator/machine.h>
		#include <linux/regulator/mt6397-regulator.h>
		#include <linux/regulator/of_regulator.h>

		#define MT6397_BUCK_MODE_AUTO 0
		#define MT6397_BUCK_MODE_FORCE_PWM 1
		#include <dt-bindings/regulator/mediatek,mt6397-regulator.h>

		/*
		* MT6397 regulators' information
		@@ -55,6 +53,7 @@ struct mt6397_regulator_info {
		.vsel_mask = vosel_mask, \
		.enable_reg = enreg, \
		.enable_mask = BIT(0), \
		.of_map_mode = mt6397_map_mode, \
		}, \
		.qi = BIT(13), \
		.vselon_reg = voselon, \
		@@ -146,6 +145,18 @@ static const unsigned int ldo_volt_table7[] = {
		1300000, 1500000, 1800000, 2000000, 2500000, 2800000, 3000000, 3300000,
		};

		static unsigned int mt6397_map_mode(unsigned int mode)
		{
		switch (mode) {
		case MT6397_BUCK_MODE_AUTO:
		return REGULATOR_MODE_NORMAL;
		case MT6397_BUCK_MODE_FORCE_PWM:
		return REGULATOR_MODE_FAST;
		default:
		return REGULATOR_MODE_INVALID;
		}
		}

		static int mt6397_regulator_set_mode(struct regulator_dev *rdev,
		unsigned int mode)
		{

include/dt-bindings/regulator/mediatek,mt6397-regulator.h

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */

		#ifndef _DT_BINDINGS_REGULATOR_MEDIATEK_MT6397_H_
		#define _DT_BINDINGS_REGULATOR_MEDIATEK_MT6397_H_

		/*
		* Buck mode constants which may be used in devicetree properties (eg.
		* regulator-initial-mode, regulator-allowed-modes).
		* See the manufacturer's datasheet for more information on these modes.
		*/

		#define MT6397_BUCK_MODE_AUTO 0
		#define MT6397_BUCK_MODE_FORCE_PWM 1

		#endif

Admin message