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

Commit dd72391c authored by Fabio Estevam's avatar Fabio Estevam Committed by Greg Kroah-Hartman
Browse files

mfd: mc13xxx-core: Fix PMIC shutdown when reading ADC values 



[ Upstream commit 55143439b7b501882bea9d95a54adfe00ffc79a3 ]

When trying to read any MC13892 ADC channel on a imx51-babbage board:

The MC13892 PMIC shutdowns completely.

After debugging this issue and comparing the MC13892 and MC13783
initializations done in the vendor kernel, it was noticed that the
CHRGRAWDIV bit of the ADC0 register was not being set.

This bit is set by default after power on, but the driver was
clearing it.

After setting this bit it is possible to read the ADC values correctly.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Tested-by: default avatarChris Healy <cphealy@gmail.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 02c9ec11

drivers/mfd/mc13xxx-core.c

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode, 
	if (ret)

		goto out;



	adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2;

	adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2 |

	       MC13XXX_ADC0_CHRGRAWDIV;

	adc1 = MC13XXX_ADC1_ADEN | MC13XXX_ADC1_ADTRIGIGN | MC13XXX_ADC1_ASC;



	/*

include/linux/mfd/mc13xxx.h

+1 −0
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ struct mc13xxx_platform_data { 
#define MC13XXX_ADC0_TSMOD0		(1 << 12)

#define MC13XXX_ADC0_TSMOD1		(1 << 13)

#define MC13XXX_ADC0_TSMOD2		(1 << 14)

#define MC13XXX_ADC0_CHRGRAWDIV		(1 << 15)

#define MC13XXX_ADC0_ADINC1		(1 << 16)

#define MC13XXX_ADC0_ADINC2		(1 << 17)