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

Commit 2031377a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "esoc: Perform warm reset in place of cold reset for Kona"

parents 8ccaf8c2 ff1d2800

drivers/esoc/esoc-mdm-4x.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int mdm_cmd_exe(enum esoc_cmd cmd, struct esoc_clink *esoc) 
		esoc_mdm_log(

		"ESOC_FORCE_PWR_OFF: Queueing request: ESOC_REQ_SHUTDOWN\n");

		esoc_clink_queue_request(ESOC_REQ_SHUTDOWN, esoc);

		mdm_toggle_soft_reset(mdm, false);

		mdm_power_down(mdm);

		mdm_update_gpio_configs(mdm, GPIO_UPDATE_BOOTING_CONFIG);

		break;

	case ESOC_RESET:
@@ -484,7 +484,7 @@ static void mdm_notify(enum esoc_notify notify, struct esoc_clink *esoc) 
		mdm->ready = false;

		esoc_mdm_log(

		"ESOC_PRIMARY_REBOOT: Powering down the modem\n");

		mdm_toggle_soft_reset(mdm, false);

		mdm_power_down(mdm);

		break;

	};

}

drivers/esoc/esoc-mdm-pon.c

+7 −0
Original line number Diff line number Diff line
@@ -206,6 +206,12 @@ static int sdx50m_power_down(struct mdm_ctrl *mdm) 
	return 0;

}



static int sdx55m_power_down(struct mdm_ctrl *mdm)

{

	esoc_mdm_log("Performing warm reset as cold reset is not supported\n");

	return sdx55m_toggle_soft_reset(mdm, false);

}



static void mdm9x55_cold_reset(struct mdm_ctrl *mdm)

{

	dev_dbg(mdm->dev, "Triggering mdm cold reset");
@@ -318,6 +324,7 @@ struct mdm_pon_ops sdx50m_pon_ops = { 
struct mdm_pon_ops sdx55m_pon_ops = {

	.pon = mdm4x_do_first_power_on,

	.soft_reset = sdx55m_toggle_soft_reset,

	.poff_force = sdx55m_power_down,

	.dt_init = mdm4x_pon_dt_init,

	.setup = mdm4x_pon_setup,

};