diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-09-28 18:58:52 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-09-28 18:59:19 +0300 |
| commit | e6ff514e27b859e36305629698f233f1dfe641ef (patch) | |
| tree | e930e29d0b4b50f9615b3af600f8d83eea4f91c7 /include/linux/platform_data/syscon.h | |
| parent | 3a60f1182bce850c2f12343a78e157d40af7b1a0 (diff) | |
| parent | 1137ceee76ba8b8c698e11b7150e35524f071bda (diff) | |
| download | linux-e6ff514e27b859e36305629698f233f1dfe641ef.tar.xz | |
Merge tag 'omap-for-v4.20/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
A series of omap1 gpio changes for ams-delta
Janusz Krzysztofik has cleaned up ams-delta gpio usage along with
generic gpio framework improvments. This series contains the omap1
specific clean-up for ams-delta modem and unused gpios.
Note that this conflicts with the gpio-omap changes queued into
an immutable gpio branch ib-omap for the gpio-omap.h header file.
The merge resolution is to drop the IS_BUILTIN(CONFIG_GPIO_OMAP)
section and keep the #endif tagged for __ASSEMBLER__.
* tag 'omap-for-v4.20/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP1: ams-delta: Don't request unused GPIOs
ARM: OMAP1: ams-delta-fiq: Use <linux/platform_data/gpio-omap.h>
ARM: OMAP1: ams-delta: register MODEM device earlier
ARM: OMAP1: ams-delta: initialize latch2 pins to safe values
ARM: OMAP1: ams-delta: assign MODEM IRQ from GPIO descriptor
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/platform_data/syscon.h')
0 files changed, 0 insertions, 0 deletions