Commit 1401990e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/palmas' into regulator-linus

parents bc465aa9 cf39284d e03826d5

drivers/regulator/palmas-regulator.c

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

		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->palmas = palmas;

	palmas->pmic = pmic;

include/linux/mfd/palmas.h

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

#define PALMAS_GPADC_TRIM16					0x0F



/* TPS659038 regen2_ctrl offset iss different from palmas */

#define TPS659038_REGEN2_CTRL					0x12



/* TPS65917 Interrupt registers */



/* Registers for function INTERRUPT */

include/linux/regulator/driver.h

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ struct regulator_desc { 
 * @driver_data: private regulator data

 * @of_node: OpenFirmware node to parse for device tree bindings (may be

 *           NULL).

 * @regmap: regmap to use for core regmap helpers if dev_get_regulator() is

 * @regmap: regmap to use for core regmap helpers if dev_get_regmap() is

 *          insufficient.

 * @ena_gpio_initialized: GPIO controlling regulator enable was properly

 *                        initialized, meaning that >= 0 is a valid gpio

CRA Git | Maintained and supported by SUSTech CRA and CCSE