Commit cdce2663 authored by Manivannan Sadhasivam's avatar Manivannan Sadhasivam
Browse files

Merge branch 'mhi-ath11k-immutable' into mhi-next

parents b91c3b30 6ffcc18d

drivers/bus/mhi/core/init.c

+7 −2
Original line number Diff line number Diff line
@@ -151,12 +151,17 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl) 
{

	struct mhi_event *mhi_event = mhi_cntrl->mhi_event;

	struct device *dev = &mhi_cntrl->mhi_dev->dev;

	unsigned long irq_flags = IRQF_SHARED | IRQF_NO_SUSPEND;

	int i, ret;



	/* if controller driver has set irq_flags, use it */

	if (mhi_cntrl->irq_flags)

		irq_flags = mhi_cntrl->irq_flags;



	/* Setup BHI_INTVEC IRQ */

	ret = request_threaded_irq(mhi_cntrl->irq[0], mhi_intvec_handler,

				   mhi_intvec_threaded_handler,

				   IRQF_SHARED | IRQF_NO_SUSPEND,

				   irq_flags,

				   "bhi", mhi_cntrl);

	if (ret)

		return ret;
@@ -174,7 +179,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl) 


		ret = request_irq(mhi_cntrl->irq[mhi_event->irq],

				  mhi_irq_handler,

				  IRQF_SHARED | IRQF_NO_SUSPEND,

				  irq_flags,

				  "mhi", mhi_event);

		if (ret) {

			dev_err(dev, "Error requesting irq:%d for ev:%d\n",

include/linux/mhi.h

+2 −0
Original line number Diff line number Diff line
@@ -354,6 +354,7 @@ struct mhi_controller_config { 
 * @fbc_download: MHI host needs to do complete image transfer (optional)

 * @pre_init: MHI host needs to do pre-initialization before power up

 * @wake_set: Device wakeup set flag

 * @irq_flags: irq flags passed to request_irq (optional)

 *

 * Fields marked as (required) need to be populated by the controller driver

 * before calling mhi_register_controller(). For the fields marked as (optional)
@@ -446,6 +447,7 @@ struct mhi_controller { 
	bool fbc_download;

	bool pre_init;

	bool wake_set;

	unsigned long irq_flags;

};



/**