From: Arnd Bergmann Date: Fri, 28 Sep 2018 15:58:52 +0000 (+0200) Subject: Merge tag 'omap-for-v4.20/omap1-signed' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.4-rc1~2315^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6ff514e27b859e36305629698f233f1dfe641ef;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'omap-for-v4.20/omap1-signed' of git://git./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 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 --- e6ff514e27b859e36305629698f233f1dfe641ef