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

Commit e03826d5 authored by Keerthy's avatar Keerthy Committed by Mark Brown
Browse files

regulator: palmas: Correct TPS659038 register definition for REGEN2 



The register offset for REGEN2_CTRL in different for TPS659038 chip as when
compared with other Palmas family PMICs. In the case of TPS659038 the wrong
offset pointed to PLLEN_CTRL and was causing a hang. Correcting the same.

Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent c517d838

drivers/regulator/palmas-regulator.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -1572,6 +1572,10 @@ static int palmas_regulators_probe(struct platform_device *pdev) 
	if (!pmic)

	if (!pmic)

		return -ENOMEM;

		return -ENOMEM;





	if (of_device_is_compatible(node, "ti,tps659038-pmic"))

		palmas_generic_regs_info[PALMAS_REG_REGEN2].ctrl_addr =

							TPS659038_REGEN2_CTRL;



	pmic->dev = &pdev->dev;

	pmic->dev = &pdev->dev;

	pmic->palmas = palmas;

	pmic->palmas = palmas;

	palmas->pmic = pmic;

	palmas->pmic = pmic;

include/linux/mfd/palmas.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -2999,6 +2999,9 @@ enum usb_irq_events { 
#define PALMAS_GPADC_TRIM15					0x0E

#define PALMAS_GPADC_TRIM15					0x0E

#define PALMAS_GPADC_TRIM16					0x0F

#define PALMAS_GPADC_TRIM16					0x0F





/* TPS659038 regen2_ctrl offset iss different from palmas */

#define TPS659038_REGEN2_CTRL					0x12



/* TPS65917 Interrupt registers */

/* TPS65917 Interrupt registers */





/* Registers for function INTERRUPT */

/* Registers for function INTERRUPT */