Commit 250ccd4f authored Apr 21, 2011 by Philipp Zabel Committed by Eric Miao Jul 11, 2011

ARM: pxa/magician: fix MAGICIAN_EGPIO_BASE, align with NR_BUILTIN_GPIO



Commit "ARM: pxa: align NR_BUILTIN_GPIO with GPIO interrupt number"
increased NR_BUILTIN_GPIO from 128 to PXA_GPIO_IRQ_NUM (192).
Adjust the previously hardcoded MAGICIAN_EGPIO_BASE accordingly.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

parent b52f0db5

arch/arm/mach-pxa/include/mach/magician.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,7 @@
		#ifndef _MAGICIAN_H_
		#define _MAGICIAN_H_

		#include <linux/gpio.h>
		#include <mach/irqs.h>

		/*
		@@ -77,7 +78,7 @@
		* CPLD EGPIOs
		*/

		#define MAGICIAN_EGPIO_BASE 0x80 /* GPIO_BOARD_START */
		#define MAGICIAN_EGPIO_BASE NR_BUILTIN_GPIO
		#define MAGICIAN_EGPIO(reg,bit) \
		(MAGICIAN_EGPIO_BASE + 8*reg + bit)