From 9993005af1d1ebd8f3f8f7e0820b16d195f2d6f9 Mon Sep 17 00:00:00 2001 From: Ashish Chavan Date: Mon, 21 Sep 2020 14:06:54 +0530 Subject: [PATCH 1/2] ARM: dts: qcom: Disable smb1396 slave node for holi Disable smb1396 slave node on holi. Change-Id: Iae114ce844c10a7904a87bd70b4653e43621ea86 --- qcom/holi-mtp-usbc.dtsi | 24 ++++-------------------- qcom/holi-mtp.dtsi | 24 ++++-------------------- qcom/holi-qrd.dtsi | 24 ++++-------------------- 3 files changed, 12 insertions(+), 60 deletions(-) diff --git a/qcom/holi-mtp-usbc.dtsi b/qcom/holi-mtp-usbc.dtsi index ce89821b2afb..34b0469f05bc 100644 --- a/qcom/holi-mtp-usbc.dtsi +++ b/qcom/holi-mtp-usbc.dtsi @@ -135,8 +135,7 @@ <&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>, - <&smb1396_div2_cp_slave PSY_IIO_CURRENT_CAPABILITY>; + <&smb1396_div2_cp_master PSY_IIO_CP_DIE_TEMP>; io-channel-names = "usb_in_voltage", "usb_in_current", "chg_temp", @@ -167,8 +166,7 @@ "cp_switcher_en", "cp_enable", "cp_ilim", - "cp_die_temp", - "current_capability"; + "cp_die_temp"; qcom,battery-data = <&mtp_batterydata>; qcom,sec-charger-config = <1>; qcom,auto-recharge-soc = <98>; @@ -266,20 +264,14 @@ }; &smb1396_div2_cp_master { - io-channels = <&smb1396_div2_cp_slave PSY_IIO_CURRENT_CAPABILITY>, - <&smb1396_div2_cp_slave PSY_IIO_CP_ENABLE>, - <&smb1396_div2_cp_slave PSY_IIO_CP_INPUT_CURRENT_MAX>, - <&pm7250b_vadc ADC5_AMUX_THM2>, + 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 = "current_capability", - "cp_enable", - "cp_input_current_max", - "die_temp", + io-channel-names = "die_temp", "real_type", "adapter_cc_mode", "pd_current_max", @@ -291,14 +283,6 @@ status = "ok"; }; -&smb1396_slave { - status = "ok"; -}; - -&smb1396_div2_cp_slave { - status = "ok"; -}; - &pm7250b_pdphy { vdd-pdphy-supply = <&L3A>; vbus-supply = <&smb5_vbus>; diff --git a/qcom/holi-mtp.dtsi b/qcom/holi-mtp.dtsi index e88f4165c040..6ca3ac15d197 100644 --- a/qcom/holi-mtp.dtsi +++ b/qcom/holi-mtp.dtsi @@ -192,8 +192,7 @@ <&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>, - <&smb1396_div2_cp_slave PSY_IIO_CURRENT_CAPABILITY>; + <&smb1396_div2_cp_master PSY_IIO_CP_DIE_TEMP>; io-channel-names = "usb_in_voltage", "usb_in_current", "chg_temp", @@ -224,8 +223,7 @@ "cp_switcher_en", "cp_enable", "cp_ilim", - "cp_die_temp", - "current_capability"; + "cp_die_temp"; qcom,battery-data = <&mtp_batterydata>; qcom,sec-charger-config = <1>; qcom,auto-recharge-soc = <98>; @@ -307,20 +305,14 @@ }; &smb1396_div2_cp_master { - io-channels = <&smb1396_div2_cp_slave PSY_IIO_CURRENT_CAPABILITY>, - <&smb1396_div2_cp_slave PSY_IIO_CP_ENABLE>, - <&smb1396_div2_cp_slave PSY_IIO_CP_INPUT_CURRENT_MAX>, - <&pm7250b_vadc ADC5_AMUX_THM2>, + 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 = "current_capability", - "cp_enable", - "cp_input_current_max", - "die_temp", + io-channel-names = "die_temp", "real_type", "adapter_cc_mode", "pd_current_max", @@ -332,14 +324,6 @@ status = "ok"; }; -&smb1396_slave { - status = "ok"; -}; - -&smb1396_div2_cp_slave { - status = "ok"; -}; - #include "camera/holi-camera-sensor-mtp.dtsi" &pm7250b_charger { diff --git a/qcom/holi-qrd.dtsi b/qcom/holi-qrd.dtsi index 0104c5a8e3d7..006fcc15a2cc 100644 --- a/qcom/holi-qrd.dtsi +++ b/qcom/holi-qrd.dtsi @@ -267,8 +267,7 @@ <&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>, - <&smb1396_div2_cp_slave PSY_IIO_CURRENT_CAPABILITY>; + <&smb1396_div2_cp_master PSY_IIO_CP_DIE_TEMP>; io-channel-names = "usb_in_voltage", "usb_in_current", "chg_temp", @@ -299,8 +298,7 @@ "cp_switcher_en", "cp_enable", "cp_ilim", - "cp_die_temp", - "current_capability"; + "cp_die_temp"; qcom,battery-data = <&qrd_batterydata>; qcom,sec-charger-config = <1>; qcom,auto-recharge-soc = <98>; @@ -480,20 +478,14 @@ }; &smb1396_div2_cp_master { - io-channels = <&smb1396_div2_cp_slave PSY_IIO_CURRENT_CAPABILITY>, - <&smb1396_div2_cp_slave PSY_IIO_CP_ENABLE>, - <&smb1396_div2_cp_slave PSY_IIO_CP_INPUT_CURRENT_MAX>, - <&pm7250b_vadc ADC5_AMUX_THM2>, + 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 = "current_capability", - "cp_enable", - "cp_input_current_max", - "die_temp", + io-channel-names = "die_temp", "real_type", "adapter_cc_mode", "pd_current_max", @@ -504,11 +496,3 @@ qcom,parallel-output-mode = <2>; /* VBAT */ status = "ok"; }; - -&smb1396_slave { - status = "ok"; -}; - -&smb1396_div2_cp_slave { - status = "ok"; -}; From 62fb4efce30af9250c21bb4f78f97dcaed6ce2e9 Mon Sep 17 00:00:00 2001 From: Ashish Chavan Date: Mon, 21 Sep 2020 14:31:22 +0530 Subject: [PATCH 2/2] ARM: dts: qcom: Add SMB1355 charger device Add SMB1355 parallel charger with all it's required configuration. Change-Id: I943bfa7d69d22d65901300edc989442809d179df --- qcom/smb1355.dtsi | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 qcom/smb1355.dtsi diff --git a/qcom/smb1355.dtsi b/qcom/smb1355.dtsi new file mode 100644 index 000000000000..0638aae703d0 --- /dev/null +++ b/qcom/smb1355.dtsi @@ -0,0 +1,39 @@ +#include + +smb1355: qcom,smb1355@c { + compatible = "qcom,i2c-pmic"; + reg = <0xc>; + #address-cells = <1>; + #size-cells = <0>; + interrupt-parent = <&spmi_bus>; + interrupts = <0x2 0xC5 0x0 IRQ_TYPE_LEVEL_LOW>; + interrupt_names = "smb1355"; + interrupt-controller; + #interrupt-cells = <3>; + qcom,periph-map = <0x10 0x12 0x13 0x16>; + status = "disabled"; + + smb1355_charger: qcom,smb1355-charger@1000 { + compatible = "qcom,smb1355"; + reg = <0x1000 0x700>; + #io-channel-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&smb1355>; + status = "disabled"; + + qcom,chgr@1000 { + reg = <0x1000 0x100>; + interrupts = <0x10 0x1 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "chg-state-change"; + }; + + qcom,chgr-misc@1600 { + reg = <0x1600 0x100>; + interrupts = <0x16 0x1 IRQ_TYPE_EDGE_RISING>, + <0x16 0x6 IRQ_TYPE_EDGE_RISING>; + interrupt-names = "wdog-bark", + "temperature-change"; + }; + }; +};