diff --git a/qcom/Makefile b/qcom/Makefile index 303a87bf2203..a57e25a7f94b 100644 --- a/qcom/Makefile +++ b/qcom/Makefile @@ -76,13 +76,9 @@ holi-cypfq-dvt2-overlay.dtbo-base := holi-moto-base.dtb holi-cypfq-pvt-overlay.dtbo-base := holi-moto-base.dtb dtbo-$(CONFIG_RHODEC_DTB) += \ - holi-rhodec-dvt1-overlay.dtbo \ - holi-rhodec-dvt2-overlay.dtbo \ - holi-rhodec-pvt-overlay.dtbo + holi-rhodec-evb-overlay.dtbo -holi-rhodec-dvt1-overlay.dtbo-base := holi-moto-base.dtb -holi-rhodec-dvt2-overlay.dtbo-base := holi-moto-base.dtb -holi-rhodec-pvt-overlay.dtbo-base := holi-moto-base.dtb +holi-rhodec-evb-overlay.dtbo-base := holi-moto-base.dtb dtbo-$(CONFIG_CYPFR_DTB) += \ blair-cypfr-evb-overlay.dtbo \ diff --git a/qcom/discrete_charging_holi.dtsi b/qcom/discrete_charging_holi.dtsi new file mode 100644 index 000000000000..f099ceeff5ec --- /dev/null +++ b/qcom/discrete_charging_holi.dtsi @@ -0,0 +1,189 @@ +/* Copyright (c) 2021, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + + +&pm6125_vadc { + gpio6_div3{ + reg = ; + label = "gpio3_div3"; + qcom,pre-scaling = <1 3>; + }; +}; + +&pm6125_gpios { + gpio6_adc{ + gpio6_adc_default:gpio6_adc_default{ + pins = "gpio6"; + function = "normal"; + bias-high-impedance; + }; + }; + + indicator_led { + indicator_led_default: indicator_led_default { + pins = "gpio8"; + function = "func1"; + output-low; + }; + }; +}; + +&soc { + indicator_led { + compatible = "qcom,indicator-pwm-led"; + pinctrl-names = "default"; + pinctrl-0 = <&indicator_led_default>; + indicator_led { + label = "charging"; + led-sources = <0>; + pwms = <&pm6125_pwm 0 1000000>; + linux,default-trigger = "timer"; + }; + }; +}; + +&spmi_bus { + qcom,pm6125@1 { + #address-cells = <1>; + qcom,pwms@b300 { + status = "ok"; + }; + }; +}; + +&qupv3_se8_i2c { + status = "okay"; + + sgm4154x: sgm4154x@3B { + status = "okay"; + compatible = "sgm,sgm41542"; + reg = <0x3B>; + + pinctrl-names = "default"; + pinctrl-0 = <&gpio6_adc_default>; + io-channels = <&pm6125_vadc ADC5_GPIO3_DIV3>; + io-channel-names = "gpio3_div3"; + + interrupt-parent = <&tlmm>; + interrupts = <12 0>; //irq num base on hardware design + sgm,irq-gpio = <&tlmm 12 0>; //irq num base on hardware design + sgm,chg-en-gpio = <&tlmm 92 0>; //gpio num base on hardware design 1.MTK parent node name is pio 2.QUALCOMM parent node name is tlmm or other + + dpdm-supply = <&qusb_phy0>; + mmi,qc3-support; + + /* sw jeita parameter customer defined*/ + enable_sw_jeita; + jeita_temp_above_t4_cv = <0>; + jeita_temp_t3_to_t4_cv = <4100000>; + jeita_temp_t2_to_t3_cv = <4350000>; + jeita_temp_t1_to_t2_cv = <4350000>; + jeita_temp_t0_to_t1_cv = <0>; + jeita_temp_below_t0_cv = <0>; + + jeita_temp_above_t4_cc_current = <0>; + jeita_temp_t3_to_t4_cc_current = <1000000>; + jeita_temp_t2_to_t3_cc_current = <1250000>; + jeita_temp_t1_to_t2_cc_current = <1000000>; + jeita_temp_below_t0_cc_current = <0>; + + temp_t4_thres = <50>; + temp_t4_thres_minus_x_degree = <48>; + temp_t3_thres = <45>; + temp_t3_thres_minus_x_degree = <45>; + temp_t2_thres = <20>; + temp_t2_thres_plus_x_degree = <15>; + temp_t1_thres = <0>; + temp_t1_thres_plus_x_degree = <0>; + temp_t0_thres = <0>; + temp_t0_thres_plus_x_degree = <2>; + temp_neg_10_thres = <0>; + }; + + bq25890@6A { + status = "okay"; + compatible = "ti,bq2589x-1"; + reg = <0x6A>; + + pinctrl-names = "default"; + pinctrl-0 = <&bq2589x_irq>; + bq2589x_irq-gpio = <&tlmm 12 0>; + bq2589x_en-gpio = <&tlmm 92 0>; + dpdm-supply = <&qusb_phy0>; + + ti,bq2589x,vbus-volt-high-level = <8700>;/* tune adapter to output 9v */ + ti,bq2589x,vbus-volt-low-level = <4400>;/* tune adapter to output 5v */ + ti,bq2589x,vbat-min-volt-to-tuneup = <3000>; + ti,bq2589x,charge-voltage = <4350>; + ti,bq2589x,charge-current = <3250>; + ti,bq2589x,term-current = <256>; + ti,bq2589x,enable-auto-dpdm; + ti,bq2589x,enable-termination; + ti,bq2589x,enable-ico; + ti,bq2589x,use-absolute-vindpm; + }; +}; + +&tlmm { + bq2589x_irq: bq2589x_irq { + mux { + pins = "gpio12"; + function = "gpio"; + }; + + config { + pins = "gpio12"; + drive-strength = <2>; + bias-disable; + input-enable; + }; + }; +}; + +&soc { + mmi_charger: mmi,charger { + status = "ok"; + compatible = "mmi,mmi-charger"; + mmi,enable-charging-limit; + mmi,upper-limit-capacity = <65>; + mmi,lower-limit-capacity = <60>; + mmi,heartbeat-interval = <100000>; + mmi,dcp-power-max = <10000>; + mmi,hvdcp-power-max = <15000>; + }; + + mmi_discrete_charger: mmi,discrete-charging { + status = "ok"; + compatible = "mmi,mmi-discrete-charger"; + #io-channel-cells = <1>; + battery-names = "battery"; + supplied-from = "mmi_battery"; + + mmi,chrg-iterm-ma = <243>; + mmi,fg-iterm-ma = <500>; + mmi,max-fv-mv = <4450>; + mmi,max-fcc-ma = <4000>; + mmi,demo-fv-mv = <4000>; + mmi,df-serialnum = "SB18D33989"; + mmi,mmi-temp-zones = <0 4200 970 0>, + <10 4200 2500 970>, + <15 0 2500 2500>, + <45 0 4000 4000>, + <60 4200 2500 0>; + mmi,thermal-mitigation = <4000000 3500000 + 3000000 2500000 + 2000000 1500000 + 1200000 900000 + 600000 300000>; + }; +}; + diff --git a/qcom/holi-nopmi-moto-common-overlay.dtsi b/qcom/holi-nopmi-moto-common-overlay.dtsi new file mode 100644 index 000000000000..93a78b39d082 --- /dev/null +++ b/qcom/holi-nopmi-moto-common-overlay.dtsi @@ -0,0 +1,103 @@ +/* Copyright (c) 2020, The Linux Foundation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#include "holi-pm6125-overlay.dtsi" +#include "holi-regulators-pm6125.dtsi" +#include "carrier-channel-ids.dtsi" +#include + +&utags { + compatible = "mmi,utags"; + mmi,main-utags = "/dev/block/bootdevice/by-name/utags"; + mmi,backup-utags = "/dev/block/bootdevice/by-name/utagsBackup"; +}; + +&hw { + compatible = "mmi,utags"; + mmi,dir-name = "hw"; + mmi,main-utags = "/dev/block/bootdevice/by-name/hw"; +}; + +&reserved_memory { + ramoops_mem { + compatible = "ramoops"; + no-map; + reg = <0x0 RAMOOPS_BASE_ADDR 0x0 RAMOOPS_SIZE>; + console-size = ; + pmsg-size = ; + record-size = ; + no-dump-oops; + }; + + wdog_cpuctx_mem: wdog_cpuctx_region { + no-map; + reg = <0x0 WDOG_CPUCTX_BASE + 0x0 WDOG_CPUCTX_SIZE>; + }; + + tzlog_dump_mem: tzlog_dump_mem_region { + no-map; + reg = <0x0 TZLOG_BCK_BASE + 0x0 TZLOG_BCK_SIZE>; + }; + + mmi_annotate_mem: mmi_annotate_mem_region { + no-map; + reg = <0x0 MMI_ANNOTATE_BASE + 0x0 MMI_ANNOTATE_SIZE>; + }; +}; + +&soc { + mmi_annotate { + compatible = "mmi,annotate"; + memory-region = <&mmi_annotate_mem>; + mem-size = <0x20000>; + }; +}; + +&tlmm { + sar_int_default: sar_int_default { + mux { + pins = "gpio24"; + function = "gpio"; + }; + config { + pins = "gpio24"; + num-grp-pins = <1>; + drive-strength = <2>; + bias-pull-up; + }; + }; + + sar_int_sleep: sar_int_sleep { + mux { + pins = "gpio24"; + function = "gpio"; + }; + config { + pins = "gpio24"; + num-grp-pins = <1>; + drive-strength = <2>; + bias-pull-up; + }; + }; +}; + +&ufshc_mem { + spm-level = <3>; +}; + +&qupv3_se8_i2c_sleep { + config { + input-enable; + }; +}; diff --git a/qcom/holi-rhodec-common-overlay.dtsi b/qcom/holi-rhodec-common-overlay.dtsi index c751b15a307b..a124a9f0af5f 100644 --- a/qcom/holi-rhodec-common-overlay.dtsi +++ b/qcom/holi-rhodec-common-overlay.dtsi @@ -9,7 +9,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include "holi-pm6125-moto-common-overlay.dtsi" +#include "holi-nopmi-moto-common-overlay.dtsi" #include "holi-audio-wcd9370-aw882xx-acf-overlay.dtsi" #include @@ -18,14 +18,12 @@ #include "holi-pmic-overlay-pm6125.dtsi" #include "holi-thermal-overlay-pm6125.dtsi" #include "display/holi-sde-display-mtp-pm6125.dtsi" -#include "camera/holi-camera-sensor-mot-rhodec-overlay.dtsi" #include "rhodec-display.dtsi" #include "rhodec-touchscreen.dtsi" #include "rhodec-fmr-overlay.dtsi" - -&smb1394 { - status = "disabled"; -}; +#include "tcpc_config.dtsi" +#include "sgm7220.dtsi" +#include "discrete_charging_holi.dtsi" &wcd937x_codec { cdc-vdd-rxtx-supply = <&L9A>; @@ -107,19 +105,6 @@ }; &tlmm { - google_key_default: google_key_default { - mux { - pins = "gpio11"; - function = "gpio"; - }; - - config { - pins = "gpio11"; - drive-strength = <2>; - bias-pull-up; - }; - }; - cam_pmic_en_default: cam_pmic_en_default { mux { pins = "gpio38"; @@ -250,65 +235,7 @@ }; }; -&qupv3_se10_i2c { - status = "ok"; - cam_pmic: wl2864c@29{ - compatible = "semi,wl2864c"; - reg = <0x29>; - - semi,cs-gpios = <&tlmm 38 0>; - - pinctrl-names = "default"; - pinctrl-0 = <&cam_pmic_en_default>; - - vin1-supply = <&S6A>; - - regulators { - cam_ldo1: ldo1 { - regulator-name = "ldo1"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1800000>; - }; - - cam_ldo2: ldo2 { - regulator-name = "ldo2"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <1800000>; - }; - - cam_ldo3: ldo3 { - regulator-name = "ldo3"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_ldo4: ldo4 { - regulator-name = "ldo4"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_ldo5: ldo5 { - regulator-name = "ldo5"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_ldo6: ldo6 { - regulator-name = "ldo6"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - - cam_ldo7: ldo7 { - regulator-name = "ldo7"; - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <4300000>; - }; - }; - }; -}; &pm8008_8 { status = "disabled"; @@ -324,7 +251,7 @@ label = "gpio-keys"; pinctrl-names = "default"; - pinctrl-0 = <&key_vol_up_default &google_key_default>; + pinctrl-0 = <&key_vol_up_default>; vol_up { label = "volume_up"; @@ -335,16 +262,6 @@ debounce-interval = <15>; linux,can-disable; }; - - google_key { - label = "google_key"; - gpios = <&tlmm 11 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; - linux,code = ; - gpio-key,wakeup; - debounce-interval = <15>; - linux,can-disable; - }; }; }; @@ -362,13 +279,6 @@ }; }; -&pm7250b_vib { - qcom,vib-ldo-volt-uv = <3000000>; - qcom,vib-dis-short-long; - qcom,vib-dis-short-long-val = <70>; - qcom,vib-ldo-volt-uv-long = <2600000>; -}; - &mot_batterydata { df-serialnum = "SB18C77591"; qcom,batt-id-range-pct = <15>; @@ -376,14 +286,6 @@ #include "qg-batterydata-jk50-scud-5000mah.dtsi" }; -&pm7250b_mmi { - qcom,mmi-temp-zones = <0 4200 1000 0>, - <15 0 1000 1000>, - <45 0 3000 3000>, - <60 4200 2500 0>; - qcom,iterm-ma = <150>; -}; - &thermal_zones { sdm-skin-therm-usr { status = "disabled"; @@ -406,20 +308,6 @@ xo-therm-usr { status = "disabled"; }; - chg_therm { - polling-delay-passive = <0>; - polling-delay = <0>; - thermal-governor = "user_space"; - thermal-sensors = <&pm7250b_adc_tm ADC5_AMUX_THM1_100K_PU>; - wake-capable-sensor; - trips { - active-config0 { - temperature = <125000>; - hysteresis = <1000>; - type = "passive"; - }; - }; - }; pa_therm1 { polling-delay-passive = <0>; @@ -527,20 +415,6 @@ }; }; -&pm7250b_charger { - qcom,otg-cl-ua = <1500000>; - qcom,dcp-curr-max = <2000000>; - qcom,fcc-max-ua = <2900000>; - qcom,fv-max-uv = <4400000>; - qcom,thermal-mitigation = <2900000 2600000 - 2000000 1500000 - 1200000 900000 - 600000 300000>; -}; - -&pm7250b_qg { - qcom,qg-iterm-ma = <500>; -}; &pm6125_gpios { indicator_led { diff --git a/qcom/holi-rhodec-dvt2-overlay.dts b/qcom/holi-rhodec-dvt2-overlay.dts deleted file mode 100644 index 2475e2b87a76..000000000000 --- a/qcom/holi-rhodec-dvt2-overlay.dts +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2021, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/dts-v1/; -/plugin/; - -#include "holi-rhodec-common-overlay.dtsi" - -/ { - model = "rhodec"; - compatible = "qcom,holi-rhodec", "qcom,holi-moto", "qcom,holi"; - qcom,msm-id = <454 0x10000>, <472 0x10000>; - qcom,board-id = <0x47 0xB200>; -}; - diff --git a/qcom/holi-rhodec-dvt1-overlay.dts b/qcom/holi-rhodec-evb-overlay.dts similarity index 95% rename from qcom/holi-rhodec-dvt1-overlay.dts rename to qcom/holi-rhodec-evb-overlay.dts index dfa9ebc54d84..cf0cc46f16ae 100644 --- a/qcom/holi-rhodec-dvt1-overlay.dts +++ b/qcom/holi-rhodec-evb-overlay.dts @@ -19,6 +19,6 @@ model = "rhodec"; compatible = "qcom,holi-rhodec", "qcom,holi-moto", "qcom,holi"; qcom,msm-id = <454 0x10000>, <472 0x10000>; - qcom,board-id = <0x47 0xB100>; + qcom,board-id = <0x47 0x9000>; }; diff --git a/qcom/holi-rhodec-pvt-overlay.dts b/qcom/holi-rhodec-pvt-overlay.dts deleted file mode 100644 index 438898fee2d4..000000000000 --- a/qcom/holi-rhodec-pvt-overlay.dts +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright (c) 2021, The Linux Foundation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 and - * only version 2 as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -/dts-v1/; -/plugin/; - -#include "holi-rhodec-common-overlay.dtsi" - -/ { - model = "rhodec"; - compatible = "qcom,holi-rhodec", "qcom,holi-moto", "qcom,holi"; - qcom,msm-id = <454 0x10000>, <472 0x10000>; - qcom,board-id = <0x47 0xC000>, <0x48 0xC000>; -}; -