Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: mt6358: Add missing regulators for MT6366

When support for the MT6366 PMIC regulators was added, it was assumed
that it had the same functionality as MT6358. In reality there are
differences. A few regulators have different ranges, or were renamed
and repurposed, or removed altogether.

Add the 3 regulators that were missing from the original submission.
These are added for completeness. VSRAM_CORE is not used in existing
projects. VM18 and VMDDR feed DRAM related consumers, and are not used
in-kernel.

Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Acked-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/20230928085537.3246669-11-wenst@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Chen-Yu Tsai and committed by
Mark Brown
b7768e67 b7f3b898

+40
+20
drivers/regulator/mt6358-regulator.c
··· 325 325 REGULATOR_LINEAR_RANGE(3000000, 0, 10, 10000), 326 326 }; 327 327 328 + static const unsigned int mt6366_vmddr_selectors[] = { 0, 1, 2, 3, 4, 5, 6, 7, 9, 12 }; 329 + static const struct linear_range mt6366_vmddr_ranges[] = { 330 + REGULATOR_LINEAR_RANGE(600000, 0, 10, 10000), 331 + REGULATOR_LINEAR_RANGE(700000, 0, 10, 10000), 332 + REGULATOR_LINEAR_RANGE(800000, 0, 10, 10000), 333 + REGULATOR_LINEAR_RANGE(900000, 0, 10, 10000), 334 + REGULATOR_LINEAR_RANGE(1000000, 0, 10, 10000), 335 + REGULATOR_LINEAR_RANGE(1100000, 0, 10, 10000), 336 + REGULATOR_LINEAR_RANGE(1200000, 0, 10, 10000), 337 + REGULATOR_LINEAR_RANGE(1300000, 0, 10, 10000), 338 + REGULATOR_LINEAR_RANGE(1500000, 0, 10, 10000), 339 + REGULATOR_LINEAR_RANGE(1800000, 0, 10, 10000), 340 + }; 341 + 328 342 static const unsigned int mt6366_vcn18_vm18_selectors[] = { 329 343 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }; 330 344 static const struct linear_range mt6366_vcn18_vm18_ranges[] = { ··· 616 602 MT6358_LDO_VSIM2_CON0, 0, MT6358_VSIM2_ANA_CON0, 0xf00), 617 603 MT6366_LDO("vcn18", VCN18, mt6366_vcn18_vm18, 618 604 MT6358_LDO_VCN18_CON0, 0, MT6358_VCN18_ANA_CON0, 0xf00), 605 + MT6366_LDO("vm18", VM18, mt6366_vcn18_vm18, 606 + MT6358_LDO_VM18_CON0, 0, MT6358_VM18_ANA_CON0, 0xf00), 607 + MT6366_LDO("vmddr", VMDDR, mt6366_vmddr, 608 + MT6358_LDO_VMDDR_CON0, 0, MT6358_VMDDR_ANA_CON0, 0xf00), 619 609 MT6366_LDO1("vsram-proc11", VSRAM_PROC11, 500000, 1293750, 6250, 620 610 MT6358_LDO_VSRAM_PROC11_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON0, 0x7f), 621 611 MT6366_LDO1("vsram-others", VSRAM_OTHERS, 500000, 1293750, 6250, ··· 628 610 MT6358_LDO_VSRAM_GPU_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON3, 0x7f), 629 611 MT6366_LDO1("vsram-proc12", VSRAM_PROC12, 500000, 1293750, 6250, 630 612 MT6358_LDO_VSRAM_PROC12_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON1, 0x7f), 613 + MT6366_LDO1("vsram-core", VSRAM_CORE, 500000, 1293750, 6250, 614 + MT6358_LDO_VSRAM_CORE_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON5, 0x7f), 631 615 }; 632 616 633 617 static int mt6358_sync_vcn33_setting(struct device *dev)
+17
include/linux/mfd/mt6358/registers.h
··· 294 294 #define MT6358_AUD_TOP_INT_CON0 0x2228 295 295 #define MT6358_AUD_TOP_INT_STATUS0 0x2234 296 296 297 + /* 298 + * MT6366 has no VCAM*, but has other regulators in its place. The names 299 + * keep the MT6358 prefix for ease of use in the regulator driver. 300 + */ 301 + #define MT6358_LDO_VSRAM_CON5 0x1bf8 302 + #define MT6358_LDO_VM18_CON0 MT6358_LDO_VCAMA1_CON0 303 + #define MT6358_LDO_VM18_CON1 MT6358_LDO_VCAMA1_CON1 304 + #define MT6358_LDO_VM18_CON2 MT6358_LDO_VCAMA1_CON2 305 + #define MT6358_LDO_VMDDR_CON0 MT6358_LDO_VCAMA2_CON0 306 + #define MT6358_LDO_VMDDR_CON1 MT6358_LDO_VCAMA2_CON1 307 + #define MT6358_LDO_VMDDR_CON2 MT6358_LDO_VCAMA2_CON2 308 + #define MT6358_LDO_VSRAM_CORE_CON0 MT6358_LDO_VCAMD_CON0 309 + #define MT6358_LDO_VSRAM_CORE_DBG0 0x1cb6 310 + #define MT6358_LDO_VSRAM_CORE_DBG1 0x1cb8 311 + #define MT6358_VM18_ANA_CON0 MT6358_VCAMA1_ANA_CON0 312 + #define MT6358_VMDDR_ANA_CON0 MT6358_VCAMD_ANA_CON0 313 + 297 314 #endif /* __MFD_MT6358_REGISTERS_H__ */
+3
include/linux/regulator/mt6358-regulator.h
··· 86 86 MT6366_ID_VMC, 87 87 MT6366_ID_VAUD28, 88 88 MT6366_ID_VSIM2, 89 + MT6366_ID_VM18, 90 + MT6366_ID_VMDDR, 91 + MT6366_ID_VSRAM_CORE, 89 92 MT6366_ID_RG_MAX, 90 93 }; 91 94