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

Commit 6669d042 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: bgdaemon: add delay in SUBSYS_AFTER_SHUTDOWN"

parents ccc0f8f9 3062a088
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@
#define BGDAEMON_LDO03_NPM_VTG 10000

#define MPPS_DOWN_EVENT_TO_BG_TIMEOUT 100
#define SLEEP_FOR_SPI_BUS 2000

enum {
	SSR_DOMAIN_BG,
@@ -353,6 +354,8 @@ static long bg_com_ioctl(struct file *filp,
		break;
	case SET_SPI_BUSY:
		ret = bgcom_set_spi_state(BGCOM_SPI_BUSY);
		/* Add sleep for  SPI Bus to release*/
		msleep(SLEEP_FOR_SPI_BUS);
		break;
	case BG_SOFT_RESET:
		ret = bg_soft_reset();
@@ -515,6 +518,10 @@ static int ssr_bg_cb(struct notifier_block *this,
		bgcom_set_spi_state(BGCOM_SPI_BUSY);
		send_uevent(&bge);
		break;
	case SUBSYS_AFTER_SHUTDOWN:
		/* Add sleep for  SPI Bus to release*/
		msleep(SLEEP_FOR_SPI_BUS);
		break;
	case SUBSYS_AFTER_POWERUP:
		bge.e_type = BG_AFTER_POWER_UP;
		bgdaemon_ldowork(DISABLE_LDO03);
+0 −3
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@

#define BG_SPI_MAX_WORDS (0x3FFFFFFD)
#define BG_SPI_MAX_REGS (0x0A)
#define SLEEP_IN_STATE_CHNG 2000
#define HED_EVENT_ID_LEN (0x02)
#define HED_EVENT_SIZE_LEN (0x02)
#define HED_EVENT_DATA_STRT_LEN (0x05)
@@ -149,8 +148,6 @@ int bgcom_set_spi_state(enum bgcom_spi_state state)

	mutex_lock(&bg_spi->xfer_mutex);
	spi_state = state;
	if (spi_state == BGCOM_SPI_BUSY)
		msleep(SLEEP_IN_STATE_CHNG);
	mutex_unlock(&bg_spi->xfer_mutex);
	return 0;
}