Add support for MediaTek PMIC MT6366
v2 cover Add support for MediaTek PMIC MT6366
This patchset adds support for MediaTek PMIC MT6366. MT6366 is the primary PMIC for MT8186 and probably other SOCs.
Resend v2:
- rebase on Linux 5.17
Changes in v2:
- rebase on Linux 5.17-rc8
- change subject line
Johnson Wang (2):
regulator: mt6366: Add support for MT6366 regulator
dt-bindings: regulator: Add BUCK and LDO document for MT6358 and
MT6366
.../bindings/regulator/mt6358-regulator.txt | 22 +- drivers/regulator/mt6358-regulator.c | 213 +++++++++++++++++- include/linux/regulator/mt6358-regulator.h | 45 ++++ 3 files changed, 270 insertions(+), 10 deletions(-)
Signature · 1 line
2.18.0
PATCH RESEND v2 1/2 regulator: mt6366: Add support for MT6366 regulator
The MT6366 is a regulator found on boards based on MediaTek MT8186 and probably other SoCs. It is a so called pmic and connects as a slave to SoC using SPI, wrapped inside the pmic-wrapper.
--- drivers/regulator/mt6358-regulator.c | 213 ++++++++++++++++++++- include/linux/regulator/mt6358-regulator.h | 45 +++++ 2 files changed, 253 insertions(+), 5 deletions(-)
drivers/regulator/mt6358-regulator.c +208 -5
@@ -130,6 +130,102 @@ struct mt6358_regulator_info { .qi = BIT(15), \ } +#define MT6366_BUCK (match, vreg, min, max, step, \ + volt_ranges, vosel_mask, _da_vsel_reg, _da_vsel_mask, \ + _modeset_reg, _modeset_shift) \ +[MT6366_ID_##vreg] = { \ + .desc = { \ + .name = #vreg, \ + .of_match = of_match_ptr(match), \ + .ops = &mt6358_volt_range_ops, \ + .type = REGULATOR_VOLTAGE, \ + .id = MT6366_ID_##vreg, \ + .owner = THIS_MODULE, \ + .n_voltages = ((max) - (min)) / (step) + 1, \ + .linear_ranges = volt_ranges, \ + .n_linear_ranges = ARRAY_SIZE(volt_ranges), \ + .vsel_reg = MT6358_BUCK_##vreg##_ELR0, \ + .vsel_mask = vosel_mask, \ + .enable_reg = MT6358_BUCK_##vreg##_CON0, \ + .enable_mask = BIT(0), \ + .of_map_mode = mt6358_map_mode, \ + }, \ + .status_reg = MT6358_BUCK_##vreg##_DBG1, \ + .qi = BIT(0), \ + .da_vsel_reg = _da_vsel_reg, \ + .da_vsel_mask = _da_vsel_mask, \ + .modeset_reg = _modeset_reg, \ + .modeset_mask = BIT(_modeset_shift), \ +} + +#define MT6366_LDO (match, vreg, ldo_volt_table, \ + ldo_index_table, enreg, enbit, vosel, \ + vosel_mask) \ +[MT6366_ID_##vreg] = { \ + .desc = { \ + .name = #vreg, \ + .of_match = of_match_ptr(match), \ + .ops = &mt6358_volt_table_ops, \ + .type = REGULATOR_VOLTAGE, \ + .id = MT6366_ID_##vreg, \ + .owner = THIS_MODULE, \ + .n_voltages = ARRAY_SIZE(ldo_volt_table), \ + .volt_table = ldo_volt_table, \ + .vsel_reg = vosel, \ + .vsel_mask = vosel_mask, \ + .enable_reg = enreg, \ + .enable_mask = BIT(enbit), \ + }, \ + .status_reg = MT6358_LDO_##vreg##_CON1, \ + .qi = BIT(15), \ + .index_table = ldo_index_table, \ + .n_table = ARRAY_SIZE(ldo_index_table), \ +} + +#define MT6366_LDO1 (match, vreg, min, max, step, \ + volt_ranges, _da_vsel_reg, _da_vsel_mask, \ + vosel, vosel_mask) \ +[MT6366_ID_##vreg] = { \ + .desc = { \ + .name = #vreg, \ + .of_match = of_match_ptr(match), \ + .ops = &mt6358_volt_range_ops, \ + .type = REGULATOR_VOLTAGE, \ + .id = MT6366_ID_##vreg, \ + .owner = THIS_MODULE, \ + .n_voltages = ((max) - (min)) / (step) + 1, \ + .linear_ranges = volt_ranges, \ + .n_linear_ranges = ARRAY_SIZE(volt_ranges), \ + .vsel_reg = vosel, \ + .vsel_mask = vosel_mask, \ + .enable_reg = MT6358_LDO_##vreg##_CON0, \ + .enable_mask = BIT(0), \ + }, \ + .da_vsel_reg = _da_vsel_reg, \ + .da_vsel_mask = _da_vsel_mask, \ + .status_reg = MT6358_LDO_##vreg##_DBG1, \ + .qi = BIT(0), \ +} + +#define MT6366_REG_FIXED (match, vreg, \ + enreg, enbit, volt) \ +[MT6366_ID_##vreg] = { \ + .desc = { \ + .name = #vreg, \ + .of_match = of_match_ptr(match), \ + .ops = &mt6358_volt_fixed_ops, \ + .type = REGULATOR_VOLTAGE, \ + .id = MT6366_ID_##vreg, \ + .owner = THIS_MODULE, \ + .n_voltages = 1, \ + .enable_reg = enreg, \ + .enable_mask = BIT(enbit), \ + .min_uV = volt, \ + }, \ + .status_reg = MT6358_LDO_##vreg##_CON1, \ + .qi = BIT(15), \ +} +static const struct linear_range buck_volt_range1[] = {REGULATOR_LINEAR_RANGE (500000 ,0 ,0x7f ,6250 ), };
@@ -409,6 +505,9 @@ static struct mt6358_regulator_info mt6358_regulators[] = {MT6358_BUCK ("buck_vcore" ,VCORE ,500000 ,1293750 ,6250 , buck_volt_range1,0x7f ,MT6358_BUCK_VCORE_DBG0 ,0x7f ,MT6358_VCORE_VGPU_ANA_CON0 ,1 ), +MT6358_BUCK ("buck_vcore_sshub" ,VCORE_SSHUB ,500000 ,1293750 ,6250 , + buck_volt_range1,0x7f ,MT6358_BUCK_VCORE_SSHUB_ELR0 ,0x7f , +MT6358_VCORE_VGPU_ANA_CON0 ,1 ),MT6358_BUCK ("buck_vpa" ,VPA ,500000 ,3650000 ,50000 , buck_volt_range3,0x3f ,MT6358_BUCK_VPA_DBG0 ,0x3f , MT6358_VPA_ANA_CON0, 3),
@@ -488,6 +587,10 @@ static struct mt6358_regulator_info mt6358_regulators[] = {MT6358_LDO1 ("ldo_vsram_others" ,VSRAM_OTHERS ,500000 ,1293750 ,6250 , buck_volt_range1,MT6358_LDO_VSRAM_OTHERS_DBG0 ,0x7f00 ,MT6358_LDO_VSRAM_CON2 ,0x7f ), +MT6358_LDO1 ("ldo_vsram_others_sshub" ,VSRAM_OTHERS_SSHUB ,500000 , +1293750 ,6250 , buck_volt_range1, +MT6358_LDO_VSRAM_OTHERS_SSHUB_CON1 ,0x7f , +MT6358_LDO_VSRAM_OTHERS_SSHUB_CON1 ,0x7f ),MT6358_LDO1 ("ldo_vsram_gpu" ,VSRAM_GPU ,500000 ,1293750 ,6250 , buck_volt_range1,MT6358_LDO_VSRAM_GPU_DBG0 ,0x7f00 , MT6358_LDO_VSRAM_CON3, 0x7f),
@@ -496,24 +599,124 @@ static struct mt6358_regulator_info mt6358_regulators[] = { MT6358_LDO_VSRAM_CON1, 0x7f), }; +/* The array is indexed by id(MT6366_ID_XXX) */ +static struct mt6358_regulator_info mt6366_regulators[] = { +MT6366_BUCK ("buck_vdram1" ,VDRAM1 ,500000 ,2087500 ,12500 , + buck_volt_range2,0x7f ,MT6358_BUCK_VDRAM1_DBG0 ,0x7f , +MT6358_VDRAM1_ANA_CON0 ,8 ), +MT6366_BUCK ("buck_vcore" ,VCORE ,500000 ,1293750 ,6250 , + buck_volt_range1,0x7f ,MT6358_BUCK_VCORE_DBG0 ,0x7f , +MT6358_VCORE_VGPU_ANA_CON0 ,1 ), +MT6366_BUCK ("buck_vcore_sshub" ,VCORE_SSHUB ,500000 ,1293750 ,6250 , + buck_volt_range1,0x7f ,MT6358_BUCK_VCORE_SSHUB_ELR0 ,0x7f , +MT6358_VCORE_VGPU_ANA_CON0 ,1 ), +MT6366_BUCK ("buck_vpa" ,VPA ,500000 ,3650000 ,50000 , + buck_volt_range3,0x3f ,MT6358_BUCK_VPA_DBG0 ,0x3f , +MT6358_VPA_ANA_CON0 ,3 ), +MT6366_BUCK ("buck_vproc11" ,VPROC11 ,500000 ,1293750 ,6250 , + buck_volt_range1,0x7f ,MT6358_BUCK_VPROC11_DBG0 ,0x7f , +MT6358_VPROC_ANA_CON0 ,1 ), +MT6366_BUCK ("buck_vproc12" ,VPROC12 ,500000 ,1293750 ,6250 , + buck_volt_range1,0x7f ,MT6358_BUCK_VPROC12_DBG0 ,0x7f , +MT6358_VPROC_ANA_CON0 ,2 ), +MT6366_BUCK ("buck_vgpu" ,VGPU ,500000 ,1293750 ,6250 , + buck_volt_range1,0x7f ,MT6358_BUCK_VGPU_ELR0 ,0x7f , +MT6358_VCORE_VGPU_ANA_CON0 ,2 ), +MT6366_BUCK ("buck_vs2" ,VS2 ,500000 ,2087500 ,12500 , + buck_volt_range2,0x7f ,MT6358_BUCK_VS2_DBG0 ,0x7f , +MT6358_VS2_ANA_CON0 ,8 ), +MT6366_BUCK ("buck_vmodem" ,VMODEM ,500000 ,1293750 ,6250 , + buck_volt_range1,0x7f ,MT6358_BUCK_VMODEM_DBG0 ,0x7f , +MT6358_VMODEM_ANA_CON0 ,8 ), +MT6366_BUCK ("buck_vs1" ,VS1 ,1000000 ,2587500 ,12500 , + buck_volt_range4,0x7f ,MT6358_BUCK_VS1_DBG0 ,0x7f , +MT6358_VS1_ANA_CON0 ,8 ), +MT6366_REG_FIXED ("ldo_vrf12" ,VRF12 , +MT6358_LDO_VRF12_CON0 ,0 ,1200000 ), +MT6366_REG_FIXED ("ldo_vio18" ,VIO18 , +MT6358_LDO_VIO18_CON0 ,0 ,1800000 ), +MT6366_REG_FIXED ("ldo_vcn18" ,VCN18 ,MT6358_LDO_VCN18_CON0 ,0 ,1800000 ), +MT6366_REG_FIXED ("ldo_vfe28" ,VFE28 ,MT6358_LDO_VFE28_CON0 ,0 ,2800000 ), +MT6366_REG_FIXED ("ldo_vcn28" ,VCN28 ,MT6358_LDO_VCN28_CON0 ,0 ,2800000 ), +MT6366_REG_FIXED ("ldo_vxo22" ,VXO22 ,MT6358_LDO_VXO22_CON0 ,0 ,2200000 ), +MT6366_REG_FIXED ("ldo_vaux18" ,VAUX18 , +MT6358_LDO_VAUX18_CON0 ,0 ,1800000 ), +MT6366_REG_FIXED ("ldo_vbif28" ,VBIF28 , +MT6358_LDO_VBIF28_CON0 ,0 ,2800000 ), +MT6366_REG_FIXED ("ldo_vio28" ,VIO28 ,MT6358_LDO_VIO28_CON0 ,0 ,2800000 ), +MT6366_REG_FIXED ("ldo_va12" ,VA12 ,MT6358_LDO_VA12_CON0 ,0 ,1200000 ), +MT6366_REG_FIXED ("ldo_vrf18" ,VRF18 ,MT6358_LDO_VRF18_CON0 ,0 ,1800000 ), +MT6366_REG_FIXED ("ldo_vaud28" ,VAUD28 , +MT6358_LDO_VAUD28_CON0 ,0 ,2800000 ), +MT6366_LDO ("ldo_vdram2" ,VDRAM2 , vdram2_voltages, vdram2_idx, +MT6358_LDO_VDRAM2_CON0 ,0 ,MT6358_LDO_VDRAM2_ELR0 ,0x10 ), +MT6366_LDO ("ldo_vsim1" ,VSIM1 , vsim_voltages, vsim_idx, +MT6358_LDO_VSIM1_CON0 ,0 ,MT6358_VSIM1_ANA_CON0 ,0xf00 ), +MT6366_LDO ("ldo_vibr" ,VIBR , vibr_voltages, vibr_idx, +MT6358_LDO_VIBR_CON0 ,0 ,MT6358_VIBR_ANA_CON0 ,0xf00 ), +MT6366_LDO ("ldo_vusb" ,VUSB , vusb_voltages, vusb_idx, +MT6358_LDO_VUSB_CON0_0 ,0 ,MT6358_VUSB_ANA_CON0 ,0x700 ), +MT6366_LDO ("ldo_vefuse" ,VEFUSE , vefuse_voltages, vefuse_idx, +MT6358_LDO_VEFUSE_CON0 ,0 ,MT6358_VEFUSE_ANA_CON0 ,0xf00 ), +MT6366_LDO ("ldo_vmch" ,VMCH , vmch_vemc_voltages, vmch_vemc_idx, +MT6358_LDO_VMCH_CON0 ,0 ,MT6358_VMCH_ANA_CON0 ,0x700 ), +MT6366_LDO ("ldo_vemc" ,VEMC , vmch_vemc_voltages, vmch_vemc_idx, +MT6358_LDO_VEMC_CON0 ,0 ,MT6358_VEMC_ANA_CON0 ,0x700 ), +MT6366_LDO ("ldo_vcn33_bt" ,VCN33_BT , vcn33_bt_wifi_voltages, + vcn33_bt_wifi_idx,MT6358_LDO_VCN33_CON0_0 , +0 ,MT6358_VCN33_ANA_CON0 ,0x300 ), +MT6366_LDO ("ldo_vcn33_wifi" ,VCN33_WIFI , vcn33_bt_wifi_voltages, + vcn33_bt_wifi_idx,MT6358_LDO_VCN33_CON0_1 , +0 ,MT6358_VCN33_ANA_CON0 ,0x300 ), +MT6366_LDO ("ldo_vmc" ,VMC , vmc_voltages, vmc_idx, +MT6358_LDO_VMC_CON0 ,0 ,MT6358_VMC_ANA_CON0 ,0xf00 ), +MT6366_LDO ("ldo_vsim2" ,VSIM2 , vsim_voltages, vsim_idx, +MT6358_LDO_VSIM2_CON0 ,0 ,MT6358_VSIM2_ANA_CON0 ,0xf00 ), +MT6366_LDO1 ("ldo_vsram_proc11" ,VSRAM_PROC11 ,500000 ,1293750 ,6250 , + buck_volt_range1,MT6358_LDO_VSRAM_PROC11_DBG0 ,0x7f00 , +MT6358_LDO_VSRAM_CON0 ,0x7f ), +MT6366_LDO1 ("ldo_vsram_others" ,VSRAM_OTHERS ,500000 ,1293750 ,6250 , + buck_volt_range1,MT6358_LDO_VSRAM_OTHERS_DBG0 ,0x7f00 , +MT6358_LDO_VSRAM_CON2 ,0x7f ), +MT6366_LDO1 ("ldo_vsram_others_sshub" ,VSRAM_OTHERS_SSHUB ,500000 , +1293750 ,6250 , buck_volt_range1, +MT6358_LDO_VSRAM_OTHERS_SSHUB_CON1 ,0x7f , +MT6358_LDO_VSRAM_OTHERS_SSHUB_CON1 ,0x7f ), +MT6366_LDO1 ("ldo_vsram_gpu" ,VSRAM_GPU ,500000 ,1293750 ,6250 , + buck_volt_range1,MT6358_LDO_VSRAM_GPU_DBG0 ,0x7f00 , +MT6358_LDO_VSRAM_CON3 ,0x7f ), +MT6366_LDO1 ("ldo_vsram_proc12" ,VSRAM_PROC12 ,500000 ,1293750 ,6250 , + buck_volt_range1,MT6358_LDO_VSRAM_PROC12_DBG0 ,0x7f00 , +MT6358_LDO_VSRAM_CON1 ,0x7f ), +}; +static int mt6358_regulator_probe (struct platform_device *pdev) {struct mt6397_chip *mt6397 =dev_get_drvdata (pdev->dev.parent);struct regulator_config config = {};struct regulator_dev *rdev; -int i; +struct mt6358_regulator_info *mt6358_info; +int i, max_regulator; + +if (mt6397->chip_id ==MT6366_CHIP_ID ) { + max_regulator =MT6366_MAX_REGULATOR ; + mt6358_info = mt6366_regulators; + }else { + max_regulator =MT6358_MAX_REGULATOR ; + mt6358_info = mt6358_regulators; + } -for (i =0 ; i <MT6358_MAX_REGULATOR ; i++) { +for (i =0 ; i < max_regulator; i++) { config.dev = &pdev->dev; - config.driver_data = &mt6358_regulators[i]; + config.driver_data = &mt6358_info[i]; config.regmap = mt6397->regmap; rdev =devm_regulator_register (&pdev->dev, - &mt6358_regulators[i].desc, + &mt6358_info[i].desc, &config);if (IS_ERR (rdev)) {dev_err (&pdev->dev,"failed to register %s\n" , - mt6358_regulators[i].desc.name); + mt6358_info[i].desc.name);return PTR_ERR (rdev); } }
include/linux/regulator/mt6358-regulator.h +45 -0
54 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH RESEND v2 2/2 dt-bindings: regulator: Add BUCK and LDO document for MT6358 and MT6366
In reply to Johnson WangAdd buck_vcore_sshub and ldo_vsram_others_sshub regulators to binding document for MT6358 and MT6366.
--- .../bindings/regulator/mt6358-regulator.txt | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/regulator/mt6358-regulator.txt +17 -5
@@ -8,14 +8,14 @@ Documentation/devicetree/bindings/regulator/regulator.txt. The valid names for regulators are:: BUCK: - buck_vdram1, buck_vcore, buck_vpa, buck_vproc11, buck_vproc12, buck_vgpu, - buck_vs2, buck_vmodem, buck_vs1 + buck_vdram1, buck_vcore, buck_vcore_sshub, buck_vpa, buck_vproc11, + buck_vproc12, buck_vgpu, buck_vs2, buck_vmodem, buck_vs1 LDO: ldo_vdram2, ldo_vsim1, ldo_vibr, ldo_vrf12, ldo_vio18, ldo_vusb, ldo_vcamio, ldo_vcamd, ldo_vcn18, ldo_vfe28, ldo_vsram_proc11, ldo_vcn28, ldo_vsram_others, - ldo_vsram_gpu, ldo_vxo22, ldo_vefuse, ldo_vaux18, ldo_vmch, ldo_vbif28, - ldo_vsram_proc12, ldo_vcama1, ldo_vemc, ldo_vio28, ldo_va12, ldo_vrf18, - ldo_vcn33_bt, ldo_vcn33_wifi, ldo_vcama2, ldo_vmc, ldo_vldo28, ldo_vaud28, + ldo_vsram_others_sshub, ldo_vsram_gpu, ldo_vxo22, ldo_vefuse, ldo_vaux18, + ldo_vmch, ldo_vbif28, ldo_vsram_proc12, ldo_vcama1, ldo_vemc, ldo_vio28, ldo_va12, + ldo_vrf18, ldo_vcn33_bt, ldo_vcn33_wifi, ldo_vcama2, ldo_vmc, ldo_vldo28, ldo_vaud28, ldo_vsim2 Example:
@@ -354,5 +354,17 @@ Example: regulator-max-microvolt = <3100000>; regulator-enable-ramp-delay = <540>; }; + + mt6358_vcore_sshub_reg: buck_vcore_sshub { + regulator-name = "vcore_sshub"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1293750>; + }; + + mt6358_vsram_others_sshub_reg: ldo_vsram_others_sshub { + regulator-name = "vsram_others_sshub"; + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1293750>; + }; }; };
Signature · 1 line
2.18.0
Mark Brown
maintainerQuoted 11 lines · Johnson Wang
This patchset adds support for MediaTek PMIC MT6366. MT6366 is the primary PMIC for MT8186 and probably other SOCs.
Resend v2:
- rebase on Linux 5.17Changes in v2:
- rebase on Linux 5.17-rc8
- change subject line[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next
Thanks!
[1/2] regulator: mt6366: Add support for MT6366 regulator
commit: d077002c9d07dc6f64d07a362202a1e1081b2f6c
[2/2] dt-bindings: regulator: Add BUCK and LDO document for MT6358 and MT6366
(no commit info)
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek