Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07d67afe authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: Add SMB1355 charger device"

parents 6d1a6889 62fb4efc

qcom/holi-mtp-usbc.dtsi

+4 −20
Original line number Diff line number Diff line
@@ -210,8 +210,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",
@@ -242,8 +241,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>;
@@ -339,20 +337,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",
@@ -364,14 +356,6 @@ 
	status = "ok";

};



&smb1396_slave {

	status = "ok";

};



&smb1396_div2_cp_slave {

	status = "ok";

};



&pm7250b_pdphy {

	vdd-pdphy-supply = <&L3A>;

	vbus-supply = <&smb5_vbus>;

qcom/holi-mtp.dtsi

+4 −20
Original line number Diff line number Diff line
@@ -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 {

qcom/holi-qrd.dtsi

+4 −20
Original line number Diff line number Diff line
@@ -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>;
@@ -484,20 +482,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",
@@ -508,11 +500,3 @@ 
	qcom,parallel-output-mode = <2>; /* VBAT */

	status = "ok";

};
 


&smb1396_slave {

	status = "ok";

};



&smb1396_div2_cp_slave {

	status = "ok";

};

qcom/smb1355.dtsi

0 → 100644
+39 −0
Original line number Diff line number Diff line 
#include <dt-bindings/interrupt-controller/irq.h>



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";

		};

	};

};