diff options
author | Greg Kroah-Hartman <gregkh@google.com> | 2021-04-25 10:43:12 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-04-25 10:43:34 +0200 |
commit | 6ecf1ebff1ce1f52288d89d18eeaec54f1b0f161 (patch) | |
tree | f541b38c5437202cb43f7cf9c90d94f6245bc6fb /include/linux | |
parent | 6edc8254a333be892830318fb51a31b951eb3e5b (diff) | |
parent | 8db5efb83fa99e81c3f8dee92a6589b251f117f3 (diff) |
Merge 8db5efb83fa9 ("Merge tag 'pinctrl-v5.12-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl") into android-mainline
Steps on the way to 5.12-final.
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I69f5e15ec5fc7d321b4fe77c6dd8e6a38adf61ec
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/platform_data/gpio-omap.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h index 8b30b14b47d3..f377817ce75c 100644 --- a/include/linux/platform_data/gpio-omap.h +++ b/include/linux/platform_data/gpio-omap.h @@ -85,6 +85,7 @@ * omap2+ specific GPIO registers */ #define OMAP24XX_GPIO_REVISION 0x0000 +#define OMAP24XX_GPIO_SYSCONFIG 0x0010 #define OMAP24XX_GPIO_IRQSTATUS1 0x0018 #define OMAP24XX_GPIO_IRQSTATUS2 0x0028 #define OMAP24XX_GPIO_IRQENABLE2 0x002c @@ -108,6 +109,7 @@ #define OMAP24XX_GPIO_SETDATAOUT 0x0094 #define OMAP4_GPIO_REVISION 0x0000 +#define OMAP4_GPIO_SYSCONFIG 0x0010 #define OMAP4_GPIO_EOI 0x0020 #define OMAP4_GPIO_IRQSTATUSRAW0 0x0024 #define OMAP4_GPIO_IRQSTATUSRAW1 0x0028 @@ -148,6 +150,7 @@ #ifndef __ASSEMBLER__ struct omap_gpio_reg_offs { u16 revision; + u16 sysconfig; u16 direction; u16 datain; u16 dataout; |