Skip to content

Commit 40bb755

Browse files
author
CKI KWF Bot
committed
Merge: soc/tegra: pmc: Add SD wake event for Tegra234
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6515 JIRA: https://issues.redhat.com/browse/RHEL-26405 ## Summary of Changes NVIDIA Tegra devices can be woken up from suspend when SD card hot-plug/unplug event is detected. This MR backports [change from mainline kernel](https://web.git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/soc/tegra/pmc.c?id=ae7d2d9b8ebe9f107c500808d5bcd68397645720): ``` soc/tegra: pmc: Add SD wake event for Tegra234 Add SD wake event for Tegra234 so that system can be woken up from suspend when SD card hot-plug/unplug event is detected. Signed-off-by: Prathamesh Shete <pshete@nvidia.com> Signed-off-by: Petlozu Pravareshwar <petlozup@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com> ``` Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz@redhat.com> Approved-by: Radu Rendec <rrendec@redhat.com> Approved-by: Jiri Dluhos <jdluhos@redhat.com> Approved-by: Lenny Szubowicz <lszubowi@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 253fc23 + 0ccd1b4 commit 40bb755

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/soc/tegra/pmc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* drivers/soc/tegra/pmc.c
44
*
55
* Copyright (c) 2010 Google, Inc
6-
* Copyright (c) 2018-2023, NVIDIA CORPORATION. All rights reserved.
6+
* Copyright (c) 2018-2024, NVIDIA CORPORATION. All rights reserved.
77
*
88
* Author:
99
* Colin Cross <ccross@google.com>
@@ -4209,6 +4209,7 @@ static const char * const tegra234_reset_sources[] = {
42094209
};
42104210

42114211
static const struct tegra_wake_event tegra234_wake_events[] = {
4212+
TEGRA_WAKE_GPIO("sd-wake", 8, 0, TEGRA234_MAIN_GPIO(G, 7)),
42124213
TEGRA_WAKE_IRQ("pmu", 24, 209),
42134214
TEGRA_WAKE_GPIO("power", 29, 1, TEGRA234_AON_GPIO(EE, 4)),
42144215
TEGRA_WAKE_GPIO("mgbe", 56, 0, TEGRA234_MAIN_GPIO(Y, 3)),

0 commit comments

Comments
 (0)