kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A series of omap1 gpio changes for ams-delta

Browse source 
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__.
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAlurwEcRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXPk7xAA1BimwbriIuYK5h9j7o74h8nuv7GsFnkH
 rvntMWlK/XJ3ickOt1upLUyaITjTcb+FP6rKx7kASFaltzemStBU+E/GoQObQqXT
 rCYGcECIn4ffrVYGdvkBzUfTMvCE+OVRh6frenyBEFUxadHeive5h6eENQTuGDvi
 yu631PKMuxILNfT05HyZYTJq+hmkmkQjqYWV9rmAFg1DucAcUVsR5V+eYku3ZdC7
 SKXJMfigrnvjykLIhNqvLu+BbeZ20yrljcNOFET0t/T+ReFCR3phfL24FEf4NPza
 M3FASN+9xezsGfPSTYm6JxdY/oiFzLJ16kp5qqiqgVr4rESMhpGLkie1I7KDUPx8
 tnWz9hfH9RYzNjBjj/A4kC4ZA3uEWFKsbtJTj5EXo8um+rkiKOHSP+N/yjQMKglB
 odWde4WENqwsr7/N39vRRkVIJGwzK7eA3tQmLoLZJwBPn/gC+MB04CqIAhf+VIIK
 ZWyHGU0rQo7WD36GALna6ImvbzBwduzAlbsW3DFzqOH2L9K3d+VgSQjmk7Tk/8Da
 Ds4aih/AXq72yPQxvD/e0JSC0VVZn263tWxTl9yzutrSWyYEKdo0DRsaRVrs+9MJ
 2YHh5tcdRl5bSzdNLXZ8zM2Q5SdsulzEIph6RALtzJcYjA3uz3mz+G+W7HmjaFAj
 hUoMMLJ7Bm0=
 =fnSx
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2018-09-28 17:58:52 +02:00
commit e6ff514e27
4 changed files with 96 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/platform_data/gpio-omap.h
View file

@ -24,8 +24,10 @@
#ifndef __ASM_ARCH_OMAP_GPIO_H
#define __ASM_ARCH_OMAP_GPIO_H
#ifndef __ASSEMBLER__
#include <linux/io.h>
#include <linux/platform_device.h>
#endif
#define OMAP1_MPUIO_BASE 0xfffb5000
@ -157,6 +159,7 @@
#define OMAP_MPUIO(nr) (OMAP_MAX_GPIO_LINES + (nr))
#define OMAP_GPIO_IS_MPUIO(nr) ((nr) >= OMAP_MAX_GPIO_LINES)
#ifndef __ASSEMBLER__
struct omap_gpio_reg_offs {
u16 revision;
u16 direction;
@ -215,5 +218,6 @@ static inline void omap2_gpio_resume_after_idle(void)
{
}
#endif
#endif /* __ASSEMBLER__ */
#endif