From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CEFF3C5853 for ; Wed, 17 Jun 2026 09:46:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781689595; cv=none; b=Kl3aEd2myGdl2dz0zhoUnZBSMUdul3iLB7JQ9VdvJqAfiAhN3ApbU4e3DKYgoistBgserJyg8SYbI2yJ7tStXhM306uCJR4sa9aPogkN91IJUAuhsBK1+zdhpNHjJXN/ob24dYeeHm4oeZuOqYlVxGGqd5+dJHLZGajxtSm0Zfs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781689595; c=relaxed/simple; bh=BQ1Hg+csvGyTR0jmwrh+I6GsAZ7phlZ1X4XvAu3pgjM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JvUHpthojL6ASlzYGRXiJA7qBeA+0f6pkUINAQcFvROuLaj7IoGpmybuPX5RHcZ6toZPr6mlfNxbaIonoySqLlG+9yFaxeUZyGTMn5CCxEzmCgD15C64XqRtPNikhDk4LQWzzJ6Sn/Fse+DbWTDCceJZMgAw6kKDBHsMqmX/JM4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jE/W0Q5u; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jE/W0Q5u" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4903d730b1fso70288185e9.2 for ; Wed, 17 Jun 2026 02:46:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781689593; x=1782294393; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CZosMZhrGLh5/d4TpbaI+YC6Ugb5fFhjkZYoHoduqeQ=; b=jE/W0Q5uzyYnNWs8kPHmh2k3IN/oz5cZlARAabSrTqUyxNGZWqocaEYvdgUeZRULyq mWYUsh425NDhhn/BwC65HsX6shsxpyCbsAK4XDDOWp8oAyMPlI/8ER/FGAuHgyjhTPIP Dgs5X9+Cx2t6DhEHL+kAvRoD4GCxH99UR1bNHjW4pikOgL4/Dm9Fa0EvGoBBQJUU7KQv LgUp9kPwa4omne6qqaY8GyJjOU5zxcKj9xrsj7XyVTPaNE4CvG97DrEslbxCDaAztNj5 qveyA+gxBgZ3KXLOK0Hxcq8IXrIKsQnlKaXJXlZdnKXnueR8LVgjBgqsxvU7EGfIEepW fdew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781689593; x=1782294393; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CZosMZhrGLh5/d4TpbaI+YC6Ugb5fFhjkZYoHoduqeQ=; b=e4e55B/u+zpXHYe7O6RLrr3zLlIdVNsGij2gZcHbIVOwpcyN6/ZB9rP7hbfDkpk61I NIenBURWaC6IOnFekYHdWp7e0N+DFx/urah8XLwwhTSxVEQmcYYPKqdtWEL1AEd4jahY BoPPqbQEEHpzG05DDxchaFp3uqiAv2JLf17JIiFsXIgAVTcneH5TLuZMzhvAzXEuyjIH pWS2omruwSqmZOmQ60NyKad/nUGra0JTbx+h9KOZLzeXC2M2Y23009/UeuXJEunoowwQ JMvvqAvc+Jz39FgzN/l0d8RjeIu6qExuMRpQdYY2gQJ2omM5uxJMT0EMdJKJN55ra6h3 TxkQ== X-Forwarded-Encrypted: i=1; AFNElJ+jsyfH9URgXtm42+RYkr87TiL7LYbZ6sIfGrEdvsrU6q27Lr++1vPTH189CM3/OTKkrWs0+xTX3r8Ihh8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/Q/OjY50CthUgScm5J/lFFJTaPzjg6hwa4P8te8SUK6nNupMc VOZCNll7s+lzzJpwfW43nIxG7p0NPCHrwtHqq1xgcfebizux4R0tTDYx X-Gm-Gg: Acq92OG/uDnae3fQUnJXJ3AmC07H/zIu2+KXXVuPbhouP/EQreVIB9ORvzyPFM5DwzH wAB2FiakuMlew/N5c32wCt2LqH30NDTKhEIDmarGEW2CBT2z7o4PtcgdMlsugzCdZ4ulcHUyTqZ hZlVxP3QVG+ONfzRE6ohD4pGej2FCadZuXlYj61sPfIjlkX4WNqwh9v/z3Roxb5fSBDr0CRjBAf /2tvM9LOXk2L7KVmOP9+XaCxQi1wctqOv3cfIuIe+jWsNpioKREEE9bgEPU2Yp6gYQsUIguRAAV g/m3ZYST2sfMlgxtAKXMe3r+TdWinq9pv4GmmXr/M0XE2tBNg0P9P3RuoEz2oqyibURDXF0bTPj aOCdVQ1viZPTkCPSdH3bULawiwuUK9781yNELTciZZnzVp2TduwHECzJMV/N1GaC+Sp3P3IUmUr OcNkykK4ef8RKkzEDJomiS8HUXCXARgyxLw6WYbEfzLTkypGJL6OBdqfCcptwuXnNe X-Received: by 2002:a05:600c:3b0f:b0:491:731c:892a with SMTP id 5b1f17b1804b1-492333df11bmr51490465e9.35.1781689592188; Wed, 17 Jun 2026 02:46:32 -0700 (PDT) Received: from fedora ([102.51.63.223]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-46289c3b3a3sm4454423f8f.30.2026.06.17.02.46.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jun 2026 02:46:31 -0700 (PDT) From: Jad Keskes To: Mark Brown Cc: Lee Jones , Krzysztof Kozlowski , Liam Girdwood , linux-kernel@vger.kernel.org, Jad Keskes Subject: [PATCH v4] regulator: max14577: fix set_mode clobbering enable on MAX77836 LDOs Date: Wed, 17 Jun 2026 10:46:22 +0100 Message-ID: <20260617094622.1846471-1-inasj268@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit So the PWRMD field in CNFG1_LDO is both the enable bit and the mode. You can't change one without stepping on the other. The problem is that enable() from the regulator core just writes enable_mask (which is PWRMD_NORMAL). If you'd called set_mode(LPM) then disabled and re-enabled, the mode gets reset to NORMAL. And set_mode updates the register through the same field, so it can accidentally enable a disabled regulator. Fix it by storing the mode in per-regulator data. A custom enable writes whatever mode was last set. set_mode only touches hardware if the regulator is already on; otherwise it just caches the value. Add of_map_mode while here so the initial mode can be wired from DT. Signed-off-by: Jad Keskes --- drivers/regulator/max14577-regulator.c | 103 ++++++++++++++++++++++++- include/linux/mfd/max14577-private.h | 3 + 2 files changed, 102 insertions(+), 4 deletions(-) diff --git a/drivers/regulator/max14577-regulator.c b/drivers/regulator/max14577-regulator.c index c9d8d5e31cbd..cd592c5de148 100644 --- a/drivers/regulator/max14577-regulator.c +++ b/drivers/regulator/max14577-regulator.c @@ -123,15 +123,88 @@ static const struct regulator_desc max14577_supported_regulators[] = { [MAX14577_CHARGER] = MAX14577_CHARGER_REG, }; +struct max77836_ldo { + struct max14577 *max14577; + unsigned int mode; +}; + +static int max77836_ldo_enable(struct regulator_dev *rdev) +{ + struct max77836_ldo *ldo = rdev_get_drvdata(rdev); + + return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, + MAX77836_CNFG1_LDO_PWRMD_MASK, ldo->mode); +} + +static int max77836_ldo_disable(struct regulator_dev *rdev) +{ + return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, + MAX77836_CNFG1_LDO_PWRMD_MASK, + MAX77836_CNFG1_LDO_PWRMD_OFF); +} + +static unsigned int max77836_ldo_get_mode(struct regulator_dev *rdev) +{ + struct max77836_ldo *ldo = rdev_get_drvdata(rdev); + + switch (ldo->mode) { + case MAX77836_CNFG1_LDO_PWRMD_LPM: + return REGULATOR_MODE_IDLE; + case MAX77836_CNFG1_LDO_PWRMD_NORMAL: + return REGULATOR_MODE_NORMAL; + default: + return REGULATOR_MODE_INVALID; + } +} + +static int max77836_ldo_set_mode(struct regulator_dev *rdev, + unsigned int mode) +{ + struct max77836_ldo *ldo = rdev_get_drvdata(rdev); + unsigned int val; + + switch (mode) { + case REGULATOR_MODE_NORMAL: + val = MAX77836_CNFG1_LDO_PWRMD_NORMAL; + break; + case REGULATOR_MODE_IDLE: + val = MAX77836_CNFG1_LDO_PWRMD_LPM; + break; + default: + return -EINVAL; + } + + ldo->mode = val; + + /* Only touch hardware if the regulator is already on */ + if (regulator_is_enabled_regmap(rdev)) + return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, + MAX77836_CNFG1_LDO_PWRMD_MASK, val); + + return 0; +} + +static unsigned int max77836_ldo_of_map_mode(unsigned int mode) +{ + switch (mode) { + case REGULATOR_MODE_NORMAL: + case REGULATOR_MODE_IDLE: + return mode; + default: + return REGULATOR_MODE_INVALID; + } +} + static const struct regulator_ops max77836_ldo_ops = { .is_enabled = regulator_is_enabled_regmap, - .enable = regulator_enable_regmap, - .disable = regulator_disable_regmap, + .enable = max77836_ldo_enable, + .disable = max77836_ldo_disable, .list_voltage = regulator_list_voltage_linear, .map_voltage = regulator_map_voltage_linear, .get_voltage_sel = regulator_get_voltage_sel_regmap, .set_voltage_sel = regulator_set_voltage_sel_regmap, - /* TODO: add .set_suspend_mode */ + .get_mode = max77836_ldo_get_mode, + .set_mode = max77836_ldo_set_mode, }; #define MAX77836_LDO_REG(num) { \ @@ -147,6 +220,7 @@ static const struct regulator_ops max77836_ldo_ops = { .uV_step = MAX77836_REGULATOR_LDO_VOLTAGE_STEP, \ .enable_reg = MAX77836_LDO_REG_CNFG1_LDO ## num, \ .enable_mask = MAX77836_CNFG1_LDO_PWRMD_MASK, \ + .of_map_mode = max77836_ldo_of_map_mode, \ .vsel_reg = MAX77836_LDO_REG_CNFG1_LDO ## num, \ .vsel_mask = MAX77836_CNFG1_LDO_TV_MASK, \ } @@ -205,7 +279,6 @@ static int max14577_regulator_probe(struct platform_device *pdev) } config.dev = max14577->dev; - config.driver_data = max14577; for (i = 0; i < supported_regulators_size; i++) { struct regulator_dev *regulator; @@ -217,6 +290,28 @@ static int max14577_regulator_probe(struct platform_device *pdev) config.init_data = pdata->regulators[i].initdata; config.of_node = pdata->regulators[i].of_node; } + + /* + * LDOs need per-regulator driver data to store their mode. + * The charger and safeout share the core MFD struct. + */ + if (dev_type == MAXIM_DEVICE_TYPE_MAX77836 && + (supported_regulators[i].id == MAX77836_LDO1 || + supported_regulators[i].id == MAX77836_LDO2)) { + struct max77836_ldo *ldo; + + ldo = devm_kzalloc(&pdev->dev, sizeof(*ldo), + GFP_KERNEL); + if (!ldo) + return -ENOMEM; + + ldo->max14577 = max14577; + ldo->mode = MAX77836_CNFG1_LDO_PWRMD_NORMAL; + config.driver_data = ldo; + } else { + config.driver_data = max14577; + } + config.regmap = max14577_get_regmap(max14577, supported_regulators[i].id); diff --git a/include/linux/mfd/max14577-private.h b/include/linux/mfd/max14577-private.h index dd51a37fa37f..5957e15b568e 100644 --- a/include/linux/mfd/max14577-private.h +++ b/include/linux/mfd/max14577-private.h @@ -350,6 +350,9 @@ enum max77836_pmic_reg { #define MAX77836_CNFG1_LDO_PWRMD_SHIFT 6 #define MAX77836_CNFG1_LDO_TV_SHIFT 0 #define MAX77836_CNFG1_LDO_PWRMD_MASK (0x3 << MAX77836_CNFG1_LDO_PWRMD_SHIFT) +#define MAX77836_CNFG1_LDO_PWRMD_OFF (0x0 << MAX77836_CNFG1_LDO_PWRMD_SHIFT) +#define MAX77836_CNFG1_LDO_PWRMD_LPM (0x1 << MAX77836_CNFG1_LDO_PWRMD_SHIFT) +#define MAX77836_CNFG1_LDO_PWRMD_NORMAL (0x3 << MAX77836_CNFG1_LDO_PWRMD_SHIFT) #define MAX77836_CNFG1_LDO_TV_MASK (0x3f << MAX77836_CNFG1_LDO_TV_SHIFT) /* LDO1/LDO2 CONFIG2 register */ -- 2.54.0