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

Commit 83aea9cc authored by edwardkao(153792)'s avatar edwardkao(153792) Committed by Gerrit Code Review
Browse files

Merge "Modify Power on/off sequence" into 8901-fairphone-p-mp-release

parents e56f2008 d3166d80
Loading
Loading
Loading
Loading

drivers/regulator/core.c

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

+11 −1
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@
 */

#define pr_fmt(fmt)	"LCDB: %s: " fmt, __func__
//[Arima][8901][Jialongjhan]Add delay time between VSN and VSP 20191104 Start
#define LCDB_PWRUP_PWRDN_CTL_REG 0x66
//[Arima][8901][Jialongjhan]Add delay time between VSN and VSP 20191104 End

#include <linux/delay.h>
#include <linux/device.h>
@@ -2174,6 +2177,9 @@ static int qpnp_lcdb_regulator_probe(struct platform_device *pdev)
	int rc;
	struct device_node *node;
	struct qpnp_lcdb *lcdb;
	//[Arima][8901][Jialongjhan]Add delay time between VSN and VSP 20191104 Start
	u8 val = 0xF; // 0xF==1111==VSN delay 8ms; VSP delay 8ms
	//[Arima][8901][Jialongjhan]Add delay time between VSN and VSP 20191104 End
	
	node = pdev->dev.of_node;
	if (!node) {
@@ -2216,6 +2222,10 @@ static int qpnp_lcdb_regulator_probe(struct platform_device *pdev)
			lcdb->lcdb_enabled, lcdb->ldo.voltage_mv,
			lcdb->ncp.voltage_mv, lcdb->bst.voltage_mv);

	//[Arima][8901][Jialongjhan]Add delay time between VSN and VSP 20191104 Start
	rc = qpnp_lcdb_write(lcdb, lcdb->base + LCDB_PWRUP_PWRDN_CTL_REG , &val, 1);
	//[Arima][8901][Jialongjhan]Add delay time between VSN and VSP 20191104 End
	
	return rc;
}

+0 −0

File mode changed from 100644 to 100755.

+0 −0

File mode changed from 100644 to 100755.

+0 −0

File mode changed from 100644 to 100755.

Loading