From 2850dd4e1e5e0c7de1ea7e145953548ee8ef4824 Mon Sep 17 00:00:00 2001 From: Ashish Chavan Date: Wed, 26 May 2021 13:08:07 +0530 Subject: [PATCH] ARM: dts: msm: Add smb1394 support for holi-pm6125 Add support for smb1394 for holi-pm6125 mtp and mtp-usbc platform, while at it remove smb1398 nodes for the same. Change-Id: Ie0bce0b289739d1a206eeb6585dac8fca160f63a --- qcom/holi-mtp-pm6125.dtsi | 24 ++++++++++++------------ qcom/holi-mtp-usbc-pm6125.dtsi | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qcom/holi-mtp-pm6125.dtsi b/qcom/holi-mtp-pm6125.dtsi index 3136db197142..9a75570cb649 100644 --- a/qcom/holi-mtp-pm6125.dtsi +++ b/qcom/holi-mtp-pm6125.dtsi @@ -237,13 +237,13 @@ <&pm7250b_qg PSY_IIO_CYCLE_COUNT>, <&pm7250b_qg PSY_IIO_CHARGE_FULL_DESIGN>, <&pm7250b_qg PSY_IIO_TIME_TO_FULL_NOW>, - <&smb1396_div2_cp_master PSY_IIO_PARALLEL_MODE>, - <&smb1396_div2_cp_master PSY_IIO_PARALLEL_OUTPUT_MODE>, - <&smb1396_div2_cp_master PSY_IIO_MIN_ICL>, - <&smb1396_div2_cp_master PSY_IIO_CP_SWITCHER_EN>, - <&smb1396_div2_cp_master PSY_IIO_CP_ENABLE>, - <&smb1396_div2_cp_master PSY_IIO_CP_ILIM>, - <&smb1396_div2_cp_master PSY_IIO_CP_DIE_TEMP>; + <&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", @@ -300,7 +300,7 @@ <&pm7250b_charger PSY_IIO_RECHARGE_SOC>, <&pm7250b_charger PSY_IIO_FORCE_RECHARGE>, <&pm7250b_charger PSY_IIO_CHARGE_DONE>, - <&smb1396_div2_cp_master PSY_IIO_CP_ENABLE>; + <&smb1394_div2_cp_primary PSY_IIO_CP_ENABLE>; io-channel-names = "batt-therm", "batt-id", "input_current_limited", @@ -341,20 +341,20 @@ &qupv3_se10_i2c { status = "ok"; - #include "smb1398.dtsi" + #include "smb1394.dtsi" }; -&smb1396 { +&smb1394 { interrupts = <0x2 0xc5 0x0 IRQ_TYPE_LEVEL_LOW>; interrupt-parent = <&spmi_bus>; - interrupt-names = "smb1396"; + interrupt-names = "smb1394"; pinctrl-names = "default"; qcom,enable-toggle-stat; pinctrl-0 = <&smb_stat_default>; status = "ok"; }; -&smb1396_div2_cp_master { +&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>, diff --git a/qcom/holi-mtp-usbc-pm6125.dtsi b/qcom/holi-mtp-usbc-pm6125.dtsi index 7513687694f9..f06872848cf7 100644 --- a/qcom/holi-mtp-usbc-pm6125.dtsi +++ b/qcom/holi-mtp-usbc-pm6125.dtsi @@ -256,13 +256,13 @@ <&pm7250b_qg PSY_IIO_CYCLE_COUNT>, <&pm7250b_qg PSY_IIO_CHARGE_FULL_DESIGN>, <&pm7250b_qg PSY_IIO_TIME_TO_FULL_NOW>, - <&smb1396_div2_cp_master PSY_IIO_PARALLEL_MODE>, - <&smb1396_div2_cp_master PSY_IIO_PARALLEL_OUTPUT_MODE>, - <&smb1396_div2_cp_master PSY_IIO_MIN_ICL>, - <&smb1396_div2_cp_master PSY_IIO_CP_SWITCHER_EN>, - <&smb1396_div2_cp_master PSY_IIO_CP_ENABLE>, - <&smb1396_div2_cp_master PSY_IIO_CP_ILIM>, - <&smb1396_div2_cp_master PSY_IIO_CP_DIE_TEMP>; + <&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", @@ -319,7 +319,7 @@ <&pm7250b_charger PSY_IIO_RECHARGE_SOC>, <&pm7250b_charger PSY_IIO_FORCE_RECHARGE>, <&pm7250b_charger PSY_IIO_CHARGE_DONE>, - <&smb1396_div2_cp_master PSY_IIO_CP_ENABLE>; + <&smb1394_div2_cp_primary PSY_IIO_CP_ENABLE>; io-channel-names = "batt-therm", "batt-id", "input_current_limited", @@ -374,20 +374,20 @@ &qupv3_se10_i2c { status = "ok"; - #include "smb1398.dtsi" + #include "smb1394.dtsi" }; -&smb1396 { +&smb1394 { interrupts = <0x2 0xc5 0x0 IRQ_TYPE_LEVEL_LOW>; interrupt-parent = <&spmi_bus>; - interrupt-names = "smb1396"; + interrupt-names = "smb1394"; pinctrl-names = "default"; qcom,enable-toggle-stat; pinctrl-0 = <&smb_stat_default>; status = "ok"; }; -&smb1396_div2_cp_master { +&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>,