diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-03-26 19:11:24 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-03-26 19:11:24 -0700 |
| commit | 07289fb2d586ead7185b02d624d5222bdd807eaf (patch) | |
| tree | 7f5d362d1050390feb03700c36d25877a77704b5 | |
| parent | a037c2237428bacf0fb3380c2172fe690dd92946 (diff) | |
| parent | 6b4f05650d93bafba2ac51255dd3fc7a8505cb00 (diff) | |
| download | felix-07289fb2d586ead7185b02d624d5222bdd807eaf.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
SBMerger: 516612970
Change-Id: I1a6576f5488b68629a563923210f7a2439f816ec
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | display/panel-samsung-ana6707-f10.c | 9 | ||||
| -rw-r--r-- | dts/gs201-felix-battery.dtsi | 2 | ||||
| -rw-r--r-- | dts/gs201-felix-wcharger.dtsi | 10 |
3 files changed, 13 insertions, 8 deletions
diff --git a/display/panel-samsung-ana6707-f10.c b/display/panel-samsung-ana6707-f10.c index b32fbb1..c7456f1 100644 --- a/display/panel-samsung-ana6707-f10.c +++ b/display/panel-samsung-ana6707-f10.c @@ -584,14 +584,11 @@ static void ana6707_f10_change_frequency(struct exynos_panel *ctx, static void ana6707_f10_set_nolp_mode(struct exynos_panel *ctx, const struct exynos_panel_mode *pmode) { - unsigned int vrefresh = drm_mode_vrefresh(&pmode->mode); - u32 delay_us = mult_frac(1000, 1020, vrefresh); - if (!ctx->enabled) return; EXYNOS_DCS_WRITE_TABLE(ctx, display_off); - usleep_range(delay_us, delay_us + 10); + usleep_range(34000, 34010); EXYNOS_DCS_WRITE_TABLE(ctx, unlock_cmd_f0); if (ctx->panel_rev == PANEL_REV_PROTO1) { @@ -606,7 +603,7 @@ static void ana6707_f10_set_nolp_mode(struct exynos_panel *ctx, EXYNOS_DCS_WRITE_TABLE(ctx, update_key); EXYNOS_DCS_WRITE_TABLE(ctx, lock_cmd_f0); ana6707_f10_change_frequency(ctx, pmode, true); - usleep_range(delay_us, delay_us + 10); + usleep_range(34000, 34010); EXYNOS_DCS_WRITE_TABLE(ctx, display_on); dev_info(ctx->dev, "exit LP mode\n"); @@ -1022,7 +1019,7 @@ static int ana6707_f10_set_power(struct exynos_panel *ctx, bool enable) dev_err(ctx->dev, "vci enable failed\n"); return ret; } - usleep_range(10000, 10010); + usleep_range(20000, 20010); } } else { gpiod_set_value(ctx->reset_gpio, 0); diff --git a/dts/gs201-felix-battery.dtsi b/dts/gs201-felix-battery.dtsi index c8b6697..d807270 100644 --- a/dts/gs201-felix-battery.dtsi +++ b/dts/gs201-felix-battery.dtsi @@ -50,6 +50,8 @@ google,ttf-soc-table = <49 71 88 91 93 100>; google,ttf-elap-table = <41 55 79 106 147 178>; google,ttf-tier-table = <0 50 74>; + + google,fan-bt-limits = <280 290 300 320>; }; google_dual_batt_gauge: google,dual_batt_gauge { diff --git a/dts/gs201-felix-wcharger.dtsi b/dts/gs201-felix-wcharger.dtsi index a95f186..af68424 100644 --- a/dts/gs201-felix-wcharger.dtsi +++ b/dts/gs201-felix-wcharger.dtsi @@ -54,7 +54,7 @@ google,power_mitigate_threshold = <90>; google,has-sw-ramp; - google,epp_dcicl_default_ma = <1000000>; + google,epp_dcicl_default_ma = <750000>; pinctrl-names = "default"; pinctrl-0 = <&wc_irq &wc_en>; @@ -75,10 +75,16 @@ fod_epp_comp = [99 7f 99 7f 95 7e 98 6c 95 72 97 69 01 01 FF 19]; google,fod_fsw_base; google,fod_fsw_high_thres = <141>; - google,fod_fsw_low_thres = <137>; + google,fod_fsw_low_thres = <140>; google,light_load; /* Calibration light load */ google,ll-bpp-vout-not-set; + google,alignment_scalar_low_current = <200>; + google,alignment_scalar_high_current = <100>; + google,alignment_offset_low_current = <129000>; + google,alignment_offset_high_current = <139000>; + google,alignment_current_threshold = <500>; + p9xxx_gpio: p9xxx_gpio { gpio-controller; #gpio-cells = <2>; |