Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15

SBMerger: 571992243
Change-Id: I445e203e5b4a53d1d1f9117dacf23b8bc801f289
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

6 files changed, 20 insertions, 8 deletions

diff --git a/display/panel-google-bigsurf.c b/display/panel-google-bigsurf.c
index 1aa3808..0ded27d 100644
--- a/display/panel-google-bigsurf.c
+++ b/display/panel-google-bigsurf.c
@@ -69,8 +69,11 @@ static const u8 bigsurf_lhbm_brightness_reg = 0xD0;
 struct bigsurf_panel {
 	/** @base: base panel struct */
 	struct exynos_panel base;
+	/** @lhbm_ctl: LHBM control parameters */
 	struct bigsurf_lhbm_ctl lhbm_ctl;
+	/** @idle_exit_dimming_delay_ts: the delay time to exit dimming */
 	ktime_t idle_exit_dimming_delay_ts;
+	/** @panel_brightness: the brightness of the panel */
 	u16 panel_brightness;
 };
 
@@ -85,7 +88,7 @@ static const struct exynos_dsi_cmd bigsurf_lp_cmds[] = {
 	EXYNOS_DSI_CMD_SEQ(0x53, 0x20),
 	/* enter AOD */
 	EXYNOS_DSI_CMD_SEQ(MIPI_DCS_ENTER_IDLE_MODE),
-	EXYNOS_DSI_CMD_SEQ(0x5A, 0x00),
+	EXYNOS_DSI_CMD_SEQ(0x5A, 0x04),
 };
 static DEFINE_EXYNOS_CMD_SET(bigsurf_lp);
 
diff --git a/display/panel-google-hk3.c b/display/panel-google-hk3.c
index 66c296d..74748e0 100644
--- a/display/panel-google-hk3.c
+++ b/display/panel-google-hk3.c
@@ -103,13 +103,17 @@ struct hk3_lhbm_ctl {
 	bool hist_roi_configured;
 };
 
+#define HK3_VREG_STR_SIZE 11
+#define HK3_VREG_PARAM_NUM 5
+
 /**
+ * HK3_VREG_STR
+ * @ctx: exynos_panel struct
+ *
  * Expect to have five values for the Vreg parameters:
  * EVT1.1 and earlier: 0x1B
  * DVT1 and later: 0x1A
  */
-#define HK3_VREG_STR_SIZE 11
-#define HK3_VREG_PARAM_NUM 5
 #define HK3_VREG_STR(ctx) (((ctx)->panel_rev >= PANEL_REV_DVT1) ? "1a1a1a1a1a" : "1b1b1b1b1b")
 
 /**
@@ -155,8 +159,9 @@ struct hk3_panel {
 	struct thermal_zone_device *tz;
 	/** @hw_temp: the temperature applied into panel */
 	u32 hw_temp;
-	/** @pending_temp_update: whether there is pending temperature update. It will be
-	 *			  handled in the commit_done function.
+	/**
+	 * @pending_temp_update: whether there is pending temperature update. It will be
+	 *                       handled in the commit_done function.
 	 */
 	bool pending_temp_update;
 	/**
@@ -1419,6 +1424,7 @@ static void hk3_wait_for_vsync_done(struct exynos_panel *ctx, u32 vrefresh, bool
  * fake TE at transition from fixed TE to changeable TE.
  * @ctx: panel struct
  * @vrefresh: current refresh rate
+ * @is_ns: whether it is normal speed or not
  */
 static void hk3_wait_for_vsync_done_changeable(struct exynos_panel *ctx, u32 vrefresh, bool is_ns)
 {
diff --git a/display/panel-google-shoreline.c b/display/panel-google-shoreline.c
index cc1dcee..9b1fb9a 100644
--- a/display/panel-google-shoreline.c
+++ b/display/panel-google-shoreline.c
@@ -399,6 +399,9 @@ static void shoreline_update_te(struct exynos_panel *ctx, const unsigned int vre
 }
 
 /**
+ * shoreline_update_te2 - update the TE2 for shoreline panels
+ * @ctx: panel struct
+ *
  * Current definition of the B9h command parameter:
  *
  * TE2 rising at 120Hz:
diff --git a/dts/google/zuma-ripcurrent-bcl.dtsi b/dts/google/zuma-ripcurrent-bcl.dtsi
index a110b53..60b465d 100644
--- a/dts/google/zuma-ripcurrent-bcl.dtsi
+++ b/dts/google/zuma-ripcurrent-bcl.dtsi
@@ -93,7 +93,7 @@
 					batoilo {
 						cpucl0 = <1704000>;
 						cpucl1 = <1945000>;
-						cpucl2 = <2294000>;
+						cpucl2 = <1557000>;
 						gpu = <723000>;
 						tpu = <845000>;
 					};
diff --git a/dts/google/zuma-shusky-bcl.dtsi b/dts/google/zuma-shusky-bcl.dtsi
index fbe093c..e37cce7 100644
--- a/dts/google/zuma-shusky-bcl.dtsi
+++ b/dts/google/zuma-shusky-bcl.dtsi
@@ -94,7 +94,7 @@
 					batoilo {
 						cpucl0 = <1704000>;
 						cpucl1 = <1945000>;
-						cpucl2 = <2294000>;
+						cpucl2 = <1557000>;
 						gpu = <723000>;
 						tpu = <845000>;
 					};
diff --git a/dts/google/zuma-shusky-wcharger.dtsi b/dts/google/zuma-shusky-wcharger.dtsi
index 6356acd..fd44b87 100644
--- a/dts/google/zuma-shusky-wcharger.dtsi
+++ b/dts/google/zuma-shusky-wcharger.dtsi
@@ -41,7 +41,7 @@
 		samsung,pins = "gph1-4"; /* QI_EN_L */
 		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
 		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
-		samsung,pin-con-pdn = <EXYNOS_PIN_PDN_OUT0>;
+		samsung,pin-con-pdn = <EXYNOS_PIN_PDN_PREV>;
 		samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_NONE>;
 	};
 };