From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 22 Jan 2023 11:55:13 +0000 (+0100)
Subject: Merge 6.2-rc5 into tty-next
X-Git-Tag: v6.6.17~5456^2~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a6aa989f2e844a22cfab5c8ff30e77d17dabb2f;p=platform%2Fkernel%2Flinux-rpi.git

Merge 6.2-rc5 into tty-next

We need the serial/tty changes into this branch as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

7a6aa989f2e844a22cfab5c8ff30e77d17dabb2f
diff --cc drivers/tty/serial/qcom_geni_serial.c
index c1aea9d,57f04f8..d98e0a8
--- a/drivers/tty/serial/qcom_geni_serial.c
+++ b/drivers/tty/serial/qcom_geni_serial.c
@@@ -1758,21 -1594,13 +1772,23 @@@ static int qcom_geni_serial_sys_hib_res
  	return ret;
  }
  
 +static const struct qcom_geni_device_data qcom_geni_console_data = {
 +	.console = true,
 +	.mode = GENI_SE_FIFO,
 +};
 +
 +static const struct qcom_geni_device_data qcom_geni_uart_data = {
 +	.console = false,
 +	.mode = GENI_SE_DMA,
 +};
 +
  static const struct dev_pm_ops qcom_geni_serial_pm_ops = {
- 	SET_SYSTEM_SLEEP_PM_OPS(qcom_geni_serial_sys_suspend,
- 					qcom_geni_serial_sys_resume)
- 	.restore = qcom_geni_serial_sys_hib_resume,
- 	.thaw = qcom_geni_serial_sys_hib_resume,
+ 	.suspend = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+ 	.resume = pm_sleep_ptr(qcom_geni_serial_sys_resume),
+ 	.freeze = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+ 	.poweroff = pm_sleep_ptr(qcom_geni_serial_sys_suspend),
+ 	.restore = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
+ 	.thaw = pm_sleep_ptr(qcom_geni_serial_sys_hib_resume),
  };
  
  static const struct of_device_id qcom_geni_serial_match_table[] = {