diff --git a/qcom/holi-cypfq-common-overlay.dtsi b/qcom/holi-cypfq-common-overlay.dtsi index 48fcfd8c6f89..5b28c56c0170 100644 --- a/qcom/holi-cypfq-common-overlay.dtsi +++ b/qcom/holi-cypfq-common-overlay.dtsi @@ -18,14 +18,13 @@ #include "holi-pmic-overlay-pm6125.dtsi" #include "holi-thermal-overlay-pm6125.dtsi" #include "display/holi-sde-display-mtp-pm6125.dtsi" -#include #include "camera/holi-camera-pm6125-overlay.dtsi" #include "cypfq-display.dtsi" #include "cypfg-touchscreen.dtsi" &wcd937x_codec { cdc-vdd-rxtx-supply = <&L9A>; - cdc-vddio-supply = <&L9A>; + cdc-vddpx-supply = <&L9A>; qcom,cdc-static-supplies = "cdc-vdd-rxtx", "cdc-vddpx"; /* @@ -239,11 +238,11 @@ }; }; - mtp_batterydata: qcom,battery-data { - qcom,batt-id-range-pct = <15>; - #include "qg-batterydata-alium-3600mah.dtsi" - #include "qg-batterydata-atl466271_3300mAh.dtsi" - #include "qg-batterydata-atl436186020H_3780mAh.dtsi" + cx_ipeak_lm: cx_ipeak@3ed000 { + #size-cells = <1>; + compatible = "qcom,cx-ipeak-v2"; + reg = <0x3ed000 0xe010>; + status = "ok"; }; }; @@ -261,228 +260,10 @@ }; }; -&pm7250b_charger { - status = "ok"; - #io-channel-cells = <1>; - io-channels = <&pm7250b_vadc ADC5_USB_IN_V_16>, - <&pm7250b_vadc ADC5_USB_IN_I>, - <&pm7250b_vadc ADC5_CHG_TEMP>, - <&pm7250b_vadc ADC5_DIE_TEMP>, - <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>, - <&pm7250b_vadc ADC5_SBUx>, - <&pm7250b_vadc ADC5_VPH_PWR>, - <&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>, - <&pm7250b_qg PSY_IIO_RESISTANCE_ID>, - <&pm7250b_qg PSY_IIO_VOLTAGE_NOW>, - <&pm7250b_qg PSY_IIO_TEMP>, - <&pm7250b_qg PSY_IIO_CAPACITY>, - <&pm7250b_qg PSY_IIO_VOLTAGE_OCV>, - <&pm7250b_qg PSY_IIO_VOLTAGE_AVG>, - <&pm7250b_qg PSY_IIO_DEBUG_BATTERY>, - <&pm7250b_qg PSY_IIO_REAL_CAPACITY>, - <&pm7250b_qg PSY_IIO_CC_SOC>, - <&pm7250b_qg PSY_IIO_CURRENT_NOW>, - <&pm7250b_qg PSY_IIO_VOLTAGE_MAX>, - <&pm7250b_qg PSY_IIO_CHARGE_FULL>, - <&pm7250b_qg PSY_IIO_CHARGE_COUNTER>, - <&pm7250b_qg PSY_IIO_CYCLE_COUNT>, - <&pm7250b_qg PSY_IIO_CHARGE_FULL_DESIGN>, - <&pm7250b_qg PSY_IIO_TIME_TO_FULL_NOW>, - <&smb1394_div2_cp_primary PSY_IIO_PARALLEL_MODE>, - <&smb1394_div2_cp_primary PSY_IIO_PARALLEL_OUTPUT_MODE>, - <&smb1394_div2_cp_primary PSY_IIO_MIN_ICL>, - <&smb1394_div2_cp_primary PSY_IIO_CP_SWITCHER_EN>, - <&smb1394_div2_cp_primary PSY_IIO_CP_ENABLE>, - <&smb1394_div2_cp_primary PSY_IIO_CP_ILIM>, - <&smb1394_div2_cp_primary PSY_IIO_CP_DIE_TEMP>; - io-channel-names = "usb_in_voltage", - "usb_in_current", - "chg_temp", - "die_temp", - "conn_temp", - "sbux_res", - "vph_voltage", - "skin_temp", - "resistance_id", - "voltage_now", - "temp", - "capacity", - "voltage_ocv", - "voltage_avg", - "debug_battery", - "real_capacity", - "cc_soc", - "current_now", - "voltage_max", - "charge_full", - "charge_counter", - "cycle_count", - "charge_full_design", - "time_to_full_now", - "cp_parallel_mode", - "cp_parallel_output_mode", - "cp_min_icl", - "cp_switcher_en", - "cp_enable", - "cp_ilim", - "cp_die_temp"; - qcom,battery-data = <&mtp_batterydata>; - qcom,sec-charger-config = <1>; - qcom,auto-recharge-soc = <98>; - qcom,step-charging-enable; - qcom,sw-jeita-enable; - qcom,charger-temp-max = <800>; - qcom,smb-temp-max = <800>; - qcom,suspend-input-on-debug-batt; - qcom,fcc-stepping-enable; - qcom,fcc-step-delay-ms = <100>; - qcom,fcc-step-size-ua = <100000>; - qcom,smb-internal-pull-kohm = <0>; - qcom,en-skin-therm-mitigation; - qcom,hvdcp3-standalone-config; -}; - -&pm7250b_qg { - status = "ok"; - #io-channel-cells = <1>; - io-channels = <&pm7250b_vadc ADC5_BAT_THERM_100K_PU>, - <&pm7250b_vadc ADC5_BAT_ID_100K_PU>, - <&pm7250b_charger PSY_IIO_INPUT_CURRENT_LIMITED>, - <&pm7250b_charger PSY_IIO_RECHARGE_SOC>, - <&pm7250b_charger PSY_IIO_FORCE_RECHARGE>, - <&pm7250b_charger PSY_IIO_CHARGE_DONE>, - <&smb1394_div2_cp_primary PSY_IIO_CP_ENABLE>; - io-channel-names = "batt-therm", - "batt-id", - "input_current_limited", - "recharge_soc", - "force_recharge", - "charge_done", - "cp_charging_enabled"; - qcom,battery-data = <&mtp_batterydata>; - qcom,qg-iterm-ma = <150>; - qcom,hold-soc-while-full; - qcom,linearize-soc; - qcom,cl-feedback-on; - qcom,tcss-enable; - qcom,fvss-enable; - qcom,fvss-vbatt-mv = <3300>; - qcom,bass-enable; - qcom,use-cp-iin-sns; -}; - &pm7250b_vib { qcom,vib-ldo-volt-uv = <3000000>; }; -&pm7250b_vadc { - smb1390_therm@e { - qcom,scale-fn-type = ; - }; -}; -&pm7250b_gpios { - smb_stat { - smb_stat_default: smb_stat_default { - pins = "gpio6"; - function = "normal"; - input-enable; - bias-pull-up; - qcom,pull-up-strength = ; - power-source = <0>; - }; - }; -}; - -&qupv3_se10_i2c { - status = "ok"; - #include "smb1394.dtsi" -}; - -&smb1394 { - interrupts = <0x2 0xc5 0x0 IRQ_TYPE_LEVEL_LOW>; - interrupt-parent = <&spmi_bus>; - interrupt-names = "smb1394"; - pinctrl-names = "default"; - qcom,enable-toggle-stat; - pinctrl-0 = <&smb_stat_default>; - status = "ok"; -}; - -&smb1394_div2_cp_primary { - io-channels = <&pm7250b_vadc ADC5_AMUX_THM2>, - <&pm7250b_charger PSY_IIO_USB_REAL_TYPE>, - <&pm7250b_charger PSY_IIO_ADAPTER_CC_MODE>, - <&pm7250b_charger PSY_IIO_PD_CURRENT_MAX>, - <&pm7250b_charger PSY_IIO_USB_INPUT_CURRENT_SETTLED>, - <&pm7250b_charger PSY_IIO_SMB_EN_MODE>, - <&pm7250b_charger PSY_IIO_SMB_EN_REASON>; - io-channel-names = "die_temp", - "real_type", - "adapter_cc_mode", - "pd_current_max", - "input_current_settled", - "smb_en_mode", - "smb_en_reason"; - qcom,parallel-input-mode = <1>; /* USBIN */ - qcom,parallel-output-mode = <2>; /* VBAT */ - status = "ok"; -}; #include "camera/holi-camera-sensor-pm6125-mtp.dtsi" - -&pm7250b_charger { - dpdm-supply = <&qusb_phy0>; - - smb5_vbus: qcom,smb5-vbus { - regulator-name = "smb5-vbus"; - }; - - smb5_vconn: qcom,smb5-vconn { - regulator-name = "smb5-vconn"; - }; -}; - -&pm7250b_pdphy { - vdd-pdphy-supply = <&L3A>; - vbus-supply = <&smb5_vbus>; - vconn-supply = <&smb5_vconn>; - - #io-channel-cells = <1>; - io-channels = <&pm7250b_charger PSY_IIO_PD_ACTIVE>, - <&pm7250b_charger PSY_IIO_TYPEC_CC_ORIENTATION>, - <&pm7250b_charger PSY_IIO_CONNECTOR_TYPE>, - <&pm7250b_charger PSY_IIO_TYPEC_POWER_ROLE>, - <&pm7250b_charger PSY_IIO_PD_USB_SUSPEND_SUPPORTED>, - <&pm7250b_charger PSY_IIO_TYPEC_SRC_RP>, - <&pm7250b_charger PSY_IIO_PD_IN_HARD_RESET>, - <&pm7250b_charger PSY_IIO_PD_CURRENT_MAX>, - <&pm7250b_charger PSY_IIO_PR_SWAP>, - <&pm7250b_charger PSY_IIO_PD_VOLTAGE_MIN>, - <&pm7250b_charger PSY_IIO_PD_VOLTAGE_MAX>, - <&pm7250b_charger PSY_IIO_USB_REAL_TYPE>, - <&pm7250b_charger PSY_IIO_TYPEC_MODE>, - <&pm7250b_charger PSY_IIO_PE_START>; - io-channel-names = "pd_active", - "typec_cc_orientation", - "connector_type", - "typec_power_role", - "pd_usb_suspend_supported", - "typec_src_rp", - "pd_in_hard_reset", - "pr_current_max", - "pr_swap", - "pd_voltage_min", - "pd_voltage_max", - "real_type", - "typec_mode", - "pe_start"; -}; - -&usb0 { - extcon = <&pm7250b_pdphy>, <&pm7250b_charger>, <&eud>; - - #io-channel-cells = <1>; - io-channels= <&pm7250b_charger PSY_IIO_USB_REAL_TYPE>; - io-channel-names = "chg_type"; -}; diff --git a/qcom/holi-cypfr-common-overlay.dtsi b/qcom/holi-cypfr-common-overlay.dtsi index 8fb1ce2bae19..a3e8dcd50530 100644 --- a/qcom/holi-cypfr-common-overlay.dtsi +++ b/qcom/holi-cypfr-common-overlay.dtsi @@ -18,12 +18,11 @@ #include "holi-pmic-overlay-pm6125.dtsi" #include "holi-thermal-overlay-pm6125.dtsi" #include "display/holi-sde-display-mtp-pm6125.dtsi" -#include #include "camera/holi-camera-pm6125-overlay.dtsi" &wcd937x_codec { cdc-vdd-rxtx-supply = <&L9A>; - cdc-vddio-supply = <&L9A>; + cdc-vddpx-supply = <&L9A>; qcom,cdc-static-supplies = "cdc-vdd-rxtx", "cdc-vddpx"; /* @@ -237,11 +236,11 @@ }; }; - mtp_batterydata: qcom,battery-data { - qcom,batt-id-range-pct = <15>; - #include "qg-batterydata-alium-3600mah.dtsi" - #include "qg-batterydata-atl466271_3300mAh.dtsi" - #include "qg-batterydata-atl436186020H_3780mAh.dtsi" + cx_ipeak_lm: cx_ipeak@3ed000 { + #size-cells = <1>; + compatible = "qcom,cx-ipeak-v2"; + reg = <0x3ed000 0xe010>; + status = "ok"; }; }; @@ -259,262 +258,10 @@ }; }; -&qupv3_se8_i2c { - status = "okay"; - qcom,i2c-touch-active="synaptics,tcm-i2c"; - - synaptics_tcm@20 { - compatible = "synaptics,tcm-i2c"; - reg = <0x20>; - interrupt-parent = <&tlmm>; - interrupts = <22 0x2008>; - pinctrl-names = "pmx_ts_active","pmx_ts_suspend", - "pmx_ts_release"; - pinctrl-0 = <&ts_active>; - pinctrl-1 = <&ts_int_suspend &ts_reset_suspend>; - pinctrl-2 = <&pmx_ts_release>; - vdd-supply = <&L9A>; - avdd-supply = <&touch_avdd>; - synaptics,pwr-reg-name = "avdd"; - synaptics,bus-reg-name = "vdd"; - synaptics,irq-gpio = <&tlmm 22 0x2008>; - synaptics,irq-on-state = <0>; - synaptics,reset-gpio = <&tlmm 21 0x00>; - synaptics,reset-on-state = <0>; - synaptics,reset-active-ms = <20>; - synaptics,reset-delay-ms = <200>; - synaptics,power-delay-ms = <200>; - synaptics,ubl-i2c-addr = <0x20>; - synaptics,extend_report; - synaptics,firmware-name = "synaptics_firmware.img"; - - panel = <&dsi_rm69299_visionox_amoled_video - &dsi_rm69299_visionox_amoled_cmd>; - }; -}; - -&pm7250b_charger { - status = "ok"; - #io-channel-cells = <1>; - io-channels = <&pm7250b_vadc ADC5_USB_IN_V_16>, - <&pm7250b_vadc ADC5_USB_IN_I>, - <&pm7250b_vadc ADC5_CHG_TEMP>, - <&pm7250b_vadc ADC5_DIE_TEMP>, - <&pm7250b_vadc ADC5_AMUX_THM3_100K_PU>, - <&pm7250b_vadc ADC5_SBUx>, - <&pm7250b_vadc ADC5_VPH_PWR>, - <&pm7250b_vadc ADC5_AMUX_THM1_100K_PU>, - <&pm7250b_qg PSY_IIO_RESISTANCE_ID>, - <&pm7250b_qg PSY_IIO_VOLTAGE_NOW>, - <&pm7250b_qg PSY_IIO_TEMP>, - <&pm7250b_qg PSY_IIO_CAPACITY>, - <&pm7250b_qg PSY_IIO_VOLTAGE_OCV>, - <&pm7250b_qg PSY_IIO_VOLTAGE_AVG>, - <&pm7250b_qg PSY_IIO_DEBUG_BATTERY>, - <&pm7250b_qg PSY_IIO_REAL_CAPACITY>, - <&pm7250b_qg PSY_IIO_CC_SOC>, - <&pm7250b_qg PSY_IIO_CURRENT_NOW>, - <&pm7250b_qg PSY_IIO_VOLTAGE_MAX>, - <&pm7250b_qg PSY_IIO_CHARGE_FULL>, - <&pm7250b_qg PSY_IIO_CHARGE_COUNTER>, - <&pm7250b_qg PSY_IIO_CYCLE_COUNT>, - <&pm7250b_qg PSY_IIO_CHARGE_FULL_DESIGN>, - <&pm7250b_qg PSY_IIO_TIME_TO_FULL_NOW>, - <&smb1394_div2_cp_primary PSY_IIO_PARALLEL_MODE>, - <&smb1394_div2_cp_primary PSY_IIO_PARALLEL_OUTPUT_MODE>, - <&smb1394_div2_cp_primary PSY_IIO_MIN_ICL>, - <&smb1394_div2_cp_primary PSY_IIO_CP_SWITCHER_EN>, - <&smb1394_div2_cp_primary PSY_IIO_CP_ENABLE>, - <&smb1394_div2_cp_primary PSY_IIO_CP_ILIM>, - <&smb1394_div2_cp_primary PSY_IIO_CP_DIE_TEMP>; - io-channel-names = "usb_in_voltage", - "usb_in_current", - "chg_temp", - "die_temp", - "conn_temp", - "sbux_res", - "vph_voltage", - "skin_temp", - "resistance_id", - "voltage_now", - "temp", - "capacity", - "voltage_ocv", - "voltage_avg", - "debug_battery", - "real_capacity", - "cc_soc", - "current_now", - "voltage_max", - "charge_full", - "charge_counter", - "cycle_count", - "charge_full_design", - "time_to_full_now", - "cp_parallel_mode", - "cp_parallel_output_mode", - "cp_min_icl", - "cp_switcher_en", - "cp_enable", - "cp_ilim", - "cp_die_temp"; - qcom,battery-data = <&mtp_batterydata>; - qcom,sec-charger-config = <1>; - qcom,auto-recharge-soc = <98>; - qcom,step-charging-enable; - qcom,sw-jeita-enable; - qcom,charger-temp-max = <800>; - qcom,smb-temp-max = <800>; - qcom,suspend-input-on-debug-batt; - qcom,fcc-stepping-enable; - qcom,fcc-step-delay-ms = <100>; - qcom,fcc-step-size-ua = <100000>; - qcom,smb-internal-pull-kohm = <0>; - qcom,en-skin-therm-mitigation; - qcom,hvdcp3-standalone-config; -}; - -&pm7250b_qg { - status = "ok"; - #io-channel-cells = <1>; - io-channels = <&pm7250b_vadc ADC5_BAT_THERM_100K_PU>, - <&pm7250b_vadc ADC5_BAT_ID_100K_PU>, - <&pm7250b_charger PSY_IIO_INPUT_CURRENT_LIMITED>, - <&pm7250b_charger PSY_IIO_RECHARGE_SOC>, - <&pm7250b_charger PSY_IIO_FORCE_RECHARGE>, - <&pm7250b_charger PSY_IIO_CHARGE_DONE>, - <&smb1394_div2_cp_primary PSY_IIO_CP_ENABLE>; - io-channel-names = "batt-therm", - "batt-id", - "input_current_limited", - "recharge_soc", - "force_recharge", - "charge_done", - "cp_charging_enabled"; - qcom,battery-data = <&mtp_batterydata>; - qcom,qg-iterm-ma = <150>; - qcom,hold-soc-while-full; - qcom,linearize-soc; - qcom,cl-feedback-on; - qcom,tcss-enable; - qcom,fvss-enable; - qcom,fvss-vbatt-mv = <3300>; - qcom,bass-enable; - qcom,use-cp-iin-sns; -}; - &pm7250b_vib { qcom,vib-ldo-volt-uv = <3000000>; }; -&pm7250b_vadc { - smb1390_therm@e { - qcom,scale-fn-type = ; - }; -}; -&pm7250b_gpios { - smb_stat { - smb_stat_default: smb_stat_default { - pins = "gpio6"; - function = "normal"; - input-enable; - bias-pull-up; - qcom,pull-up-strength = ; - power-source = <0>; - }; - }; -}; - -&qupv3_se10_i2c { - status = "ok"; - #include "smb1394.dtsi" -}; - -&smb1394 { - interrupts = <0x2 0xc5 0x0 IRQ_TYPE_LEVEL_LOW>; - interrupt-parent = <&spmi_bus>; - interrupt-names = "smb1394"; - pinctrl-names = "default"; - qcom,enable-toggle-stat; - pinctrl-0 = <&smb_stat_default>; - status = "ok"; -}; - -&smb1394_div2_cp_primary { - io-channels = <&pm7250b_vadc ADC5_AMUX_THM2>, - <&pm7250b_charger PSY_IIO_USB_REAL_TYPE>, - <&pm7250b_charger PSY_IIO_ADAPTER_CC_MODE>, - <&pm7250b_charger PSY_IIO_PD_CURRENT_MAX>, - <&pm7250b_charger PSY_IIO_USB_INPUT_CURRENT_SETTLED>, - <&pm7250b_charger PSY_IIO_SMB_EN_MODE>, - <&pm7250b_charger PSY_IIO_SMB_EN_REASON>; - io-channel-names = "die_temp", - "real_type", - "adapter_cc_mode", - "pd_current_max", - "input_current_settled", - "smb_en_mode", - "smb_en_reason"; - qcom,parallel-input-mode = <1>; /* USBIN */ - qcom,parallel-output-mode = <2>; /* VBAT */ - status = "ok"; -}; #include "camera/holi-camera-sensor-pm6125-mtp.dtsi" - -&pm7250b_charger { - dpdm-supply = <&qusb_phy0>; - - smb5_vbus: qcom,smb5-vbus { - regulator-name = "smb5-vbus"; - }; - - smb5_vconn: qcom,smb5-vconn { - regulator-name = "smb5-vconn"; - }; -}; - -&pm7250b_pdphy { - vdd-pdphy-supply = <&L3A>; - vbus-supply = <&smb5_vbus>; - vconn-supply = <&smb5_vconn>; - - #io-channel-cells = <1>; - io-channels = <&pm7250b_charger PSY_IIO_PD_ACTIVE>, - <&pm7250b_charger PSY_IIO_TYPEC_CC_ORIENTATION>, - <&pm7250b_charger PSY_IIO_CONNECTOR_TYPE>, - <&pm7250b_charger PSY_IIO_TYPEC_POWER_ROLE>, - <&pm7250b_charger PSY_IIO_PD_USB_SUSPEND_SUPPORTED>, - <&pm7250b_charger PSY_IIO_TYPEC_SRC_RP>, - <&pm7250b_charger PSY_IIO_PD_IN_HARD_RESET>, - <&pm7250b_charger PSY_IIO_PD_CURRENT_MAX>, - <&pm7250b_charger PSY_IIO_PR_SWAP>, - <&pm7250b_charger PSY_IIO_PD_VOLTAGE_MIN>, - <&pm7250b_charger PSY_IIO_PD_VOLTAGE_MAX>, - <&pm7250b_charger PSY_IIO_USB_REAL_TYPE>, - <&pm7250b_charger PSY_IIO_TYPEC_MODE>, - <&pm7250b_charger PSY_IIO_PE_START>; - io-channel-names = "pd_active", - "typec_cc_orientation", - "connector_type", - "typec_power_role", - "pd_usb_suspend_supported", - "typec_src_rp", - "pd_in_hard_reset", - "pr_current_max", - "pr_swap", - "pd_voltage_min", - "pd_voltage_max", - "real_type", - "typec_mode", - "pe_start"; -}; - -&usb0 { - extcon = <&pm7250b_pdphy>, <&pm7250b_charger>, <&eud>; - - #io-channel-cells = <1>; - io-channels= <&pm7250b_charger PSY_IIO_USB_REAL_TYPE>; - io-channel-names = "chg_type"; -}; diff --git a/qcom/holi-pm6125-moto-common-overlay.dtsi b/qcom/holi-pm6125-moto-common-overlay.dtsi index 3e775c832972..03db6c1e3734 100644 --- a/qcom/holi-pm6125-moto-common-overlay.dtsi +++ b/qcom/holi-pm6125-moto-common-overlay.dtsi @@ -11,6 +11,7 @@ */ #include "holi-pm6125-overlay.dtsi" #include "holi-regulators-pm6125.dtsi" +#include "holi-mtp-pm7250b.dtsi" #include "carrier-channel-ids.dtsi" #include