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

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

5 files changed, 14 insertions, 43 deletions

diff --git a/display/panel-google-hk3.c b/display/panel-google-hk3.c
index 74748e0..5731c4e 100644
--- a/display/panel-google-hk3.c
+++ b/display/panel-google-hk3.c
@@ -919,12 +919,7 @@ static void hk3_update_refresh_mode(struct exynos_panel *ctx,
 	ctx->panel_idle_vrefresh = idle_vrefresh;
 	hk3_update_panel_feat(ctx, vrefresh, false);
 
-	/* TODO: (b/303738012) perform notifications asyncly for P24*/
-	/* Prevent sysfs_notify from resolution switch */
-	if (ctx->mode_in_progress == MODE_RES_AND_RR_IN_PROGRESS)
-		schedule_work(&ctx->state_notify);
-	else
-		backlight_state_changed(ctx->bl);
+	schedule_work(&ctx->state_notify);
 
 	dev_dbg(ctx->dev, "%s: display state is notified\n", __func__);
 }
@@ -1033,7 +1028,7 @@ static bool hk3_set_self_refresh(struct exynos_panel *ctx, bool enable)
 	if (pmode->exynos_mode.is_lp_mode) {
 		/* set 1Hz while self refresh is active, otherwise clear it */
 		ctx->panel_idle_vrefresh = enable ? 1 : 0;
-		backlight_state_changed(ctx->bl);
+		schedule_work(&ctx->state_notify);
 		return false;
 	}
 
@@ -2763,7 +2758,6 @@ const struct exynos_panel_desc google_hk3 = {
 	.num_binned_lp = ARRAY_SIZE(hk3_binned_lp),
 	.is_panel_idle_supported = true,
 	.no_lhbm_rr_constraints = true,
-	.use_async_notify = true,
 	.panel_func = &hk3_drm_funcs,
 	.exynos_panel_func = &hk3_exynos_funcs,
 	.lhbm_effective_delay_frames = 1,
diff --git a/dts/google/zuma-ripcurrent-bcl.dtsi b/dts/google/zuma-ripcurrent-bcl.dtsi
index 60b465d..d689a6f 100644
--- a/dts/google/zuma-ripcurrent-bcl.dtsi
+++ b/dts/google/zuma-ripcurrent-bcl.dtsi
@@ -91,8 +91,8 @@
 				};
 				freq_qos {
 					batoilo {
-						cpucl0 = <1704000>;
-						cpucl1 = <1945000>;
+						cpucl0 = <955000>;
+						cpucl1 = <1221000>;
 						cpucl2 = <1557000>;
 						gpu = <723000>;
 						tpu = <845000>;
diff --git a/dts/google/zuma-shusky-bcl.dtsi b/dts/google/zuma-shusky-bcl.dtsi
index e37cce7..f22d393 100644
--- a/dts/google/zuma-shusky-bcl.dtsi
+++ b/dts/google/zuma-shusky-bcl.dtsi
@@ -92,8 +92,8 @@
 				};
 				freq_qos {
 					batoilo {
-						cpucl0 = <1704000>;
-						cpucl1 = <1945000>;
+						cpucl0 = <955000>;
+						cpucl1 = <1221000>;
 						cpucl2 = <1557000>;
 						gpu = <723000>;
 						tpu = <845000>;
diff --git a/dts/google/zuma-shusky-pcie.dtsi b/dts/google/zuma-shusky-pcie.dtsi
index 9521135..38baec2 100644
--- a/dts/google/zuma-shusky-pcie.dtsi
+++ b/dts/google/zuma-shusky-pcie.dtsi
@@ -12,22 +12,5 @@
 
 &pcie_1 {
         support-msi64-addressing = "true";
-	use-cache-coherency = "true";
-	dma-coherent;
-	use-sysmmu = "true";
 };
 
-&sysmmu_hsi2 {
-	use-map-once = "false";
-	status = "okay";
-	num_pmmu = <1>;
-	pmmu0,default_stream = <STR_CFG(STR_SPTLB(0x00, 0x00), S2_EN, BL1, PREF_PRED, STLB_NONE, PTLB_NONE)>;
-	pmmu0,stream_property =
-		<1 STR_CFG(STR_SPTLB(0x00, 0x00), S2_EN, BL1, PREF_PRED, STLB_NONE, PTLB_NONE) DIR_RW STR_ID(0x00) STR_MASK(0x7B)>,
-		<2 STR_CFG(STR_SPTLB(0x00, 0x00), S2_EN, BL1, PREF_PRED, STLB_NONE, PTLB_NONE) DIR_RW STR_ID(0x09) STR_MASK(0x7B)>,
-		<3 STR_CFG(STR_SPTLB(0x00, 0x00), S2_EN, BL1, PREF_PRED, STLB_NONE, PTLB_NONE) DIR_RW STR_ID(0x01) STR_MASK(0x7B)>,
-		<4 STR_CFG(STR_SPTLB(0x00, 0x00), S2_EN, BL1, PREF_PRED, STLB_NONE, PTLB_NONE) DIR_RW STR_ID(0x02) STR_MASK(0x03)>,
-		<5 STR_CFG(STR_SPTLB(0x00, 0x00), S2_EN, BL1, PREF_PRED, STLB_NONE, PTLB_NONE) DIR_RW STR_ID(0x03) STR_MASK(0x03)>;
-};
-
-
diff --git a/dts/google/zuma-shusky-usb.dtsi b/dts/google/zuma-shusky-usb.dtsi
index 1b2710c..d5263ca 100644
--- a/dts/google/zuma-shusky-usb.dtsi
+++ b/dts/google/zuma-shusky-usb.dtsi
@@ -19,17 +19,12 @@
 };
 
 &pinctrl_12 {
-	eusb_power_off: eusb_power_off {
+	eusb_init_state: eusb_init_state {
 		samsung,pins = "gpp21-3";
-		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
-		samsung,pin-pud = <EXYNOS_PIN_PULL_DOWN>;
-		samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_DOWN>;
-	};
-
-	eusb_power_on: eusb_power_on {
-		samsung,pins = "gpp21-3";
-		samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
-		samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
+		samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
+		samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+		samsung,pin-con-pdn = <EXYNOS_PIN_PDN_PREV>;
+		samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_NONE>;
 	};
 };
 
@@ -87,10 +82,9 @@
 		compatible = "samsung,eusb-repeater";
 		reg = <0x3E>;
 		status = "okay";
-		pinctrl-names = "power_off", "power_on";
-		pinctrl-0 = <&eusb_power_off>;
-		pinctrl-1 = <&eusb_power_on>;
-		eusb,gpio_eusb_resetb = <&gpp21 3 GPIO_ACTIVE_LOW>;
+		pinctrl-names = "init_state";
+		pinctrl-0 = <&eusb_init_state>;
 		repeater_tune_param = <&eusb_repeater_tune>;
+		vdd33-supply = <&m_ldo19_reg>;
        };
 };