Skip to content

Commit 04ba665

Browse files
wensbroonie
authored andcommitted
regulator: mt6358: Drop *_SSHUB regulators
The *_SSHUB regulators are actually alternate configuration interfaces for their non *_SSHUB counterparts. They are not separate regulator outputs. These registers are intended for the companion processor to use to configure the power rails while the main processor is sleeping. They are not intended for the main operating system to use. Since they are not real outputs they shouldn't be modeled separately. Remove them. Luckily no device tree actually uses them. Signed-off-by: Chen-Yu Tsai <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> Reviewed-by: Matthias Brugger <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 65bae54 commit 04ba665

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

drivers/regulator/mt6358-regulator.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -505,9 +505,6 @@ static struct mt6358_regulator_info mt6358_regulators[] = {
505505
MT6358_BUCK("buck_vcore", VCORE, 500000, 1293750, 6250,
506506
buck_volt_range1, 0x7f, MT6358_BUCK_VCORE_DBG0, 0x7f,
507507
MT6358_VCORE_VGPU_ANA_CON0, 1),
508-
MT6358_BUCK("buck_vcore_sshub", VCORE_SSHUB, 500000, 1293750, 6250,
509-
buck_volt_range1, 0x7f, MT6358_BUCK_VCORE_SSHUB_ELR0, 0x7f,
510-
MT6358_VCORE_VGPU_ANA_CON0, 1),
511508
MT6358_BUCK("buck_vpa", VPA, 500000, 3650000, 50000,
512509
buck_volt_range3, 0x3f, MT6358_BUCK_VPA_DBG0, 0x3f,
513510
MT6358_VPA_ANA_CON0, 3),
@@ -583,10 +580,6 @@ static struct mt6358_regulator_info mt6358_regulators[] = {
583580
MT6358_LDO1("ldo_vsram_others", VSRAM_OTHERS, 500000, 1293750, 6250,
584581
buck_volt_range1, MT6358_LDO_VSRAM_OTHERS_DBG0, 0x7f00,
585582
MT6358_LDO_VSRAM_CON2, 0x7f),
586-
MT6358_LDO1("ldo_vsram_others_sshub", VSRAM_OTHERS_SSHUB, 500000,
587-
1293750, 6250, buck_volt_range1,
588-
MT6358_LDO_VSRAM_OTHERS_SSHUB_CON1, 0x7f,
589-
MT6358_LDO_VSRAM_OTHERS_SSHUB_CON1, 0x7f),
590583
MT6358_LDO1("ldo_vsram_gpu", VSRAM_GPU, 500000, 1293750, 6250,
591584
buck_volt_range1, MT6358_LDO_VSRAM_GPU_DBG0, 0x7f00,
592585
MT6358_LDO_VSRAM_CON3, 0x7f),
@@ -603,9 +596,6 @@ static struct mt6358_regulator_info mt6366_regulators[] = {
603596
MT6366_BUCK("buck_vcore", VCORE, 500000, 1293750, 6250,
604597
buck_volt_range1, 0x7f, MT6358_BUCK_VCORE_DBG0, 0x7f,
605598
MT6358_VCORE_VGPU_ANA_CON0, 1),
606-
MT6366_BUCK("buck_vcore_sshub", VCORE_SSHUB, 500000, 1293750, 6250,
607-
buck_volt_range1, 0x7f, MT6358_BUCK_VCORE_SSHUB_ELR0, 0x7f,
608-
MT6358_VCORE_VGPU_ANA_CON0, 1),
609599
MT6366_BUCK("buck_vpa", VPA, 500000, 3650000, 50000,
610600
buck_volt_range3, 0x3f, MT6358_BUCK_VPA_DBG0, 0x3f,
611601
MT6358_VPA_ANA_CON0, 3),
@@ -670,10 +660,6 @@ static struct mt6358_regulator_info mt6366_regulators[] = {
670660
MT6366_LDO1("ldo_vsram_others", VSRAM_OTHERS, 500000, 1293750, 6250,
671661
buck_volt_range1, MT6358_LDO_VSRAM_OTHERS_DBG0, 0x7f00,
672662
MT6358_LDO_VSRAM_CON2, 0x7f),
673-
MT6366_LDO1("ldo_vsram_others_sshub", VSRAM_OTHERS_SSHUB, 500000,
674-
1293750, 6250, buck_volt_range1,
675-
MT6358_LDO_VSRAM_OTHERS_SSHUB_CON1, 0x7f,
676-
MT6358_LDO_VSRAM_OTHERS_SSHUB_CON1, 0x7f),
677663
MT6366_LDO1("ldo_vsram_gpu", VSRAM_GPU, 500000, 1293750, 6250,
678664
buck_volt_range1, MT6358_LDO_VSRAM_GPU_DBG0, 0x7f00,
679665
MT6358_LDO_VSRAM_CON3, 0x7f),

include/linux/regulator/mt6358-regulator.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ enum {
4747
MT6358_ID_VLDO28,
4848
MT6358_ID_VAUD28,
4949
MT6358_ID_VSIM2,
50-
MT6358_ID_VCORE_SSHUB,
51-
MT6358_ID_VSRAM_OTHERS_SSHUB,
5250
MT6358_ID_RG_MAX,
5351
};
5452

@@ -88,8 +86,6 @@ enum {
8886
MT6366_ID_VMC,
8987
MT6366_ID_VAUD28,
9088
MT6366_ID_VSIM2,
91-
MT6366_ID_VCORE_SSHUB,
92-
MT6366_ID_VSRAM_OTHERS_SSHUB,
9389
MT6366_ID_RG_MAX,
9490
};
9591

0 commit comments

Comments
 (0)