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

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

Merge "Asoc: swr: Handle MBHC and IRQ interrupts from tx slave"

parents 8bd5b4d0 6824cec2

include/soc/soundwire.h

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/device.h>

#include <linux/mutex.h>

#include <linux/mod_devicetable.h>

#include <linux/irqdomain.h>



extern struct bus_type soundwire_type;
@@ -204,7 +205,7 @@ struct swr_device { 
	struct device    dev;

	unsigned long    addr;

	u8 group_id;

	u8 slave_irq;

	struct irq_domain *slave_irq;

};



static inline struct swr_device *to_swr_device(struct device *dev)

soc/swr-mstr-ctrl.c

+3 −1
Original line number Diff line number Diff line
@@ -1078,7 +1078,9 @@ static irqreturn_t swr_mstr_interrupt(int irq, void *dev) 
				if (swr_dev->dev_num != devnum)

					continue;

				if (swr_dev->slave_irq)

					handle_nested_irq(swr_dev->slave_irq);

					handle_nested_irq(

						irq_find_mapping(

						swr_dev->slave_irq, 0));

			}

			break;

		case SWRM_INTERRUPT_STATUS_NEW_SLAVE_ATTACHED: