shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: Drop out of tree leftovers in drivers: pinctrl

Browse Source 
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:
9df68ac052/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:
Matthias Maennich
2019-12-10 10:59:17 +00:00
parent 23994434c7
commit a842509e8f
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pinctrl/qcom/pinctrl-msm.c
View File

@@ -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;
}

2
drivers/pinctrl/qcom/pinctrl-msm.h
View File

@@ -5,8 +5,6 @@
#ifndef __PINCTRL_MSM_H__
#define __PINCTRL_MSM_H__
#include <linux/gpio/driver.h>
struct pinctrl_pin_desc;
/**