diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-14 23:44:34 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-14 23:44:34 +0200 |
| commit | 5306c6ad0e4b10748849e98679d8ff788695fb44 (patch) | |
| tree | 4fadc093200c38982a1e966800890ceba4414667 /MAINTAINERS | |
| parent | Merge tag 'imx-maintainer-4.19' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ARM: OMAP1: ams-delta: move late devices back to init_machine (diff) | |
| download | linux-5306c6ad0e4b10748849e98679d8ff788695fb44.tar.xz linux-5306c6ad0e4b10748849e98679d8ff788695fb44.zip | |
Merge tag 'omap-for-v4.19/omap1-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
SoC updates for omap1 for v4.19 merge window
Mostly a series by Janusz Krzysztofik to clean up the
GPIO and input handling for ams-delta. Because of the
platform data changes, we decided that it's best to
merge the related input changes also via the arm-soc
tree so Dmitry Torokhov has acked the input changes.
Also included is a change to constify gpio_leds from
Arvind Yadav.
* tag 'omap-for-v4.19/omap1-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP1: ams-delta: move late devices back to init_machine
Input: ams_delta_serio: Get FIQ buffer from platform_data
Input: ams_delta_serio: use IRQ resource
ARM: OMAP1: Get rid of <mach/ams-delta-fiq.h>
ARM: OMAP1: ams-delta FIQ: Keep serio input GPIOs requested
ARM: OMAP1: ams-delta FIQ: don't use static GPIO numbers
ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin
Input: ams_delta_serio: Replace power GPIO with regulator
Input: ams_delta_serio: use private structure
Input: ams_delta_serio: convert to platform driver
ARM: OMAP1: ams-delta: drop GPIO lookup table for serio device
ARM: OMAP1: ams-delta: assign LED GPIO numbers from descriptors
ARM: OMAP1: ams-delta: refactor late_init()
ARM: OMAP1: constify gpio_led
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 69b28f436b90..1ed9c14ed315 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10406,6 +10406,7 @@ F: arch/arm/plat-omap/ F: arch/arm/configs/omap1_defconfig F: drivers/i2c/busses/i2c-omap.c F: include/linux/platform_data/i2c-omap.h +F: include/linux/platform_data/ams-delta-fiq.h OMAP2+ SUPPORT M: Tony Lindgren <tony@atomide.com> |