Skip to content

Commit cc0739f

Browse files
committed
Merge tag 'tegra-for-6.10-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/drivers
soc/tegra: Changes for v6.10-rc1 This contains a single commit that adds a wake event for Ethernet for some devices. * tag 'tegra-for-6.10-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: soc/tegra: pmc: Add EQOS wake event for Tegra194 and Tegra234 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 46671fd + de024f6 commit cc0739f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/soc/tegra/pmc.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4074,6 +4074,7 @@ static const char * const tegra194_reset_sources[] = {
40744074
};
40754075

40764076
static const struct tegra_wake_event tegra194_wake_events[] = {
4077+
TEGRA_WAKE_GPIO("eqos", 20, 0, TEGRA194_MAIN_GPIO(G, 4)),
40774078
TEGRA_WAKE_IRQ("pmu", 24, 209),
40784079
TEGRA_WAKE_GPIO("power", 29, 1, TEGRA194_AON_GPIO(EE, 4)),
40794080
TEGRA_WAKE_IRQ("rtc", 73, 10),
@@ -4210,6 +4211,7 @@ static const char * const tegra234_reset_sources[] = {
42104211

42114212
static const struct tegra_wake_event tegra234_wake_events[] = {
42124213
TEGRA_WAKE_GPIO("sd-wake", 8, 0, TEGRA234_MAIN_GPIO(G, 7)),
4214+
TEGRA_WAKE_GPIO("eqos", 20, 0, TEGRA234_MAIN_GPIO(G, 4)),
42134215
TEGRA_WAKE_IRQ("pmu", 24, 209),
42144216
TEGRA_WAKE_GPIO("power", 29, 1, TEGRA234_AON_GPIO(EE, 4)),
42154217
TEGRA_WAKE_GPIO("mgbe", 56, 0, TEGRA234_MAIN_GPIO(Y, 3)),

0 commit comments

Comments
 (0)