Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f3f2582 authored Dec 21, 2011 by Peter De Schrijver (NVIDIA) Committed by Russell King Dec 23, 2011

ARM: 7241/1: mach-ux500 Use CONFIG_ARCH_NR_GPIO



Add default value for CONFIG_ARCH_NR_GPIO to Kconfig and remove the
definition in gpio.h. We can't remove gpio.h yet as asm/gpio.h still
includes it.

Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 3dea19e8

arch/arm/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -1568,6 +1568,7 @@ config LOCAL_TIMERS
		config ARCH_NR_GPIO
		int
		default 1024 if ARCH_SHMOBILE \|\| ARCH_TEGRA
		default 350 if ARCH_U8500
		default 0
		help
		Maximum number of GPIOs in the system.

arch/arm/mach-ux500/include/mach/gpio.h

+0 −5

Original line number	Diff line number	Diff line
		#ifndef __ASM_ARCH_GPIO_H
		#define __ASM_ARCH_GPIO_H

		/*
		* 288 (#267 is the highest one actually hooked up) onchip GPIOs, plus enough
		* room for a couple of GPIO expanders.
		*/
		#define ARCH_NR_GPIOS 350

		#endif /* __ASM_ARCH_GPIO_H */