diff options
| author | Lucas Wei <lucaswei@google.com> | 2022-09-30 15:14:14 +0800 |
|---|---|---|
| committer | Lucas Wei <lucaswei@google.com> | 2022-09-30 15:14:41 +0800 |
| commit | 2c6e590aed21fa9c40944c0f4c5960e8410f7839 (patch) | |
| tree | bbcc1157c274b84806a2abc9a0b882272f137053 | |
| parent | 62916a2e33f046a1230687540e0bfb25ded446b7 (diff) | |
| parent | 6d25d2970c5d2e8b02223b9b9f527146c6f2f47c (diff) | |
| download | reset-2c6e590aed21fa9c40944c0f4c5960e8410f7839.tar.gz | |
Merge android13-gs-pixel-5.10-gs101-tm-qpr2 into android13-gs-pixel-5.10-tm-qpr2android-t-qpr2-beta-2_r0.5android-t-qpr2-beta-2_r0.4android-t-qpr2-beta-2_r0.3android-t-qpr2-beta-1_r0.6android-t-qpr2-beta-1_r0.5android-t-qpr2-beta-1_r0.4android-gs-raviole-5.10-t-qpr2-beta-1android-gs-pantah-5.10-t-qpr2-beta-1android-gs-bluejay-5.10-t-qpr2-beta-1
Restore `exynos-gs201-reboot.c` to snapshot of
android13-gs-pixel-5.10-tm-qpr2.
Commit 68312cf ("power: reset: Move power key checking to TF-A") conflict to
commit 9ab2375 ("power: reset: power key detection only when power off"). We need
to restore to avoid build breakage.
Bug: 238399460
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I0839d713c4713d61e7addff7f3a4adb864faed6c
0 files changed, 0 insertions, 0 deletions