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

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

Merge "power: smb5: Clean up temperature iio channels"

parents 27deb14b d9fc2d42

arch/arm64/boot/dts/qcom/pm6150.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -318,12 +318,12 @@ 
				reg = <0x1500 0x100>;

				interrupts =

					<0x0 0x15 0x0 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x1 IRQ_TYPE_LEVEL_HIGH>,

					<0x0 0x15 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x3 IRQ_TYPE_LEVEL_HIGH>,

					<0x0 0x15 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x4 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x6 IRQ_TYPE_LEVEL_HIGH>,

					<0x0 0x15 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x15 0x7 IRQ_TYPE_EDGE_RISING>;



				interrupt-names = "typec-or-rid-detect-change",
@@ -343,7 +343,7 @@ 
					<0x0 0x16 0x1 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x2 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x3 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x4 IRQ_TYPE_LEVEL_HIGH>,

					<0x0 0x16 0x4 IRQ_TYPE_EDGE_BOTH>,

					<0x0 0x16 0x5 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x6 IRQ_TYPE_EDGE_RISING>,

					<0x0 0x16 0x7 IRQ_TYPE_EDGE_RISING>;

drivers/power/supply/qcom/smb5-lib.c

+8 −0
Original line number Diff line number Diff line
@@ -5671,6 +5671,14 @@ static void smblib_iio_deinit(struct smb_charger *chg) 
		iio_channel_release(chg->iio.sbux_chan);

	if (!IS_ERR_OR_NULL(chg->iio.vph_v_chan))

		iio_channel_release(chg->iio.vph_v_chan);

	if (!IS_ERR_OR_NULL(chg->iio.die_temp_chan))

		iio_channel_release(chg->iio.die_temp_chan);

	if (!IS_ERR_OR_NULL(chg->iio.connector_temp_chan))

		iio_channel_release(chg->iio.connector_temp_chan);

	if (!IS_ERR_OR_NULL(chg->iio.skin_temp_chan))

		iio_channel_release(chg->iio.skin_temp_chan);

	if (!IS_ERR_OR_NULL(chg->iio.smb_temp_chan))

		iio_channel_release(chg->iio.smb_temp_chan);

}



int smblib_init(struct smb_charger *chg)