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

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

Merge "drivers: iio: adc: Modified vbat_sns and bat_id channels"

parents d1434198 6a0f4eef

drivers/iio/adc/qcom-spmi-vadc.c

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2016, 2019 The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -561,7 +561,7 @@ static const struct vadc_channels vadc_chans[] = { 
	VADC_CHAN_NO_SCALE(SPARE1_03, 1)

	VADC_CHAN_NO_SCALE(USB_ID_MV, 1)

	VADC_CHAN_VOLT(VCOIN, 1, SCALE_DEFAULT)

	VADC_CHAN_NO_SCALE(VBAT_SNS, 1)

	VADC_CHAN_VOLT(VBAT_SNS, 1, SCALE_DEFAULT)

	VADC_CHAN_VOLT(VSYS, 1, SCALE_DEFAULT)

	VADC_CHAN_TEMP(DIE_TEMP, 0, SCALE_PMIC_THERM)

	VADC_CHAN_VOLT(REF_625MV, 0, SCALE_DEFAULT)
@@ -607,7 +607,7 @@ static const struct vadc_channels vadc_chans[] = { 
	VADC_CHAN_NO_SCALE(P_MUX16_1_3, 1)



	VADC_CHAN_NO_SCALE(LR_MUX1_BAT_THERM, 0)

	VADC_CHAN_NO_SCALE(LR_MUX2_BAT_ID, 0)

	VADC_CHAN_VOLT(LR_MUX2_BAT_ID, 0, SCALE_DEFAULT)

	VADC_CHAN_NO_SCALE(LR_MUX3_XO_THERM, 0)

	VADC_CHAN_NO_SCALE(LR_MUX4_AMUX_THM1, 0)

	VADC_CHAN_NO_SCALE(LR_MUX5_AMUX_THM2, 0)