Skip to content

Commit f98485e

Browse files
committed
soc/tegra: pmc: Reorder reset sources/levels definitions
Move the definitions of reset sources and levels into a more natural location. Reviewed-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
1 parent 03d2852 commit f98485e

1 file changed

Lines changed: 39 additions & 39 deletions

File tree

drivers/soc/tegra/pmc.c

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -336,45 +336,6 @@ struct tegra_pmc_soc {
336336
bool has_blink_output;
337337
};
338338

339-
static const char * const tegra186_reset_sources[] = {
340-
"SYS_RESET",
341-
"AOWDT",
342-
"MCCPLEXWDT",
343-
"BPMPWDT",
344-
"SCEWDT",
345-
"SPEWDT",
346-
"APEWDT",
347-
"BCCPLEXWDT",
348-
"SENSOR",
349-
"AOTAG",
350-
"VFSENSOR",
351-
"SWREST",
352-
"SC7",
353-
"HSM",
354-
"CORESIGHT"
355-
};
356-
357-
static const char * const tegra186_reset_levels[] = {
358-
"L0", "L1", "L2", "WARM"
359-
};
360-
361-
static const char * const tegra30_reset_sources[] = {
362-
"POWER_ON_RESET",
363-
"WATCHDOG",
364-
"SENSOR",
365-
"SW_MAIN",
366-
"LP0"
367-
};
368-
369-
static const char * const tegra210_reset_sources[] = {
370-
"POWER_ON_RESET",
371-
"WATCHDOG",
372-
"SENSOR",
373-
"SW_MAIN",
374-
"LP0",
375-
"AOTAG"
376-
};
377-
378339
/**
379340
* struct tegra_pmc - NVIDIA Tegra PMC
380341
* @dev: pointer to PMC device structure
@@ -2784,6 +2745,14 @@ static const u8 tegra30_cpu_powergates[] = {
27842745
TEGRA_POWERGATE_CPU3,
27852746
};
27862747

2748+
static const char * const tegra30_reset_sources[] = {
2749+
"POWER_ON_RESET",
2750+
"WATCHDOG",
2751+
"SENSOR",
2752+
"SW_MAIN",
2753+
"LP0"
2754+
};
2755+
27872756
static const struct tegra_pmc_soc tegra30_pmc_soc = {
27882757
.num_powergates = ARRAY_SIZE(tegra30_powergates),
27892758
.powergates = tegra30_powergates,
@@ -3061,6 +3030,15 @@ static const struct pinctrl_pin_desc tegra210_pin_descs[] = {
30613030
TEGRA210_IO_PAD_TABLE(TEGRA_IO_PIN_DESC)
30623031
};
30633032

3033+
static const char * const tegra210_reset_sources[] = {
3034+
"POWER_ON_RESET",
3035+
"WATCHDOG",
3036+
"SENSOR",
3037+
"SW_MAIN",
3038+
"LP0",
3039+
"AOTAG"
3040+
};
3041+
30643042
static const struct tegra_wake_event tegra210_wake_events[] = {
30653043
TEGRA_WAKE_IRQ("rtc", 16, 2),
30663044
TEGRA_WAKE_IRQ("pmu", 51, 86),
@@ -3193,6 +3171,28 @@ static void tegra186_pmc_setup_irq_polarity(struct tegra_pmc *pmc,
31933171
iounmap(wake);
31943172
}
31953173

3174+
static const char * const tegra186_reset_sources[] = {
3175+
"SYS_RESET",
3176+
"AOWDT",
3177+
"MCCPLEXWDT",
3178+
"BPMPWDT",
3179+
"SCEWDT",
3180+
"SPEWDT",
3181+
"APEWDT",
3182+
"BCCPLEXWDT",
3183+
"SENSOR",
3184+
"AOTAG",
3185+
"VFSENSOR",
3186+
"SWREST",
3187+
"SC7",
3188+
"HSM",
3189+
"CORESIGHT"
3190+
};
3191+
3192+
static const char * const tegra186_reset_levels[] = {
3193+
"L0", "L1", "L2", "WARM"
3194+
};
3195+
31963196
static const struct tegra_wake_event tegra186_wake_events[] = {
31973197
TEGRA_WAKE_IRQ("pmu", 24, 209),
31983198
TEGRA_WAKE_GPIO("power", 29, 1, TEGRA186_AON_GPIO(FF, 0)),

0 commit comments

Comments
 (0)