mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00

* kernel: bump 5.10 to 5.10.143 All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> * kernel: refresh 5.10 patches All patches automatically rebased. Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Signed-off-by: John Audia <therealgraysky@proton.me> Signed-off-by: Linhui Liu <liulinhui36@gmail.com> Co-authored-by: John Audia <therealgraysky@proton.me>
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
--- a/drivers/bus/mhi/core/init.c
|
|
+++ b/drivers/bus/mhi/core/init.c
|
|
@@ -148,12 +148,17 @@ int mhi_init_irq_setup(struct mhi_contro
|
|
{
|
|
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;
|
|
@@ -171,7 +176,7 @@ int mhi_init_irq_setup(struct mhi_contro
|
|
|
|
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",
|
|
--- a/include/linux/mhi.h
|
|
+++ b/include/linux/mhi.h
|
|
@@ -353,6 +353,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)
|
|
@@ -442,6 +443,7 @@ struct mhi_controller {
|
|
bool fbc_download;
|
|
bool pre_init;
|
|
bool wake_set;
|
|
+ unsigned long irq_flags;
|
|
};
|
|
|
|
/**
|