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

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

Merge "pinctrl: qcom: Fix msm_gpio_wakeirq to correctly find parent hwirq"

parents c0a5358a dcf29b07

drivers/irqchip/qcom-mpm-sdxnightjar.c

+4 −4
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 


#include <soc/qcom/mpm.h>

const struct mpm_pin mpm_sdxnightjar_gic_chip_data[] = {

	{2, 216}, /* tsens_upper_lower_int */

	{88, 222},   /* ee0_krait_hlos_spmi_periph_irq */

	{54, 235},   /* qmp_usb3_lfps_rxterm_irq */

	{49, 234},   /* qusb2_phy_dpse_hv qusb2phy_intr */

	{2, 184}, /* tsens_upper_lower_int */

	{88, 190},   /* ee0_krait_hlos_spmi_periph_irq */

	{54, 203},   /* qmp_usb3_lfps_rxterm_irq */

	{49, 202},   /* qusb2_phy_dpse_hv qusb2phy_intr */

	{-1},

};

drivers/pinctrl/qcom/pinctrl-msm.c

+3 −1
Original line number Diff line number Diff line
@@ -1284,11 +1284,13 @@ static int msm_gpio_wakeirq(struct gpio_chip *gc, 
	struct msm_pinctrl *pctrl = gpiochip_get_data(gc);

	const struct msm_gpio_wakeirq_map *map;

	int i;

	bool skip;



	*parent = GPIO_NO_WAKE_IRQ;

	*parent_type = IRQ_TYPE_EDGE_RISING;



	if (!test_bit(child, pctrl->skip_wake_irqs))

	skip = irq_domain_qcom_handle_wakeup(gc->irq.parent_domain);

	if (!test_bit(child, pctrl->skip_wake_irqs) && skip)

		return 0;



	for (i = 0; i < pctrl->soc->nwakeirq_map; i++) {