| Message ID | 20230803074249.3065586-6-wenst@chromium.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | regulator: mt6366: Split out of MT6358 and cleanup | expand |
Il 03/08/23 09:42, Chen-Yu Tsai ha scritto: > The new MT6366 binding does away with the type prefix ("buck_", "ldo_") > in the regulator node names. This better matches the PMIC pin names. > Remaining underscores in names are also replaced with hyphens. > > Drop the type prefixes and replace remaining underscores to match the > MT6366 binding. > > Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> There is *no upstream devicetree* using any of those names, as the first devices that will use the MT6366 will be MT8186 Corsola, which are not upstreamed yet. This means that this commit does not break ABI, so, I agree - which implies.... Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Cheers, Angelo > --- > drivers/regulator/mt6358-regulator.c | 70 ++++++++++++++-------------- > 1 file changed, 35 insertions(+), 35 deletions(-) > > diff --git a/drivers/regulator/mt6358-regulator.c b/drivers/regulator/mt6358-regulator.c > index 3cb2e6768e25..5a43a84c7a3e 100644 > --- a/drivers/regulator/mt6358-regulator.c > +++ b/drivers/regulator/mt6358-regulator.c > @@ -536,68 +536,68 @@ static const struct mt6358_regulator_info mt6358_regulators[] = { > > /* The array is indexed by id(MT6366_ID_XXX) */ > static const struct mt6358_regulator_info mt6366_regulators[] = { > - MT6366_BUCK("buck_vdram1", VDRAM1, 500000, 2087500, 12500, > + MT6366_BUCK("vdram1", VDRAM1, 500000, 2087500, 12500, > 0x7f, MT6358_BUCK_VDRAM1_DBG0, 0x7f, MT6358_VDRAM1_ANA_CON0, 8), > - MT6366_BUCK("buck_vcore", VCORE, 500000, 1293750, 6250, > + MT6366_BUCK("vcore", VCORE, 500000, 1293750, 6250, > 0x7f, MT6358_BUCK_VCORE_DBG0, 0x7f, MT6358_VCORE_VGPU_ANA_CON0, 1), > - MT6366_BUCK("buck_vpa", VPA, 500000, 3650000, 50000, > + MT6366_BUCK("vpa", VPA, 500000, 3650000, 50000, > 0x3f, MT6358_BUCK_VPA_DBG0, 0x3f, MT6358_VPA_ANA_CON0, 3), > - MT6366_BUCK("buck_vproc11", VPROC11, 500000, 1293750, 6250, > + MT6366_BUCK("vproc11", VPROC11, 500000, 1293750, 6250, > 0x7f, MT6358_BUCK_VPROC11_DBG0, 0x7f, MT6358_VPROC_ANA_CON0, 1), > - MT6366_BUCK("buck_vproc12", VPROC12, 500000, 1293750, 6250, > + MT6366_BUCK("vproc12", VPROC12, 500000, 1293750, 6250, > 0x7f, MT6358_BUCK_VPROC12_DBG0, 0x7f, MT6358_VPROC_ANA_CON0, 2), > - MT6366_BUCK("buck_vgpu", VGPU, 500000, 1293750, 6250, > + MT6366_BUCK("vgpu", VGPU, 500000, 1293750, 6250, > 0x7f, MT6358_BUCK_VGPU_ELR0, 0x7f, MT6358_VCORE_VGPU_ANA_CON0, 2), > - MT6366_BUCK("buck_vs2", VS2, 500000, 2087500, 12500, > + MT6366_BUCK("vs2", VS2, 500000, 2087500, 12500, > 0x7f, MT6358_BUCK_VS2_DBG0, 0x7f, MT6358_VS2_ANA_CON0, 8), > - MT6366_BUCK("buck_vmodem", VMODEM, 500000, 1293750, 6250, > + MT6366_BUCK("vmodem", VMODEM, 500000, 1293750, 6250, > 0x7f, MT6358_BUCK_VMODEM_DBG0, 0x7f, MT6358_VMODEM_ANA_CON0, 8), > - MT6366_BUCK("buck_vs1", VS1, 1000000, 2587500, 12500, > + MT6366_BUCK("vs1", VS1, 1000000, 2587500, 12500, > 0x7f, MT6358_BUCK_VS1_DBG0, 0x7f, MT6358_VS1_ANA_CON0, 8), > - MT6366_REG_FIXED("ldo_vrf12", VRF12, > + MT6366_REG_FIXED("vrf12", VRF12, > MT6358_LDO_VRF12_CON0, 0, 1200000), > - MT6366_REG_FIXED("ldo_vio18", VIO18, > + MT6366_REG_FIXED("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, > + MT6366_REG_FIXED("vcn18", VCN18, MT6358_LDO_VCN18_CON0, 0, 1800000), > + MT6366_REG_FIXED("vfe28", VFE28, MT6358_LDO_VFE28_CON0, 0, 2800000), > + MT6366_REG_FIXED("vcn28", VCN28, MT6358_LDO_VCN28_CON0, 0, 2800000), > + MT6366_REG_FIXED("vxo22", VXO22, MT6358_LDO_VXO22_CON0, 0, 2200000), > + MT6366_REG_FIXED("vaux18", VAUX18, > MT6358_LDO_VAUX18_CON0, 0, 1800000), > - MT6366_REG_FIXED("ldo_vbif28", VBIF28, > + MT6366_REG_FIXED("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, > + MT6366_REG_FIXED("vio28", VIO28, MT6358_LDO_VIO28_CON0, 0, 2800000), > + MT6366_REG_FIXED("va12", VA12, MT6358_LDO_VA12_CON0, 0, 1200000), > + MT6366_REG_FIXED("vrf18", VRF18, MT6358_LDO_VRF18_CON0, 0, 1800000), > + MT6366_REG_FIXED("vaud28", VAUD28, > MT6358_LDO_VAUD28_CON0, 0, 2800000), > - MT6366_LDO("ldo_vdram2", VDRAM2, vdram2, > + MT6366_LDO("vdram2", VDRAM2, vdram2, > MT6358_LDO_VDRAM2_CON0, 0, MT6358_LDO_VDRAM2_ELR0, 0x10), > - MT6366_LDO("ldo_vsim1", VSIM1, vsim, > + MT6366_LDO("vsim1", VSIM1, vsim, > MT6358_LDO_VSIM1_CON0, 0, MT6358_VSIM1_ANA_CON0, 0xf00), > - MT6366_LDO("ldo_vibr", VIBR, vibr, > + MT6366_LDO("vibr", VIBR, vibr, > MT6358_LDO_VIBR_CON0, 0, MT6358_VIBR_ANA_CON0, 0xf00), > - MT6366_LDO("ldo_vusb", VUSB, vusb, > + MT6366_LDO("vusb", VUSB, vusb, > MT6358_LDO_VUSB_CON0_0, 0, MT6358_VUSB_ANA_CON0, 0x700), > - MT6366_LDO("ldo_vefuse", VEFUSE, vefuse, > + MT6366_LDO("vefuse", VEFUSE, vefuse, > MT6358_LDO_VEFUSE_CON0, 0, MT6358_VEFUSE_ANA_CON0, 0xf00), > - MT6366_LDO("ldo_vmch", VMCH, vmch_vemc, > + MT6366_LDO("vmch", VMCH, vmch_vemc, > MT6358_LDO_VMCH_CON0, 0, MT6358_VMCH_ANA_CON0, 0x700), > - MT6366_LDO("ldo_vemc", VEMC, vmch_vemc, > + MT6366_LDO("vemc", VEMC, vmch_vemc, > MT6358_LDO_VEMC_CON0, 0, MT6358_VEMC_ANA_CON0, 0x700), > - MT6366_LDO("ldo_vcn33", VCN33, vcn33, > + MT6366_LDO("vcn33", VCN33, vcn33, > MT6358_LDO_VCN33_CON0_0, 0, MT6358_VCN33_ANA_CON0, 0x300), > - MT6366_LDO("ldo_vmc", VMC, vmc, > + MT6366_LDO("vmc", VMC, vmc, > MT6358_LDO_VMC_CON0, 0, MT6358_VMC_ANA_CON0, 0xf00), > - MT6366_LDO("ldo_vsim2", VSIM2, vsim, > + MT6366_LDO("vsim2", VSIM2, vsim, > MT6358_LDO_VSIM2_CON0, 0, MT6358_VSIM2_ANA_CON0, 0xf00), > - MT6366_LDO1("ldo_vsram_proc11", VSRAM_PROC11, 500000, 1293750, 6250, > + MT6366_LDO1("vsram-proc11", VSRAM_PROC11, 500000, 1293750, 6250, > MT6358_LDO_VSRAM_PROC11_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON0, 0x7f), > - MT6366_LDO1("ldo_vsram_others", VSRAM_OTHERS, 500000, 1293750, 6250, > + MT6366_LDO1("vsram-others", VSRAM_OTHERS, 500000, 1293750, 6250, > MT6358_LDO_VSRAM_OTHERS_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON2, 0x7f), > - MT6366_LDO1("ldo_vsram_gpu", VSRAM_GPU, 500000, 1293750, 6250, > + MT6366_LDO1("vsram-gpu", VSRAM_GPU, 500000, 1293750, 6250, > MT6358_LDO_VSRAM_GPU_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON3, 0x7f), > - MT6366_LDO1("ldo_vsram_proc12", VSRAM_PROC12, 500000, 1293750, 6250, > + MT6366_LDO1("vsram-proc12", VSRAM_PROC12, 500000, 1293750, 6250, > MT6358_LDO_VSRAM_PROC12_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON1, 0x7f), > }; >
Hi Chen-Yu, On 8/3/23 12:01, AngeloGioacchino Del Regno wrote: > Il 03/08/23 09:42, Chen-Yu Tsai ha scritto: >> The new MT6366 binding does away with the type prefix ("buck_", "ldo_") >> in the regulator node names. This better matches the PMIC pin names. >> Remaining underscores in names are also replaced with hyphens. >> >> Drop the type prefixes and replace remaining underscores to match the >> MT6366 binding. >> >> Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > > There is *no upstream devicetree* using any of those names, as the first > devices > that will use the MT6366 will be MT8186 Corsola, which are not > upstreamed yet. > > This means that this commit does not break ABI, so, I agree - which > implies.... > > Reviewed-by: AngeloGioacchino Del Regno > <angelogioacchino.delregno@collabora.com> > > Cheers, > Angelo > >> --- >> drivers/regulator/mt6358-regulator.c | 70 ++++++++++++++-------------- >> 1 file changed, 35 insertions(+), 35 deletions(-) >> >> diff --git a/drivers/regulator/mt6358-regulator.c >> b/drivers/regulator/mt6358-regulator.c >> index 3cb2e6768e25..5a43a84c7a3e 100644 >> --- a/drivers/regulator/mt6358-regulator.c >> +++ b/drivers/regulator/mt6358-regulator.c >> @@ -536,68 +536,68 @@ static const struct mt6358_regulator_info >> mt6358_regulators[] = { >> /* The array is indexed by id(MT6366_ID_XXX) */ >> static const struct mt6358_regulator_info mt6366_regulators[] = { >> - MT6366_BUCK("buck_vdram1", VDRAM1, 500000, 2087500, 12500, >> + MT6366_BUCK("vdram1", VDRAM1, 500000, 2087500, 12500, >> 0x7f, MT6358_BUCK_VDRAM1_DBG0, 0x7f, >> MT6358_VDRAM1_ANA_CON0, 8), >> - MT6366_BUCK("buck_vcore", VCORE, 500000, 1293750, 6250, >> + MT6366_BUCK("vcore", VCORE, 500000, 1293750, 6250, >> 0x7f, MT6358_BUCK_VCORE_DBG0, 0x7f, >> MT6358_VCORE_VGPU_ANA_CON0, 1), >> - MT6366_BUCK("buck_vpa", VPA, 500000, 3650000, 50000, >> + MT6366_BUCK("vpa", VPA, 500000, 3650000, 50000, >> 0x3f, MT6358_BUCK_VPA_DBG0, 0x3f, MT6358_VPA_ANA_CON0, 3), >> - MT6366_BUCK("buck_vproc11", VPROC11, 500000, 1293750, 6250, >> + MT6366_BUCK("vproc11", VPROC11, 500000, 1293750, 6250, >> 0x7f, MT6358_BUCK_VPROC11_DBG0, 0x7f, >> MT6358_VPROC_ANA_CON0, 1), >> - MT6366_BUCK("buck_vproc12", VPROC12, 500000, 1293750, 6250, >> + MT6366_BUCK("vproc12", VPROC12, 500000, 1293750, 6250, >> 0x7f, MT6358_BUCK_VPROC12_DBG0, 0x7f, >> MT6358_VPROC_ANA_CON0, 2), >> - MT6366_BUCK("buck_vgpu", VGPU, 500000, 1293750, 6250, >> + MT6366_BUCK("vgpu", VGPU, 500000, 1293750, 6250, >> 0x7f, MT6358_BUCK_VGPU_ELR0, 0x7f, >> MT6358_VCORE_VGPU_ANA_CON0, 2), >> - MT6366_BUCK("buck_vs2", VS2, 500000, 2087500, 12500, >> + MT6366_BUCK("vs2", VS2, 500000, 2087500, 12500, >> 0x7f, MT6358_BUCK_VS2_DBG0, 0x7f, MT6358_VS2_ANA_CON0, 8), >> - MT6366_BUCK("buck_vmodem", VMODEM, 500000, 1293750, 6250, >> + MT6366_BUCK("vmodem", VMODEM, 500000, 1293750, 6250, >> 0x7f, MT6358_BUCK_VMODEM_DBG0, 0x7f, >> MT6358_VMODEM_ANA_CON0, 8), >> - MT6366_BUCK("buck_vs1", VS1, 1000000, 2587500, 12500, >> + MT6366_BUCK("vs1", VS1, 1000000, 2587500, 12500, >> 0x7f, MT6358_BUCK_VS1_DBG0, 0x7f, MT6358_VS1_ANA_CON0, 8), >> - MT6366_REG_FIXED("ldo_vrf12", VRF12, >> + MT6366_REG_FIXED("vrf12", VRF12, >> MT6358_LDO_VRF12_CON0, 0, 1200000), >> - MT6366_REG_FIXED("ldo_vio18", VIO18, >> + MT6366_REG_FIXED("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, >> + MT6366_REG_FIXED("vcn18", VCN18, MT6358_LDO_VCN18_CON0, 0, 1800000), >> + MT6366_REG_FIXED("vfe28", VFE28, MT6358_LDO_VFE28_CON0, 0, 2800000), >> + MT6366_REG_FIXED("vcn28", VCN28, MT6358_LDO_VCN28_CON0, 0, 2800000), >> + MT6366_REG_FIXED("vxo22", VXO22, MT6358_LDO_VXO22_CON0, 0, 2200000), >> + MT6366_REG_FIXED("vaux18", VAUX18, >> MT6358_LDO_VAUX18_CON0, 0, 1800000), The line being shorter, can't you compact them on a single line now ? Here, and on other occasions in the changes you made. Regards, >> - MT6366_REG_FIXED("ldo_vbif28", VBIF28, >> + MT6366_REG_FIXED("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, >> + MT6366_REG_FIXED("vio28", VIO28, MT6358_LDO_VIO28_CON0, 0, 2800000), >> + MT6366_REG_FIXED("va12", VA12, MT6358_LDO_VA12_CON0, 0, 1200000), >> + MT6366_REG_FIXED("vrf18", VRF18, MT6358_LDO_VRF18_CON0, 0, 1800000), >> + MT6366_REG_FIXED("vaud28", VAUD28, >> MT6358_LDO_VAUD28_CON0, 0, 2800000), >> - MT6366_LDO("ldo_vdram2", VDRAM2, vdram2, >> + MT6366_LDO("vdram2", VDRAM2, vdram2, >> MT6358_LDO_VDRAM2_CON0, 0, MT6358_LDO_VDRAM2_ELR0, 0x10), >> - MT6366_LDO("ldo_vsim1", VSIM1, vsim, >> + MT6366_LDO("vsim1", VSIM1, vsim, >> MT6358_LDO_VSIM1_CON0, 0, MT6358_VSIM1_ANA_CON0, 0xf00), >> - MT6366_LDO("ldo_vibr", VIBR, vibr, >> + MT6366_LDO("vibr", VIBR, vibr, >> MT6358_LDO_VIBR_CON0, 0, MT6358_VIBR_ANA_CON0, 0xf00), >> - MT6366_LDO("ldo_vusb", VUSB, vusb, >> + MT6366_LDO("vusb", VUSB, vusb, >> MT6358_LDO_VUSB_CON0_0, 0, MT6358_VUSB_ANA_CON0, 0x700), >> - MT6366_LDO("ldo_vefuse", VEFUSE, vefuse, >> + MT6366_LDO("vefuse", VEFUSE, vefuse, >> MT6358_LDO_VEFUSE_CON0, 0, MT6358_VEFUSE_ANA_CON0, 0xf00), >> - MT6366_LDO("ldo_vmch", VMCH, vmch_vemc, >> + MT6366_LDO("vmch", VMCH, vmch_vemc, >> MT6358_LDO_VMCH_CON0, 0, MT6358_VMCH_ANA_CON0, 0x700), >> - MT6366_LDO("ldo_vemc", VEMC, vmch_vemc, >> + MT6366_LDO("vemc", VEMC, vmch_vemc, >> MT6358_LDO_VEMC_CON0, 0, MT6358_VEMC_ANA_CON0, 0x700), >> - MT6366_LDO("ldo_vcn33", VCN33, vcn33, >> + MT6366_LDO("vcn33", VCN33, vcn33, >> MT6358_LDO_VCN33_CON0_0, 0, MT6358_VCN33_ANA_CON0, 0x300), >> - MT6366_LDO("ldo_vmc", VMC, vmc, >> + MT6366_LDO("vmc", VMC, vmc, >> MT6358_LDO_VMC_CON0, 0, MT6358_VMC_ANA_CON0, 0xf00), >> - MT6366_LDO("ldo_vsim2", VSIM2, vsim, >> + MT6366_LDO("vsim2", VSIM2, vsim, >> MT6358_LDO_VSIM2_CON0, 0, MT6358_VSIM2_ANA_CON0, 0xf00), >> - MT6366_LDO1("ldo_vsram_proc11", VSRAM_PROC11, 500000, 1293750, 6250, >> + MT6366_LDO1("vsram-proc11", VSRAM_PROC11, 500000, 1293750, 6250, >> MT6358_LDO_VSRAM_PROC11_DBG0, 0x7f00, >> MT6358_LDO_VSRAM_CON0, 0x7f), >> - MT6366_LDO1("ldo_vsram_others", VSRAM_OTHERS, 500000, 1293750, 6250, >> + MT6366_LDO1("vsram-others", VSRAM_OTHERS, 500000, 1293750, 6250, >> MT6358_LDO_VSRAM_OTHERS_DBG0, 0x7f00, >> MT6358_LDO_VSRAM_CON2, 0x7f), >> - MT6366_LDO1("ldo_vsram_gpu", VSRAM_GPU, 500000, 1293750, 6250, >> + MT6366_LDO1("vsram-gpu", VSRAM_GPU, 500000, 1293750, 6250, >> MT6358_LDO_VSRAM_GPU_DBG0, 0x7f00, >> MT6358_LDO_VSRAM_CON3, 0x7f), >> - MT6366_LDO1("ldo_vsram_proc12", VSRAM_PROC12, 500000, 1293750, 6250, >> + MT6366_LDO1("vsram-proc12", VSRAM_PROC12, 500000, 1293750, 6250, >> MT6358_LDO_VSRAM_PROC12_DBG0, 0x7f00, >> MT6358_LDO_VSRAM_CON1, 0x7f), >> }; > > >
On Fri, Aug 4, 2023 at 6:13 PM Eugen Hristev <eugen.hristev@collabora.com> wrote: > > Hi Chen-Yu, > > On 8/3/23 12:01, AngeloGioacchino Del Regno wrote: > > Il 03/08/23 09:42, Chen-Yu Tsai ha scritto: > >> The new MT6366 binding does away with the type prefix ("buck_", "ldo_") > >> in the regulator node names. This better matches the PMIC pin names. > >> Remaining underscores in names are also replaced with hyphens. > >> > >> Drop the type prefixes and replace remaining underscores to match the > >> MT6366 binding. > >> > >> Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> > > > > There is *no upstream devicetree* using any of those names, as the first > > devices > > that will use the MT6366 will be MT8186 Corsola, which are not > > upstreamed yet. > > > > This means that this commit does not break ABI, so, I agree - which > > implies.... > > > > Reviewed-by: AngeloGioacchino Del Regno > > <angelogioacchino.delregno@collabora.com> > > > > Cheers, > > Angelo > > > >> --- > >> drivers/regulator/mt6358-regulator.c | 70 ++++++++++++++-------------- > >> 1 file changed, 35 insertions(+), 35 deletions(-) > >> > >> diff --git a/drivers/regulator/mt6358-regulator.c > >> b/drivers/regulator/mt6358-regulator.c > >> index 3cb2e6768e25..5a43a84c7a3e 100644 > >> --- a/drivers/regulator/mt6358-regulator.c > >> +++ b/drivers/regulator/mt6358-regulator.c > >> @@ -536,68 +536,68 @@ static const struct mt6358_regulator_info > >> mt6358_regulators[] = { > >> /* The array is indexed by id(MT6366_ID_XXX) */ > >> static const struct mt6358_regulator_info mt6366_regulators[] = { > >> - MT6366_BUCK("buck_vdram1", VDRAM1, 500000, 2087500, 12500, > >> + MT6366_BUCK("vdram1", VDRAM1, 500000, 2087500, 12500, > >> 0x7f, MT6358_BUCK_VDRAM1_DBG0, 0x7f, > >> MT6358_VDRAM1_ANA_CON0, 8), > >> - MT6366_BUCK("buck_vcore", VCORE, 500000, 1293750, 6250, > >> + MT6366_BUCK("vcore", VCORE, 500000, 1293750, 6250, > >> 0x7f, MT6358_BUCK_VCORE_DBG0, 0x7f, > >> MT6358_VCORE_VGPU_ANA_CON0, 1), > >> - MT6366_BUCK("buck_vpa", VPA, 500000, 3650000, 50000, > >> + MT6366_BUCK("vpa", VPA, 500000, 3650000, 50000, > >> 0x3f, MT6358_BUCK_VPA_DBG0, 0x3f, MT6358_VPA_ANA_CON0, 3), > >> - MT6366_BUCK("buck_vproc11", VPROC11, 500000, 1293750, 6250, > >> + MT6366_BUCK("vproc11", VPROC11, 500000, 1293750, 6250, > >> 0x7f, MT6358_BUCK_VPROC11_DBG0, 0x7f, > >> MT6358_VPROC_ANA_CON0, 1), > >> - MT6366_BUCK("buck_vproc12", VPROC12, 500000, 1293750, 6250, > >> + MT6366_BUCK("vproc12", VPROC12, 500000, 1293750, 6250, > >> 0x7f, MT6358_BUCK_VPROC12_DBG0, 0x7f, > >> MT6358_VPROC_ANA_CON0, 2), > >> - MT6366_BUCK("buck_vgpu", VGPU, 500000, 1293750, 6250, > >> + MT6366_BUCK("vgpu", VGPU, 500000, 1293750, 6250, > >> 0x7f, MT6358_BUCK_VGPU_ELR0, 0x7f, > >> MT6358_VCORE_VGPU_ANA_CON0, 2), > >> - MT6366_BUCK("buck_vs2", VS2, 500000, 2087500, 12500, > >> + MT6366_BUCK("vs2", VS2, 500000, 2087500, 12500, > >> 0x7f, MT6358_BUCK_VS2_DBG0, 0x7f, MT6358_VS2_ANA_CON0, 8), > >> - MT6366_BUCK("buck_vmodem", VMODEM, 500000, 1293750, 6250, > >> + MT6366_BUCK("vmodem", VMODEM, 500000, 1293750, 6250, > >> 0x7f, MT6358_BUCK_VMODEM_DBG0, 0x7f, > >> MT6358_VMODEM_ANA_CON0, 8), > >> - MT6366_BUCK("buck_vs1", VS1, 1000000, 2587500, 12500, > >> + MT6366_BUCK("vs1", VS1, 1000000, 2587500, 12500, > >> 0x7f, MT6358_BUCK_VS1_DBG0, 0x7f, MT6358_VS1_ANA_CON0, 8), > >> - MT6366_REG_FIXED("ldo_vrf12", VRF12, > >> + MT6366_REG_FIXED("vrf12", VRF12, > >> MT6358_LDO_VRF12_CON0, 0, 1200000), > >> - MT6366_REG_FIXED("ldo_vio18", VIO18, > >> + MT6366_REG_FIXED("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, > >> + MT6366_REG_FIXED("vcn18", VCN18, MT6358_LDO_VCN18_CON0, 0, 1800000), > >> + MT6366_REG_FIXED("vfe28", VFE28, MT6358_LDO_VFE28_CON0, 0, 2800000), > >> + MT6366_REG_FIXED("vcn28", VCN28, MT6358_LDO_VCN28_CON0, 0, 2800000), > >> + MT6366_REG_FIXED("vxo22", VXO22, MT6358_LDO_VXO22_CON0, 0, 2200000), > >> + MT6366_REG_FIXED("vaux18", VAUX18, > >> MT6358_LDO_VAUX18_CON0, 0, 1800000), > > The line being shorter, can't you compact them on a single line now ? > Here, and on other occasions in the changes you made. I would prefer to do a final cleanup after all this has landed. That makes the refactoring easier to read, i.e. identify the changes. ChenYu > Regards, > > >> - MT6366_REG_FIXED("ldo_vbif28", VBIF28, > >> + MT6366_REG_FIXED("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, > >> + MT6366_REG_FIXED("vio28", VIO28, MT6358_LDO_VIO28_CON0, 0, 2800000), > >> + MT6366_REG_FIXED("va12", VA12, MT6358_LDO_VA12_CON0, 0, 1200000), > >> + MT6366_REG_FIXED("vrf18", VRF18, MT6358_LDO_VRF18_CON0, 0, 1800000), > >> + MT6366_REG_FIXED("vaud28", VAUD28, > >> MT6358_LDO_VAUD28_CON0, 0, 2800000), > >> - MT6366_LDO("ldo_vdram2", VDRAM2, vdram2, > >> + MT6366_LDO("vdram2", VDRAM2, vdram2, > >> MT6358_LDO_VDRAM2_CON0, 0, MT6358_LDO_VDRAM2_ELR0, 0x10), > >> - MT6366_LDO("ldo_vsim1", VSIM1, vsim, > >> + MT6366_LDO("vsim1", VSIM1, vsim, > >> MT6358_LDO_VSIM1_CON0, 0, MT6358_VSIM1_ANA_CON0, 0xf00), > >> - MT6366_LDO("ldo_vibr", VIBR, vibr, > >> + MT6366_LDO("vibr", VIBR, vibr, > >> MT6358_LDO_VIBR_CON0, 0, MT6358_VIBR_ANA_CON0, 0xf00), > >> - MT6366_LDO("ldo_vusb", VUSB, vusb, > >> + MT6366_LDO("vusb", VUSB, vusb, > >> MT6358_LDO_VUSB_CON0_0, 0, MT6358_VUSB_ANA_CON0, 0x700), > >> - MT6366_LDO("ldo_vefuse", VEFUSE, vefuse, > >> + MT6366_LDO("vefuse", VEFUSE, vefuse, > >> MT6358_LDO_VEFUSE_CON0, 0, MT6358_VEFUSE_ANA_CON0, 0xf00), > >> - MT6366_LDO("ldo_vmch", VMCH, vmch_vemc, > >> + MT6366_LDO("vmch", VMCH, vmch_vemc, > >> MT6358_LDO_VMCH_CON0, 0, MT6358_VMCH_ANA_CON0, 0x700), > >> - MT6366_LDO("ldo_vemc", VEMC, vmch_vemc, > >> + MT6366_LDO("vemc", VEMC, vmch_vemc, > >> MT6358_LDO_VEMC_CON0, 0, MT6358_VEMC_ANA_CON0, 0x700), > >> - MT6366_LDO("ldo_vcn33", VCN33, vcn33, > >> + MT6366_LDO("vcn33", VCN33, vcn33, > >> MT6358_LDO_VCN33_CON0_0, 0, MT6358_VCN33_ANA_CON0, 0x300), > >> - MT6366_LDO("ldo_vmc", VMC, vmc, > >> + MT6366_LDO("vmc", VMC, vmc, > >> MT6358_LDO_VMC_CON0, 0, MT6358_VMC_ANA_CON0, 0xf00), > >> - MT6366_LDO("ldo_vsim2", VSIM2, vsim, > >> + MT6366_LDO("vsim2", VSIM2, vsim, > >> MT6358_LDO_VSIM2_CON0, 0, MT6358_VSIM2_ANA_CON0, 0xf00), > >> - MT6366_LDO1("ldo_vsram_proc11", VSRAM_PROC11, 500000, 1293750, 6250, > >> + MT6366_LDO1("vsram-proc11", VSRAM_PROC11, 500000, 1293750, 6250, > >> MT6358_LDO_VSRAM_PROC11_DBG0, 0x7f00, > >> MT6358_LDO_VSRAM_CON0, 0x7f), > >> - MT6366_LDO1("ldo_vsram_others", VSRAM_OTHERS, 500000, 1293750, 6250, > >> + MT6366_LDO1("vsram-others", VSRAM_OTHERS, 500000, 1293750, 6250, > >> MT6358_LDO_VSRAM_OTHERS_DBG0, 0x7f00, > >> MT6358_LDO_VSRAM_CON2, 0x7f), > >> - MT6366_LDO1("ldo_vsram_gpu", VSRAM_GPU, 500000, 1293750, 6250, > >> + MT6366_LDO1("vsram-gpu", VSRAM_GPU, 500000, 1293750, 6250, > >> MT6358_LDO_VSRAM_GPU_DBG0, 0x7f00, > >> MT6358_LDO_VSRAM_CON3, 0x7f), > >> - MT6366_LDO1("ldo_vsram_proc12", VSRAM_PROC12, 500000, 1293750, 6250, > >> + MT6366_LDO1("vsram-proc12", VSRAM_PROC12, 500000, 1293750, 6250, > >> MT6358_LDO_VSRAM_PROC12_DBG0, 0x7f00, > >> MT6358_LDO_VSRAM_CON1, 0x7f), > >> }; > > > > > > >
diff --git a/drivers/regulator/mt6358-regulator.c b/drivers/regulator/mt6358-regulator.c index 3cb2e6768e25..5a43a84c7a3e 100644 --- a/drivers/regulator/mt6358-regulator.c +++ b/drivers/regulator/mt6358-regulator.c @@ -536,68 +536,68 @@ static const struct mt6358_regulator_info mt6358_regulators[] = { /* The array is indexed by id(MT6366_ID_XXX) */ static const struct mt6358_regulator_info mt6366_regulators[] = { - MT6366_BUCK("buck_vdram1", VDRAM1, 500000, 2087500, 12500, + MT6366_BUCK("vdram1", VDRAM1, 500000, 2087500, 12500, 0x7f, MT6358_BUCK_VDRAM1_DBG0, 0x7f, MT6358_VDRAM1_ANA_CON0, 8), - MT6366_BUCK("buck_vcore", VCORE, 500000, 1293750, 6250, + MT6366_BUCK("vcore", VCORE, 500000, 1293750, 6250, 0x7f, MT6358_BUCK_VCORE_DBG0, 0x7f, MT6358_VCORE_VGPU_ANA_CON0, 1), - MT6366_BUCK("buck_vpa", VPA, 500000, 3650000, 50000, + MT6366_BUCK("vpa", VPA, 500000, 3650000, 50000, 0x3f, MT6358_BUCK_VPA_DBG0, 0x3f, MT6358_VPA_ANA_CON0, 3), - MT6366_BUCK("buck_vproc11", VPROC11, 500000, 1293750, 6250, + MT6366_BUCK("vproc11", VPROC11, 500000, 1293750, 6250, 0x7f, MT6358_BUCK_VPROC11_DBG0, 0x7f, MT6358_VPROC_ANA_CON0, 1), - MT6366_BUCK("buck_vproc12", VPROC12, 500000, 1293750, 6250, + MT6366_BUCK("vproc12", VPROC12, 500000, 1293750, 6250, 0x7f, MT6358_BUCK_VPROC12_DBG0, 0x7f, MT6358_VPROC_ANA_CON0, 2), - MT6366_BUCK("buck_vgpu", VGPU, 500000, 1293750, 6250, + MT6366_BUCK("vgpu", VGPU, 500000, 1293750, 6250, 0x7f, MT6358_BUCK_VGPU_ELR0, 0x7f, MT6358_VCORE_VGPU_ANA_CON0, 2), - MT6366_BUCK("buck_vs2", VS2, 500000, 2087500, 12500, + MT6366_BUCK("vs2", VS2, 500000, 2087500, 12500, 0x7f, MT6358_BUCK_VS2_DBG0, 0x7f, MT6358_VS2_ANA_CON0, 8), - MT6366_BUCK("buck_vmodem", VMODEM, 500000, 1293750, 6250, + MT6366_BUCK("vmodem", VMODEM, 500000, 1293750, 6250, 0x7f, MT6358_BUCK_VMODEM_DBG0, 0x7f, MT6358_VMODEM_ANA_CON0, 8), - MT6366_BUCK("buck_vs1", VS1, 1000000, 2587500, 12500, + MT6366_BUCK("vs1", VS1, 1000000, 2587500, 12500, 0x7f, MT6358_BUCK_VS1_DBG0, 0x7f, MT6358_VS1_ANA_CON0, 8), - MT6366_REG_FIXED("ldo_vrf12", VRF12, + MT6366_REG_FIXED("vrf12", VRF12, MT6358_LDO_VRF12_CON0, 0, 1200000), - MT6366_REG_FIXED("ldo_vio18", VIO18, + MT6366_REG_FIXED("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, + MT6366_REG_FIXED("vcn18", VCN18, MT6358_LDO_VCN18_CON0, 0, 1800000), + MT6366_REG_FIXED("vfe28", VFE28, MT6358_LDO_VFE28_CON0, 0, 2800000), + MT6366_REG_FIXED("vcn28", VCN28, MT6358_LDO_VCN28_CON0, 0, 2800000), + MT6366_REG_FIXED("vxo22", VXO22, MT6358_LDO_VXO22_CON0, 0, 2200000), + MT6366_REG_FIXED("vaux18", VAUX18, MT6358_LDO_VAUX18_CON0, 0, 1800000), - MT6366_REG_FIXED("ldo_vbif28", VBIF28, + MT6366_REG_FIXED("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, + MT6366_REG_FIXED("vio28", VIO28, MT6358_LDO_VIO28_CON0, 0, 2800000), + MT6366_REG_FIXED("va12", VA12, MT6358_LDO_VA12_CON0, 0, 1200000), + MT6366_REG_FIXED("vrf18", VRF18, MT6358_LDO_VRF18_CON0, 0, 1800000), + MT6366_REG_FIXED("vaud28", VAUD28, MT6358_LDO_VAUD28_CON0, 0, 2800000), - MT6366_LDO("ldo_vdram2", VDRAM2, vdram2, + MT6366_LDO("vdram2", VDRAM2, vdram2, MT6358_LDO_VDRAM2_CON0, 0, MT6358_LDO_VDRAM2_ELR0, 0x10), - MT6366_LDO("ldo_vsim1", VSIM1, vsim, + MT6366_LDO("vsim1", VSIM1, vsim, MT6358_LDO_VSIM1_CON0, 0, MT6358_VSIM1_ANA_CON0, 0xf00), - MT6366_LDO("ldo_vibr", VIBR, vibr, + MT6366_LDO("vibr", VIBR, vibr, MT6358_LDO_VIBR_CON0, 0, MT6358_VIBR_ANA_CON0, 0xf00), - MT6366_LDO("ldo_vusb", VUSB, vusb, + MT6366_LDO("vusb", VUSB, vusb, MT6358_LDO_VUSB_CON0_0, 0, MT6358_VUSB_ANA_CON0, 0x700), - MT6366_LDO("ldo_vefuse", VEFUSE, vefuse, + MT6366_LDO("vefuse", VEFUSE, vefuse, MT6358_LDO_VEFUSE_CON0, 0, MT6358_VEFUSE_ANA_CON0, 0xf00), - MT6366_LDO("ldo_vmch", VMCH, vmch_vemc, + MT6366_LDO("vmch", VMCH, vmch_vemc, MT6358_LDO_VMCH_CON0, 0, MT6358_VMCH_ANA_CON0, 0x700), - MT6366_LDO("ldo_vemc", VEMC, vmch_vemc, + MT6366_LDO("vemc", VEMC, vmch_vemc, MT6358_LDO_VEMC_CON0, 0, MT6358_VEMC_ANA_CON0, 0x700), - MT6366_LDO("ldo_vcn33", VCN33, vcn33, + MT6366_LDO("vcn33", VCN33, vcn33, MT6358_LDO_VCN33_CON0_0, 0, MT6358_VCN33_ANA_CON0, 0x300), - MT6366_LDO("ldo_vmc", VMC, vmc, + MT6366_LDO("vmc", VMC, vmc, MT6358_LDO_VMC_CON0, 0, MT6358_VMC_ANA_CON0, 0xf00), - MT6366_LDO("ldo_vsim2", VSIM2, vsim, + MT6366_LDO("vsim2", VSIM2, vsim, MT6358_LDO_VSIM2_CON0, 0, MT6358_VSIM2_ANA_CON0, 0xf00), - MT6366_LDO1("ldo_vsram_proc11", VSRAM_PROC11, 500000, 1293750, 6250, + MT6366_LDO1("vsram-proc11", VSRAM_PROC11, 500000, 1293750, 6250, MT6358_LDO_VSRAM_PROC11_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON0, 0x7f), - MT6366_LDO1("ldo_vsram_others", VSRAM_OTHERS, 500000, 1293750, 6250, + MT6366_LDO1("vsram-others", VSRAM_OTHERS, 500000, 1293750, 6250, MT6358_LDO_VSRAM_OTHERS_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON2, 0x7f), - MT6366_LDO1("ldo_vsram_gpu", VSRAM_GPU, 500000, 1293750, 6250, + MT6366_LDO1("vsram-gpu", VSRAM_GPU, 500000, 1293750, 6250, MT6358_LDO_VSRAM_GPU_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON3, 0x7f), - MT6366_LDO1("ldo_vsram_proc12", VSRAM_PROC12, 500000, 1293750, 6250, + MT6366_LDO1("vsram-proc12", VSRAM_PROC12, 500000, 1293750, 6250, MT6358_LDO_VSRAM_PROC12_DBG0, 0x7f00, MT6358_LDO_VSRAM_CON1, 0x7f), };
The new MT6366 binding does away with the type prefix ("buck_", "ldo_") in the regulator node names. This better matches the PMIC pin names. Remaining underscores in names are also replaced with hyphens. Drop the type prefixes and replace remaining underscores to match the MT6366 binding. Signed-off-by: Chen-Yu Tsai <wenst@chromium.org> --- drivers/regulator/mt6358-regulator.c | 70 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-)