commit 56c790ef1718784c9d5357f4395a0c5c9a4cd7ff
author Will McVicker <willmcvicker@google.com> Fri Nov 03 16:23:43 2023 -0700
committer Will McVicker <willmcvicker@google.com> Fri Nov 03 16:23:43 2023 -0700
tree 0f09f54948c4ec2af182a5558feb75317c21c456
parent 9d017f9eea57c0b345d1e6abfee95261a662ef14
parent 9b4bb088cf8f02bcebece637f0a1a6c33f3db29d

Merge aosp/android-gs-raviole-5.10-android14 into android-gs-raviole-mainline

* aosp/android-gs-raviole-5.10-android14:
  power: reset: gs101: use PMU_INFORM2 for dump_gpr_mode
  power: reset: align all thermal shutdown scenario
  power: reset: align all thermal shutdown scenario
  power: reset: align all thermal shutdown scenario
  power: reset: determine reset type by reboot_mode
  power: reset: determine reset type by reboot_mode
  power: reset: power key detection only when power off
  power: reset: force warm_reset for thermal shutdown

Change-Id: I5289a6128329ba024f2ada253112d6b030908a27
Signed-off-by: Will McVicker <willmcvicker@google.com>