summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/da850.c
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2018-12-11 20:58:20 +0100
committerWolfram Sang <wsa@the-dreams.de>2018-12-11 20:58:20 +0100
commit66693960f574aa830986e1603657af36423b24eb (patch)
tree035aae54d64d79e514f95e18cc3dcf411a98c55e /arch/arm/mach-davinci/da850.c
parent3ca3f86f7f4856222a8b697d60d32717160a1a1b (diff)
parent40e020c129cfc991e8ab4736d2665351ffd1468d (diff)
downloadlinux-66693960f574aa830986e1603657af36423b24eb.tar.gz
linux-66693960f574aa830986e1603657af36423b24eb.tar.bz2
linux-66693960f574aa830986e1603657af36423b24eb.zip
Merge tag 'v4.20-rc6' into i2c/for-5.0
Linux 4.20-rc6
Diffstat (limited to 'arch/arm/mach-davinci/da850.c')
-rw-r--r--arch/arm/mach-davinci/da850.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 4528bbf0c861..e7b78df2bfef 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -719,7 +719,9 @@ int __init da850_register_vpif_capture(struct vpif_capture_config
}
static struct davinci_gpio_platform_data da850_gpio_platform_data = {
- .ngpio = 144,
+ .no_auto_base = true,
+ .base = 0,
+ .ngpio = 144,
};
int __init da850_register_gpio(void)