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

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

Merge "esoc: Use standard reset time for mdm9x55 atomic reset"

parents 866d3792 093a4dcd

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

+8 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -230,10 +230,15 @@ static int mdm_cmd_exe(enum esoc_cmd cmd, struct esoc_clink *esoc) 
			}

			msleep(100);

		}

		if (status_down)

		if (status_down) {

			dev_dbg(dev, "shutdown successful\n");

		else

			esoc_clink_queue_request(ESOC_REQ_SHUTDOWN, esoc);

		} else {

			dev_err(mdm->dev, "graceful poff ipc fail\n");

			graceful_shutdown = false;

			goto force_poff;

		}

		break;

force_poff:

	case ESOC_FORCE_PWR_OFF:

		if (!graceful_shutdown) {

drivers/esoc/esoc-mdm-pon.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, 2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -55,7 +55,7 @@ static int mdm9x55_toggle_soft_reset(struct mdm_ctrl *mdm, bool atomic) 
	if (!atomic)

		usleep_range(reset_time_us, reset_time_us + 100000);

	else

		mdelay(mdm->reset_time_ms);

		mdelay(DEF_MDM9X55_RESET_TIME);

	gpio_direction_output(MDM_GPIO(mdm, AP2MDM_SOFT_RESET),

			soft_reset_direction_de_assert);

	return 0;