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

regulator: mt6359: Get rid of linear_range tables

The MT6359_BUCK and MT6359_LDO_LINEAR macros setup both
linear settings (min_uV, uV_step, linear_min_sel) and linar_range
(linear_ranges, n_linear_ranges) settings.
All the linear range tables actually only has one entry.
Let's simplify it by using linear instead of linear range.

The linear_min_sel setting is 0 for all cases, remove it
from the macros.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Link: https://lore.kernel.org/r/20210606065052.1417111-3-axel.lin@ingics.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Axel Lin and committed by
Mark Brown 73d4ae57 5a5e3115

+59 -98
+59 -98
drivers/regulator/mt6359-regulator.c
··· 41 41 u32 lp_mode_shift; 42 42 }; 43 43 44 - #define MT6359_BUCK(match, _name, min, max, step, min_sel, \ 45 - volt_ranges, _enable_reg, _status_reg, \ 44 + #define MT6359_BUCK(match, _name, min, max, step, \ 45 + _enable_reg, _status_reg, \ 46 46 _vsel_reg, _vsel_mask, \ 47 47 _lp_mode_reg, _lp_mode_shift, \ 48 48 _modeset_reg, _modeset_shift) \ ··· 51 51 .name = #_name, \ 52 52 .of_match = of_match_ptr(match), \ 53 53 .regulators_node = of_match_ptr("regulators"), \ 54 - .ops = &mt6359_volt_range_ops, \ 54 + .ops = &mt6359_volt_linear_ops, \ 55 55 .type = REGULATOR_VOLTAGE, \ 56 56 .id = MT6359_ID_##_name, \ 57 57 .owner = THIS_MODULE, \ 58 58 .uV_step = (step), \ 59 - .linear_min_sel = (min_sel), \ 60 59 .n_voltages = ((max) - (min)) / (step) + 1, \ 61 60 .min_uV = (min), \ 62 - .linear_ranges = volt_ranges, \ 63 - .n_linear_ranges = ARRAY_SIZE(volt_ranges), \ 64 61 .vsel_reg = _vsel_reg, \ 65 62 .vsel_mask = _vsel_mask, \ 66 63 .enable_reg = _enable_reg, \ ··· 74 77 .modeset_shift = _modeset_shift \ 75 78 } 76 79 77 - #define MT6359_LDO_LINEAR(match, _name, min, max, step, min_sel,\ 78 - volt_ranges, _enable_reg, _status_reg, \ 79 - _vsel_reg, _vsel_mask) \ 80 + #define MT6359_LDO_LINEAR(match, _name, min, max, step, \ 81 + _enable_reg, _status_reg, _vsel_reg, _vsel_mask) \ 80 82 [MT6359_ID_##_name] = { \ 81 83 .desc = { \ 82 84 .name = #_name, \ 83 85 .of_match = of_match_ptr(match), \ 84 86 .regulators_node = of_match_ptr("regulators"), \ 85 - .ops = &mt6359_volt_range_ops, \ 87 + .ops = &mt6359_volt_linear_ops, \ 86 88 .type = REGULATOR_VOLTAGE, \ 87 89 .id = MT6359_ID_##_name, \ 88 90 .owner = THIS_MODULE, \ 89 91 .uV_step = (step), \ 90 - .linear_min_sel = (min_sel), \ 91 92 .n_voltages = ((max) - (min)) / (step) + 1, \ 92 93 .min_uV = (min), \ 93 - .linear_ranges = volt_ranges, \ 94 - .n_linear_ranges = ARRAY_SIZE(volt_ranges), \ 95 94 .vsel_reg = _vsel_reg, \ 96 95 .vsel_mask = _vsel_mask, \ 97 96 .enable_reg = _enable_reg, \ ··· 163 170 .status_reg = _status_reg, \ 164 171 .qi = BIT(0), \ 165 172 } 166 - 167 - static const struct linear_range mt_volt_range1[] = { 168 - REGULATOR_LINEAR_RANGE(800000, 0, 0x70, 12500), 169 - }; 170 - 171 - static const struct linear_range mt_volt_range2[] = { 172 - REGULATOR_LINEAR_RANGE(400000, 0, 0x7f, 6250), 173 - }; 174 - 175 - static const struct linear_range mt_volt_range3[] = { 176 - REGULATOR_LINEAR_RANGE(400000, 0, 0x70, 6250), 177 - }; 178 - 179 - static const struct linear_range mt_volt_range4[] = { 180 - REGULATOR_LINEAR_RANGE(800000, 0, 0x40, 12500), 181 - }; 182 - 183 - static const struct linear_range mt_volt_range5[] = { 184 - REGULATOR_LINEAR_RANGE(500000, 0, 0x3F, 50000), 185 - }; 186 - 187 - static const struct linear_range mt_volt_range6[] = { 188 - REGULATOR_LINEAR_RANGE(500000, 0, 0x7f, 6250), 189 - }; 190 - 191 - static const struct linear_range mt_volt_range7[] = { 192 - REGULATOR_LINEAR_RANGE(500000, 0, 0x7f, 6250), 193 - }; 194 - 195 - static const struct linear_range mt_volt_range8[] = { 196 - REGULATOR_LINEAR_RANGE(506250, 0, 0x7f, 6250), 197 - }; 198 173 199 174 static const unsigned int vsim1_voltages[] = { 200 175 0, 0, 0, 1700000, 1800000, 0, 0, 0, 2700000, 0, 0, 3000000, 3100000, ··· 426 465 return val; 427 466 } 428 467 429 - static const struct regulator_ops mt6359_volt_range_ops = { 430 - .list_voltage = regulator_list_voltage_linear_range, 431 - .map_voltage = regulator_map_voltage_linear_range, 468 + static const struct regulator_ops mt6359_volt_linear_ops = { 469 + .list_voltage = regulator_list_voltage_linear, 470 + .map_voltage = regulator_map_voltage_linear, 432 471 .set_voltage_sel = regulator_set_voltage_sel_regmap, 433 472 .get_voltage_sel = regulator_get_voltage_sel_regmap, 434 473 .set_voltage_time_sel = regulator_set_voltage_time_sel, ··· 473 512 474 513 /* The array is indexed by id(MT6359_ID_XXX) */ 475 514 static struct mt6359_regulator_info mt6359_regulators[] = { 476 - MT6359_BUCK("buck_vs1", VS1, 800000, 2200000, 12500, 0, 477 - mt_volt_range1, MT6359_RG_BUCK_VS1_EN_ADDR, 515 + MT6359_BUCK("buck_vs1", VS1, 800000, 2200000, 12500, 516 + MT6359_RG_BUCK_VS1_EN_ADDR, 478 517 MT6359_DA_VS1_EN_ADDR, MT6359_RG_BUCK_VS1_VOSEL_ADDR, 479 518 MT6359_RG_BUCK_VS1_VOSEL_MASK << 480 519 MT6359_RG_BUCK_VS1_VOSEL_SHIFT, 481 520 MT6359_RG_BUCK_VS1_LP_ADDR, MT6359_RG_BUCK_VS1_LP_SHIFT, 482 521 MT6359_RG_VS1_FPWM_ADDR, MT6359_RG_VS1_FPWM_SHIFT), 483 - MT6359_BUCK("buck_vgpu11", VGPU11, 400000, 1193750, 6250, 0, 484 - mt_volt_range2, MT6359_RG_BUCK_VGPU11_EN_ADDR, 522 + MT6359_BUCK("buck_vgpu11", VGPU11, 400000, 1193750, 6250, 523 + MT6359_RG_BUCK_VGPU11_EN_ADDR, 485 524 MT6359_DA_VGPU11_EN_ADDR, MT6359_RG_BUCK_VGPU11_VOSEL_ADDR, 486 525 MT6359_RG_BUCK_VGPU11_VOSEL_MASK << 487 526 MT6359_RG_BUCK_VGPU11_VOSEL_SHIFT, 488 527 MT6359_RG_BUCK_VGPU11_LP_ADDR, 489 528 MT6359_RG_BUCK_VGPU11_LP_SHIFT, 490 529 MT6359_RG_VGPU11_FCCM_ADDR, MT6359_RG_VGPU11_FCCM_SHIFT), 491 - MT6359_BUCK("buck_vmodem", VMODEM, 400000, 1100000, 6250, 0, 492 - mt_volt_range3, MT6359_RG_BUCK_VMODEM_EN_ADDR, 530 + MT6359_BUCK("buck_vmodem", VMODEM, 400000, 1100000, 6250, 531 + MT6359_RG_BUCK_VMODEM_EN_ADDR, 493 532 MT6359_DA_VMODEM_EN_ADDR, MT6359_RG_BUCK_VMODEM_VOSEL_ADDR, 494 533 MT6359_RG_BUCK_VMODEM_VOSEL_MASK << 495 534 MT6359_RG_BUCK_VMODEM_VOSEL_SHIFT, 496 535 MT6359_RG_BUCK_VMODEM_LP_ADDR, 497 536 MT6359_RG_BUCK_VMODEM_LP_SHIFT, 498 537 MT6359_RG_VMODEM_FCCM_ADDR, MT6359_RG_VMODEM_FCCM_SHIFT), 499 - MT6359_BUCK("buck_vpu", VPU, 400000, 1193750, 6250, 0, 500 - mt_volt_range2, MT6359_RG_BUCK_VPU_EN_ADDR, 538 + MT6359_BUCK("buck_vpu", VPU, 400000, 1193750, 6250, 539 + MT6359_RG_BUCK_VPU_EN_ADDR, 501 540 MT6359_DA_VPU_EN_ADDR, MT6359_RG_BUCK_VPU_VOSEL_ADDR, 502 541 MT6359_RG_BUCK_VPU_VOSEL_MASK << 503 542 MT6359_RG_BUCK_VPU_VOSEL_SHIFT, 504 543 MT6359_RG_BUCK_VPU_LP_ADDR, MT6359_RG_BUCK_VPU_LP_SHIFT, 505 544 MT6359_RG_VPU_FCCM_ADDR, MT6359_RG_VPU_FCCM_SHIFT), 506 - MT6359_BUCK("buck_vcore", VCORE, 400000, 1193750, 6250, 0, 507 - mt_volt_range2, MT6359_RG_BUCK_VCORE_EN_ADDR, 545 + MT6359_BUCK("buck_vcore", VCORE, 400000, 1193750, 6250, 546 + MT6359_RG_BUCK_VCORE_EN_ADDR, 508 547 MT6359_DA_VCORE_EN_ADDR, MT6359_RG_BUCK_VCORE_VOSEL_ADDR, 509 548 MT6359_RG_BUCK_VCORE_VOSEL_MASK << 510 549 MT6359_RG_BUCK_VCORE_VOSEL_SHIFT, 511 550 MT6359_RG_BUCK_VCORE_LP_ADDR, MT6359_RG_BUCK_VCORE_LP_SHIFT, 512 551 MT6359_RG_VCORE_FCCM_ADDR, MT6359_RG_VCORE_FCCM_SHIFT), 513 - MT6359_BUCK("buck_vs2", VS2, 800000, 1600000, 12500, 0, 514 - mt_volt_range4, MT6359_RG_BUCK_VS2_EN_ADDR, 552 + MT6359_BUCK("buck_vs2", VS2, 800000, 1600000, 12500, 553 + MT6359_RG_BUCK_VS2_EN_ADDR, 515 554 MT6359_DA_VS2_EN_ADDR, MT6359_RG_BUCK_VS2_VOSEL_ADDR, 516 555 MT6359_RG_BUCK_VS2_VOSEL_MASK << 517 556 MT6359_RG_BUCK_VS2_VOSEL_SHIFT, 518 557 MT6359_RG_BUCK_VS2_LP_ADDR, MT6359_RG_BUCK_VS2_LP_SHIFT, 519 558 MT6359_RG_VS2_FPWM_ADDR, MT6359_RG_VS2_FPWM_SHIFT), 520 - MT6359_BUCK("buck_vpa", VPA, 500000, 3650000, 50000, 0, 521 - mt_volt_range5, MT6359_RG_BUCK_VPA_EN_ADDR, 559 + MT6359_BUCK("buck_vpa", VPA, 500000, 3650000, 50000, 560 + MT6359_RG_BUCK_VPA_EN_ADDR, 522 561 MT6359_DA_VPA_EN_ADDR, MT6359_RG_BUCK_VPA_VOSEL_ADDR, 523 562 MT6359_RG_BUCK_VPA_VOSEL_MASK << 524 563 MT6359_RG_BUCK_VPA_VOSEL_SHIFT, 525 564 MT6359_RG_BUCK_VPA_LP_ADDR, MT6359_RG_BUCK_VPA_LP_SHIFT, 526 565 MT6359_RG_VPA_MODESET_ADDR, MT6359_RG_VPA_MODESET_SHIFT), 527 - MT6359_BUCK("buck_vproc2", VPROC2, 400000, 1193750, 6250, 0, 528 - mt_volt_range2, MT6359_RG_BUCK_VPROC2_EN_ADDR, 566 + MT6359_BUCK("buck_vproc2", VPROC2, 400000, 1193750, 6250, 567 + MT6359_RG_BUCK_VPROC2_EN_ADDR, 529 568 MT6359_DA_VPROC2_EN_ADDR, MT6359_RG_BUCK_VPROC2_VOSEL_ADDR, 530 569 MT6359_RG_BUCK_VPROC2_VOSEL_MASK << 531 570 MT6359_RG_BUCK_VPROC2_VOSEL_SHIFT, 532 571 MT6359_RG_BUCK_VPROC2_LP_ADDR, 533 572 MT6359_RG_BUCK_VPROC2_LP_SHIFT, 534 573 MT6359_RG_VPROC2_FCCM_ADDR, MT6359_RG_VPROC2_FCCM_SHIFT), 535 - MT6359_BUCK("buck_vproc1", VPROC1, 400000, 1193750, 6250, 0, 536 - mt_volt_range2, MT6359_RG_BUCK_VPROC1_EN_ADDR, 574 + MT6359_BUCK("buck_vproc1", VPROC1, 400000, 1193750, 6250, 575 + MT6359_RG_BUCK_VPROC1_EN_ADDR, 537 576 MT6359_DA_VPROC1_EN_ADDR, MT6359_RG_BUCK_VPROC1_VOSEL_ADDR, 538 577 MT6359_RG_BUCK_VPROC1_VOSEL_MASK << 539 578 MT6359_RG_BUCK_VPROC1_VOSEL_SHIFT, 540 579 MT6359_RG_BUCK_VPROC1_LP_ADDR, 541 580 MT6359_RG_BUCK_VPROC1_LP_SHIFT, 542 581 MT6359_RG_VPROC1_FCCM_ADDR, MT6359_RG_VPROC1_FCCM_SHIFT), 543 - MT6359_BUCK("buck_vcore_sshub", VCORE_SSHUB, 400000, 1193750, 6250, 0, 544 - mt_volt_range2, MT6359_RG_BUCK_VCORE_SSHUB_EN_ADDR, 582 + MT6359_BUCK("buck_vcore_sshub", VCORE_SSHUB, 400000, 1193750, 6250, 583 + MT6359_RG_BUCK_VCORE_SSHUB_EN_ADDR, 545 584 MT6359_DA_VCORE_EN_ADDR, 546 585 MT6359_RG_BUCK_VCORE_SSHUB_VOSEL_ADDR, 547 586 MT6359_RG_BUCK_VCORE_SSHUB_VOSEL_MASK << ··· 568 607 MT6359_REG_FIXED("ldo_vusb", VUSB, MT6359_RG_LDO_VUSB_EN_0_ADDR, 569 608 MT6359_DA_VUSB_B_EN_ADDR, 3000000), 570 609 MT6359_LDO_LINEAR("ldo_vsram_proc2", VSRAM_PROC2, 500000, 1293750, 6250, 571 - 0, mt_volt_range6, MT6359_RG_LDO_VSRAM_PROC2_EN_ADDR, 610 + MT6359_RG_LDO_VSRAM_PROC2_EN_ADDR, 572 611 MT6359_DA_VSRAM_PROC2_B_EN_ADDR, 573 612 MT6359_RG_LDO_VSRAM_PROC2_VOSEL_ADDR, 574 613 MT6359_RG_LDO_VSRAM_PROC2_VOSEL_MASK << ··· 607 646 MT6359_REG_FIXED("ldo_vaux18", VAUX18, MT6359_RG_LDO_VAUX18_EN_ADDR, 608 647 MT6359_DA_VAUX18_B_EN_ADDR, 1800000), 609 648 MT6359_LDO_LINEAR("ldo_vsram_others", VSRAM_OTHERS, 500000, 1293750, 610 - 6250, 0, mt_volt_range6, 649 + 6250, 611 650 MT6359_RG_LDO_VSRAM_OTHERS_EN_ADDR, 612 651 MT6359_DA_VSRAM_OTHERS_B_EN_ADDR, 613 652 MT6359_RG_LDO_VSRAM_OTHERS_VOSEL_ADDR, ··· 668 707 MT6359_RG_VRF18_VOSEL_MASK << MT6359_RG_VRF18_VOSEL_SHIFT, 669 708 120), 670 709 MT6359_LDO_LINEAR("ldo_vsram_md", VSRAM_MD, 500000, 1100000, 6250, 671 - 0, mt_volt_range7, MT6359_RG_LDO_VSRAM_MD_EN_ADDR, 710 + MT6359_RG_LDO_VSRAM_MD_EN_ADDR, 672 711 MT6359_DA_VSRAM_MD_B_EN_ADDR, 673 712 MT6359_RG_LDO_VSRAM_MD_VOSEL_ADDR, 674 713 MT6359_RG_LDO_VSRAM_MD_VOSEL_MASK << ··· 689 728 MT6359_RG_VBBCK_VOSEL_MASK << MT6359_RG_VBBCK_VOSEL_SHIFT, 690 729 240), 691 730 MT6359_LDO_LINEAR("ldo_vsram_proc1", VSRAM_PROC1, 500000, 1293750, 6250, 692 - 0, mt_volt_range6, MT6359_RG_LDO_VSRAM_PROC1_EN_ADDR, 731 + MT6359_RG_LDO_VSRAM_PROC1_EN_ADDR, 693 732 MT6359_DA_VSRAM_PROC1_B_EN_ADDR, 694 733 MT6359_RG_LDO_VSRAM_PROC1_VOSEL_ADDR, 695 734 MT6359_RG_LDO_VSRAM_PROC1_VOSEL_MASK << ··· 700 739 MT6359_RG_VSIM2_VOSEL_MASK << MT6359_RG_VSIM2_VOSEL_SHIFT, 701 740 480), 702 741 MT6359_LDO_LINEAR("ldo_vsram_others_sshub", VSRAM_OTHERS_SSHUB, 703 - 500000, 1293750, 6250, 0, mt_volt_range6, 742 + 500000, 1293750, 6250, 704 743 MT6359_RG_LDO_VSRAM_OTHERS_SSHUB_EN_ADDR, 705 744 MT6359_DA_VSRAM_OTHERS_B_EN_ADDR, 706 745 MT6359_RG_LDO_VSRAM_OTHERS_SSHUB_VOSEL_ADDR, ··· 709 748 }; 710 749 711 750 static struct mt6359_regulator_info mt6359p_regulators[] = { 712 - MT6359_BUCK("buck_vs1", VS1, 800000, 2200000, 12500, 0, 713 - mt_volt_range1, MT6359_RG_BUCK_VS1_EN_ADDR, 751 + MT6359_BUCK("buck_vs1", VS1, 800000, 2200000, 12500, 752 + MT6359_RG_BUCK_VS1_EN_ADDR, 714 753 MT6359_DA_VS1_EN_ADDR, MT6359_RG_BUCK_VS1_VOSEL_ADDR, 715 754 MT6359_RG_BUCK_VS1_VOSEL_MASK << 716 755 MT6359_RG_BUCK_VS1_VOSEL_SHIFT, 717 756 MT6359_RG_BUCK_VS1_LP_ADDR, MT6359_RG_BUCK_VS1_LP_SHIFT, 718 757 MT6359_RG_VS1_FPWM_ADDR, MT6359_RG_VS1_FPWM_SHIFT), 719 - MT6359_BUCK("buck_vgpu11", VGPU11, 400000, 1193750, 6250, 0, 720 - mt_volt_range2, MT6359_RG_BUCK_VGPU11_EN_ADDR, 758 + MT6359_BUCK("buck_vgpu11", VGPU11, 400000, 1193750, 6250, 759 + MT6359_RG_BUCK_VGPU11_EN_ADDR, 721 760 MT6359_DA_VGPU11_EN_ADDR, MT6359P_RG_BUCK_VGPU11_VOSEL_ADDR, 722 761 MT6359_RG_BUCK_VGPU11_VOSEL_MASK << 723 762 MT6359_RG_BUCK_VGPU11_VOSEL_SHIFT, 724 763 MT6359_RG_BUCK_VGPU11_LP_ADDR, 725 764 MT6359_RG_BUCK_VGPU11_LP_SHIFT, 726 765 MT6359_RG_VGPU11_FCCM_ADDR, MT6359_RG_VGPU11_FCCM_SHIFT), 727 - MT6359_BUCK("buck_vmodem", VMODEM, 400000, 1100000, 6250, 0, 728 - mt_volt_range3, MT6359_RG_BUCK_VMODEM_EN_ADDR, 766 + MT6359_BUCK("buck_vmodem", VMODEM, 400000, 1100000, 6250, 767 + MT6359_RG_BUCK_VMODEM_EN_ADDR, 729 768 MT6359_DA_VMODEM_EN_ADDR, MT6359_RG_BUCK_VMODEM_VOSEL_ADDR, 730 769 MT6359_RG_BUCK_VMODEM_VOSEL_MASK << 731 770 MT6359_RG_BUCK_VMODEM_VOSEL_SHIFT, 732 771 MT6359_RG_BUCK_VMODEM_LP_ADDR, 733 772 MT6359_RG_BUCK_VMODEM_LP_SHIFT, 734 773 MT6359_RG_VMODEM_FCCM_ADDR, MT6359_RG_VMODEM_FCCM_SHIFT), 735 - MT6359_BUCK("buck_vpu", VPU, 400000, 1193750, 6250, 0, 736 - mt_volt_range2, MT6359_RG_BUCK_VPU_EN_ADDR, 774 + MT6359_BUCK("buck_vpu", VPU, 400000, 1193750, 6250, 775 + MT6359_RG_BUCK_VPU_EN_ADDR, 737 776 MT6359_DA_VPU_EN_ADDR, MT6359_RG_BUCK_VPU_VOSEL_ADDR, 738 777 MT6359_RG_BUCK_VPU_VOSEL_MASK << 739 778 MT6359_RG_BUCK_VPU_VOSEL_SHIFT, 740 779 MT6359_RG_BUCK_VPU_LP_ADDR, MT6359_RG_BUCK_VPU_LP_SHIFT, 741 780 MT6359_RG_VPU_FCCM_ADDR, MT6359_RG_VPU_FCCM_SHIFT), 742 - MT6359_BUCK("buck_vcore", VCORE, 506250, 1300000, 6250, 0, 743 - mt_volt_range8, MT6359_RG_BUCK_VCORE_EN_ADDR, 781 + MT6359_BUCK("buck_vcore", VCORE, 506250, 1300000, 6250, 782 + MT6359_RG_BUCK_VCORE_EN_ADDR, 744 783 MT6359_DA_VCORE_EN_ADDR, MT6359P_RG_BUCK_VCORE_VOSEL_ADDR, 745 784 MT6359_RG_BUCK_VCORE_VOSEL_MASK << 746 785 MT6359_RG_BUCK_VCORE_VOSEL_SHIFT, 747 786 MT6359_RG_BUCK_VCORE_LP_ADDR, MT6359_RG_BUCK_VCORE_LP_SHIFT, 748 787 MT6359_RG_VCORE_FCCM_ADDR, MT6359_RG_VCORE_FCCM_SHIFT), 749 - MT6359_BUCK("buck_vs2", VS2, 800000, 1600000, 12500, 0, 750 - mt_volt_range4, MT6359_RG_BUCK_VS2_EN_ADDR, 788 + MT6359_BUCK("buck_vs2", VS2, 800000, 1600000, 12500, 789 + MT6359_RG_BUCK_VS2_EN_ADDR, 751 790 MT6359_DA_VS2_EN_ADDR, MT6359_RG_BUCK_VS2_VOSEL_ADDR, 752 791 MT6359_RG_BUCK_VS2_VOSEL_MASK << 753 792 MT6359_RG_BUCK_VS2_VOSEL_SHIFT, 754 793 MT6359_RG_BUCK_VS2_LP_ADDR, MT6359_RG_BUCK_VS2_LP_SHIFT, 755 794 MT6359_RG_VS2_FPWM_ADDR, MT6359_RG_VS2_FPWM_SHIFT), 756 - MT6359_BUCK("buck_vpa", VPA, 500000, 3650000, 50000, 0, 757 - mt_volt_range5, MT6359_RG_BUCK_VPA_EN_ADDR, 795 + MT6359_BUCK("buck_vpa", VPA, 500000, 3650000, 50000, 796 + MT6359_RG_BUCK_VPA_EN_ADDR, 758 797 MT6359_DA_VPA_EN_ADDR, MT6359_RG_BUCK_VPA_VOSEL_ADDR, 759 798 MT6359_RG_BUCK_VPA_VOSEL_MASK << 760 799 MT6359_RG_BUCK_VPA_VOSEL_SHIFT, 761 800 MT6359_RG_BUCK_VPA_LP_ADDR, MT6359_RG_BUCK_VPA_LP_SHIFT, 762 801 MT6359_RG_VPA_MODESET_ADDR, MT6359_RG_VPA_MODESET_SHIFT), 763 - MT6359_BUCK("buck_vproc2", VPROC2, 400000, 1193750, 6250, 0, 764 - mt_volt_range2, MT6359_RG_BUCK_VPROC2_EN_ADDR, 802 + MT6359_BUCK("buck_vproc2", VPROC2, 400000, 1193750, 6250, 803 + MT6359_RG_BUCK_VPROC2_EN_ADDR, 765 804 MT6359_DA_VPROC2_EN_ADDR, MT6359_RG_BUCK_VPROC2_VOSEL_ADDR, 766 805 MT6359_RG_BUCK_VPROC2_VOSEL_MASK << 767 806 MT6359_RG_BUCK_VPROC2_VOSEL_SHIFT, 768 807 MT6359_RG_BUCK_VPROC2_LP_ADDR, 769 808 MT6359_RG_BUCK_VPROC2_LP_SHIFT, 770 809 MT6359_RG_VPROC2_FCCM_ADDR, MT6359_RG_VPROC2_FCCM_SHIFT), 771 - MT6359_BUCK("buck_vproc1", VPROC1, 400000, 1193750, 6250, 0, 772 - mt_volt_range2, MT6359_RG_BUCK_VPROC1_EN_ADDR, 810 + MT6359_BUCK("buck_vproc1", VPROC1, 400000, 1193750, 6250, 811 + MT6359_RG_BUCK_VPROC1_EN_ADDR, 773 812 MT6359_DA_VPROC1_EN_ADDR, MT6359_RG_BUCK_VPROC1_VOSEL_ADDR, 774 813 MT6359_RG_BUCK_VPROC1_VOSEL_MASK << 775 814 MT6359_RG_BUCK_VPROC1_VOSEL_SHIFT, 776 815 MT6359_RG_BUCK_VPROC1_LP_ADDR, 777 816 MT6359_RG_BUCK_VPROC1_LP_SHIFT, 778 817 MT6359_RG_VPROC1_FCCM_ADDR, MT6359_RG_VPROC1_FCCM_SHIFT), 779 - MT6359_BUCK("buck_vgpu11_sshub", VGPU11_SSHUB, 400000, 1193750, 6250, 0, 780 - mt_volt_range2, MT6359P_RG_BUCK_VGPU11_SSHUB_EN_ADDR, 818 + MT6359_BUCK("buck_vgpu11_sshub", VGPU11_SSHUB, 400000, 1193750, 6250, 819 + MT6359P_RG_BUCK_VGPU11_SSHUB_EN_ADDR, 781 820 MT6359_DA_VGPU11_EN_ADDR, 782 821 MT6359P_RG_BUCK_VGPU11_SSHUB_VOSEL_ADDR, 783 822 MT6359P_RG_BUCK_VGPU11_SSHUB_VOSEL_MASK << ··· 805 844 MT6359_REG_FIXED("ldo_vusb", VUSB, MT6359P_RG_LDO_VUSB_EN_0_ADDR, 806 845 MT6359P_DA_VUSB_B_EN_ADDR, 3000000), 807 846 MT6359_LDO_LINEAR("ldo_vsram_proc2", VSRAM_PROC2, 500000, 1293750, 6250, 808 - 0, mt_volt_range6, MT6359P_RG_LDO_VSRAM_PROC2_EN_ADDR, 847 + MT6359P_RG_LDO_VSRAM_PROC2_EN_ADDR, 809 848 MT6359P_DA_VSRAM_PROC2_B_EN_ADDR, 810 849 MT6359P_RG_LDO_VSRAM_PROC2_VOSEL_ADDR, 811 850 MT6359_RG_LDO_VSRAM_PROC2_VOSEL_MASK << ··· 845 884 MT6359_REG_FIXED("ldo_vaux18", VAUX18, MT6359P_RG_LDO_VAUX18_EN_ADDR, 846 885 MT6359P_DA_VAUX18_B_EN_ADDR, 1800000), 847 886 MT6359_LDO_LINEAR("ldo_vsram_others", VSRAM_OTHERS, 500000, 1293750, 848 - 6250, 0, mt_volt_range6, 887 + 6250, 849 888 MT6359P_RG_LDO_VSRAM_OTHERS_EN_ADDR, 850 889 MT6359P_DA_VSRAM_OTHERS_B_EN_ADDR, 851 890 MT6359P_RG_LDO_VSRAM_OTHERS_VOSEL_ADDR, ··· 908 947 MT6359_RG_VRF18_VOSEL_MASK << MT6359_RG_VRF18_VOSEL_SHIFT, 909 948 240), 910 949 MT6359_LDO_LINEAR("ldo_vsram_md", VSRAM_MD, 500000, 1293750, 6250, 911 - 0, mt_volt_range7, MT6359P_RG_LDO_VSRAM_MD_EN_ADDR, 950 + MT6359P_RG_LDO_VSRAM_MD_EN_ADDR, 912 951 MT6359P_DA_VSRAM_MD_B_EN_ADDR, 913 952 MT6359P_RG_LDO_VSRAM_MD_VOSEL_ADDR, 914 953 MT6359_RG_LDO_VSRAM_MD_VOSEL_MASK << ··· 929 968 MT6359P_RG_VBBCK_VOSEL_MASK << MT6359P_RG_VBBCK_VOSEL_SHIFT, 930 969 480), 931 970 MT6359_LDO_LINEAR("ldo_vsram_proc1", VSRAM_PROC1, 500000, 1293750, 6250, 932 - 0, mt_volt_range6, MT6359P_RG_LDO_VSRAM_PROC1_EN_ADDR, 971 + MT6359P_RG_LDO_VSRAM_PROC1_EN_ADDR, 933 972 MT6359P_DA_VSRAM_PROC1_B_EN_ADDR, 934 973 MT6359P_RG_LDO_VSRAM_PROC1_VOSEL_ADDR, 935 974 MT6359_RG_LDO_VSRAM_PROC1_VOSEL_MASK << ··· 940 979 MT6359_RG_VSIM2_VOSEL_MASK << MT6359_RG_VSIM2_VOSEL_SHIFT, 941 980 480), 942 981 MT6359_LDO_LINEAR("ldo_vsram_others_sshub", VSRAM_OTHERS_SSHUB, 943 - 500000, 1293750, 6250, 0, mt_volt_range6, 982 + 500000, 1293750, 6250, 944 983 MT6359P_RG_LDO_VSRAM_OTHERS_SSHUB_EN_ADDR, 945 984 MT6359P_DA_VSRAM_OTHERS_B_EN_ADDR, 946 985 MT6359P_RG_LDO_VSRAM_OTHERS_SSHUB_VOSEL_ADDR,