ANDROID: Drop out of tree leftovers in drivers: pinctrl
The patch "FROMLIST: drivers: pinctrl: msm: setup GPIO chip in
hierarchy" got an equivalent change merged upstream. The merged version
upstream differs from our version.
Based on the comment in
https://lore.kernel.org/lkml/20191113183506.GA18786@codeaurora.org/, we
can drop this difference.
See the leftover patch here:
https://android.googlesource.com/kernel/common-patches/+/9df68ac052d13e6e5035d8c131a51cf55eb78c99/android-mainline/FROMLIST-drivers-pinctrl-msm-setup-GPIO-chip-in-hierarchy.patch
This we can drop with this merged.
Change-Id: If4c850701a6d095dccfe54cef9749513b3d89698
Cc: Lina Iyer <ilina@codeaurora.org>
Fixes: d3a196a371 ("Merge 5.5-rc1 into android-mainline")
Signed-off-by: Matthias Maennich <maennich@google.com>
This commit is contained in:
@@ -1174,16 +1174,6 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Since we are chained to the GIC using the TLMM summary line
|
||||
* and in hierarchy with the wakeup parent interrupt controller,
|
||||
* explicitly set the chained summary line. We need to do this because
|
||||
* the summary line is not routed to the wakeup parent but directly
|
||||
* to the GIC.
|
||||
*/
|
||||
gpiochip_set_chained_irqchip(chip, &pctrl->irq_chip, pctrl->irq,
|
||||
msm_gpio_irq_handler);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
#ifndef __PINCTRL_MSM_H__
|
||||
#define __PINCTRL_MSM_H__
|
||||
|
||||
#include <linux/gpio/driver.h>
|
||||
|
||||
struct pinctrl_pin_desc;
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user