diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-02-19 18:47:47 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-02-19 18:47:47 -0800 |
| commit | 28b015242f8546665fe7b19ce246c98adf00cdfe (patch) | |
| tree | 012e268687e33fbe20a07661f6e6bf60850d9d24 | |
| parent | f40f893b8e1ee22aab938e8477e8271666174f37 (diff) | |
| parent | dda6f2add6b441ceee9835f4d2bd03f027bba218 (diff) | |
| download | lynx-28b015242f8546665fe7b19ce246c98adf00cdfe.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
SBMerger: 478053055
Change-Id: I844bc620c474f3ade37eaf626f41d1c7255628c3
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | dts/gs201-lynx-battery.dtsi | 16 | ||||
| -rw-r--r-- | dts/gs201-lynx-camera.dtsi | 11 |
2 files changed, 26 insertions, 1 deletions
diff --git a/dts/gs201-lynx-battery.dtsi b/dts/gs201-lynx-battery.dtsi index 86702d6..42813a0 100644 --- a/dts/gs201-lynx-battery.dtsi +++ b/dts/gs201-lynx-battery.dtsi @@ -14,6 +14,22 @@ google,ttf-soc-table = <55 63 77 87 89 92 96 100>; google,ttf-elap-table = <40 46 54 73 84 104 150 213>; google,ttf-tier-table = <0 65 80>; + + google,temp-filter-enable; + + google,aacr-disable; + + google,batt-id-2-cos { + google,batt-id = <2>; + google,aacr-ref-cycles = <100 200 300 400 500 600 700 800>; + google,aacr-ref-fade10 = < 2 14 25 34 43 51 59 67>; + }; + + google,batt-id-3-lsn { + google,batt-id = <3>; + google,aacr-ref-cycles = <300 400 500 600 700 800>; + google,aacr-ref-fade10 = < 6 16 25 34 46 53>; + }; }; &max77759_fg { diff --git a/dts/gs201-lynx-camera.dtsi b/dts/gs201-lynx-camera.dtsi index a0bd83b..0da2443 100644 --- a/dts/gs201-lynx-camera.dtsi +++ b/dts/gs201-lynx-camera.dtsi @@ -100,6 +100,15 @@ samsung,pin-drv = <GS101_PIN_DRV_2_5_MA>; }; + /* GPP8[2] Flashlight Enable */ + flash_en: flash-en { + samsung,pins = "gpp8-2"; + 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>; + }; + sensor_mclk1_out: sensor-mclk1-out { samsung,pin-drv = <GS101_PIN_DRV_5_MA>; }; @@ -184,7 +193,7 @@ clock-frequency = <400000>; pinctrl-names = "default","on_i2c","off_i2c"; - pinctrl-0 = <&hsi2c15_bus>; + pinctrl-0 = <&hsi2c15_bus &flash_en>; pinctrl-1 = <&hsi2c15_bus>; pinctrl-2 = <&hsi2c15_bus>; }; |