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

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

Merge "drivers: soc: qcom: Rename wakeup sideband notification"

parents 8f2c82f4 bf97bd1e

drivers/soc/qcom/sdx_ext_ipc.c

+2 −4
Original line number Diff line number Diff line
@@ -142,15 +142,13 @@ static int sideband_notify(struct notifier_block *nb, 


	switch (action) {



	case EVT_WAKE_UP:

	case EVENT_REQUEST_WAKE_UP:

		gpio_set_value(mdm->gpios[WAKEUP_OUT], 1);

		usleep_range(10000, 20000);

		gpio_set_value(mdm->gpios[WAKEUP_OUT], 0);

		break;

	default:

		dev_info(mdm->dev, "Invalid action passed %d\n",

				action);

	}



	return NOTIFY_OK;

}

drivers/usb/gadget/function/f_ipc.c

+2 −2
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static int ipc_write(struct platform_device *pdev, char *buf, 
		/* Notify GPIO driver to wakup the host if host

		 * is in suspend mode.

		 */

		sb_notifier_call_chain(EVT_WAKE_UP, NULL);

		sb_notifier_call_chain(EVENT_REQUEST_WAKE_UP, NULL);

		wait_event_interruptible(ipc_dev->state_wq, ipc_dev->online ||

				ipc_dev->current_state == IPC_DISCONNECTED);

		pr_debug("%s: Interface ready, Retry IN request\n", __func__);
@@ -298,7 +298,7 @@ static int ipc_write(struct platform_device *pdev, char *buf, 
	 * completion structure.

	 */

	} else if (ipc_dev->connected && !ipc_dev->online) {

		sb_notifier_call_chain(EVT_WAKE_UP, NULL);

		sb_notifier_call_chain(EVENT_REQUEST_WAKE_UP, NULL);

		reinit_completion(&ipc_dev->write_done);

		goto retry_write_done;

	}

include/soc/qcom/sb_notification.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#define _SB_NOTIFICATION_H



/* Indicates a system wake up event */

#define EVT_WAKE_UP 0x01

#define EVENT_REQUEST_WAKE_UP 0x01



#ifdef CONFIG_QTI_NOTIFY_SIDEBAND

/**