Skip to content

Commit db3c16b

Browse files
jonhunterthierryreding
authored andcommitted
soc/tegra: pmc: Rename has_impl_33v_pwr flag
The flag 'has_impl_33v_pwr' is now only used to determine if we need to set the write-enable bit before we can set the bit to select if 3.3V IO is used or not. Therefore, rename the flag to 'has_io_pad_wren' to indicate that the SoC supports the write-enable register. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
1 parent edded7a commit db3c16b

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

drivers/soc/tegra/pmc.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ struct tegra_pmc_soc {
372372
bool has_tsense_reset;
373373
bool has_gpu_clamps;
374374
bool needs_mbist_war;
375-
bool has_impl_33v_pwr;
375+
bool has_io_pad_wren;
376376
bool maybe_tz_only;
377377

378378
const struct tegra_io_pad_soc *io_pads;
@@ -1922,7 +1922,7 @@ static int tegra_io_pad_set_voltage(struct tegra_pmc *pmc, enum tegra_io_pad id,
19221922

19231923
mutex_lock(&pmc->powergates_lock);
19241924

1925-
if (!pmc->soc->has_impl_33v_pwr) {
1925+
if (pmc->soc->has_io_pad_wren) {
19261926
/* write-enable PMC_PWR_DET_VALUE[pad->ena_3v3] */
19271927
value = tegra_pmc_readl(pmc, PMC_PWR_DET);
19281928
value |= BIT(pad->ena_3v3);
@@ -3536,7 +3536,7 @@ static const struct tegra_pmc_soc tegra20_pmc_soc = {
35363536
.has_tsense_reset = false,
35373537
.has_gpu_clamps = false,
35383538
.needs_mbist_war = false,
3539-
.has_impl_33v_pwr = false,
3539+
.has_io_pad_wren = true,
35403540
.maybe_tz_only = false,
35413541
.num_io_pads = 0,
35423542
.io_pads = NULL,
@@ -3598,7 +3598,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = {
35983598
.has_tsense_reset = true,
35993599
.has_gpu_clamps = false,
36003600
.needs_mbist_war = false,
3601-
.has_impl_33v_pwr = false,
3601+
.has_io_pad_wren = true,
36023602
.maybe_tz_only = false,
36033603
.num_io_pads = 0,
36043604
.io_pads = NULL,
@@ -3656,7 +3656,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = {
36563656
.has_tsense_reset = true,
36573657
.has_gpu_clamps = false,
36583658
.needs_mbist_war = false,
3659-
.has_impl_33v_pwr = false,
3659+
.has_io_pad_wren = true,
36603660
.maybe_tz_only = false,
36613661
.num_io_pads = 0,
36623662
.io_pads = NULL,
@@ -3807,7 +3807,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = {
38073807
.has_tsense_reset = true,
38083808
.has_gpu_clamps = true,
38093809
.needs_mbist_war = false,
3810-
.has_impl_33v_pwr = false,
3810+
.has_io_pad_wren = true,
38113811
.maybe_tz_only = false,
38123812
.num_io_pads = ARRAY_SIZE(tegra124_io_pads),
38133813
.io_pads = tegra124_io_pads,
@@ -3981,7 +3981,7 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = {
39813981
.has_tsense_reset = true,
39823982
.has_gpu_clamps = true,
39833983
.needs_mbist_war = true,
3984-
.has_impl_33v_pwr = false,
3984+
.has_io_pad_wren = true,
39853985
.maybe_tz_only = true,
39863986
.num_io_pads = ARRAY_SIZE(tegra210_io_pads),
39873987
.io_pads = tegra210_io_pads,
@@ -4195,7 +4195,7 @@ static const struct tegra_pmc_soc tegra186_pmc_soc = {
41954195
.has_tsense_reset = false,
41964196
.has_gpu_clamps = false,
41974197
.needs_mbist_war = false,
4198-
.has_impl_33v_pwr = true,
4198+
.has_io_pad_wren = false,
41994199
.maybe_tz_only = false,
42004200
.num_io_pads = ARRAY_SIZE(tegra186_io_pads),
42014201
.io_pads = tegra186_io_pads,
@@ -4399,7 +4399,7 @@ static const struct tegra_pmc_soc tegra194_pmc_soc = {
43994399
.has_tsense_reset = false,
44004400
.has_gpu_clamps = false,
44014401
.needs_mbist_war = false,
4402-
.has_impl_33v_pwr = true,
4402+
.has_io_pad_wren = false,
44034403
.maybe_tz_only = false,
44044404
.num_io_pads = ARRAY_SIZE(tegra194_io_pads),
44054405
.io_pads = tegra194_io_pads,
@@ -4555,7 +4555,7 @@ static const struct tegra_pmc_soc tegra234_pmc_soc = {
45554555
.has_tsense_reset = false,
45564556
.has_gpu_clamps = false,
45574557
.needs_mbist_war = false,
4558-
.has_impl_33v_pwr = true,
4558+
.has_io_pad_wren = false,
45594559
.maybe_tz_only = false,
45604560
.num_io_pads = ARRAY_SIZE(tegra234_io_pads),
45614561
.io_pads = tegra234_io_pads,
@@ -4704,7 +4704,7 @@ static const struct tegra_wake_event tegra264_wake_events[] = {
47044704
};
47054705

47064706
static const struct tegra_pmc_soc tegra264_pmc_soc = {
4707-
.has_impl_33v_pwr = true,
4707+
.has_io_pad_wren = false,
47084708
.regs = &tegra264_pmc_regs,
47094709
.init = tegra186_pmc_init,
47104710
.setup_irq_polarity = tegra186_pmc_setup_irq_polarity,

0 commit comments

Comments
 (0)