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

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

Merge "ARM: dts: msm: Add smb1394 support for holi-pm6125"

parents af80aaf7 2850dd4e

qcom/holi-mtp-pm6125.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -222,13 +222,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",
@@ -285,7 +285,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",
@@ -326,20 +326,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>,

qcom/holi-mtp-usbc-pm6125.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -241,13 +241,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",
@@ -304,7 +304,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",
@@ -359,20 +359,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>,