From f7853bfd2257b144bdea937cc2b540f0f3a7b97d Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Fri, 1 May 2020 14:48:52 -0700
Subject: [PATCH] ANDROID: GKI: add ARCH_NR_GPIO for ABI match

By setting ARCH_NR_GPIO to 1280 default preserve structure sizes.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 141888626
Change-Id: I7c4d300796be9245338c02e280639a5a5c98a38a
---
 arch/arm64/Kconfig | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 567e482a2e4a..6110a0bc00da 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -770,6 +770,18 @@ config HOTPLUG_CPU
 	  Say Y here to experiment with turning CPUs off and on.  CPUs
 	  can be controlled through /sys/devices/system/cpu.
 
+# The GPIO number here must be sorted by descending number. In case of
+# a multiplatform kernel, we just want the highest value required by the
+# selected platforms.
+config ARCH_NR_GPIO
+	int "Number of GPIOs in the system"
+	default 1280 if ARCH_QCOM
+	default 256
+	help
+	  Maximum number of GPIOs in the system.
+
+	  If unsure, leave the default value.
+
 # Common NUMA Features
 config NUMA
 	bool "Numa Memory Allocation and Scheduler Support"