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

Commit 67c2addc authored by Ben Dooks's avatar Ben Dooks
Browse files

[ARM] S3C24XX: Add S3C_GPIO_END definition 



Add the definition for S3C_GPIO_END to allow the PM code to build.

This means moving the GPIO bank numbers to a separate file to allow
the gpio and regs-gpio to include them. Including regs-gpio.h into
gpio.h causes too many build problems and adding gpio.h would mean
editing a large number of files.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent d2b07fe2

arch/arm/mach-s3c2410/include/mach/gpio-nrs.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/gpio-nrs.h

 *

 * Copyright (c) 2008 Simtec Electronics

 *	http://armlinux.simtec.co.uk/

 *	Ben Dooks <ben@simtec.co.uk>

 *

 * S3C2410 - GPIO bank numbering

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#define S3C2410_GPIONO(bank,offset) ((bank) + (offset))



#define S3C2410_GPIO_BANKA   (32*0)

#define S3C2410_GPIO_BANKB   (32*1)

#define S3C2410_GPIO_BANKC   (32*2)

#define S3C2410_GPIO_BANKD   (32*3)

#define S3C2410_GPIO_BANKE   (32*4)

#define S3C2410_GPIO_BANKF   (32*5)

#define S3C2410_GPIO_BANKG   (32*6)

#define S3C2410_GPIO_BANKH   (32*7)

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

+3 −0
Original line number Diff line number Diff line
@@ -23,3 +23,6 @@ 
#define ARCH_NR_GPIOS	(256 + CONFIG_S3C24XX_GPIO_EXTRA)



#include <asm-generic/gpio.h>

#include <mach/gpio-nrs.h>



#define S3C_GPIO_END	(S3C2410_GPIO_BANKH + 32)

arch/arm/mach-s3c2410/include/mach/regs-gpio.h

+1 −10
Original line number Diff line number Diff line
@@ -14,16 +14,7 @@ 
#ifndef __ASM_ARCH_REGS_GPIO_H

#define __ASM_ARCH_REGS_GPIO_H



#define S3C2410_GPIONO(bank,offset) ((bank) + (offset))



#define S3C2410_GPIO_BANKA   (32*0)

#define S3C2410_GPIO_BANKB   (32*1)

#define S3C2410_GPIO_BANKC   (32*2)

#define S3C2410_GPIO_BANKD   (32*3)

#define S3C2410_GPIO_BANKE   (32*4)

#define S3C2410_GPIO_BANKF   (32*5)

#define S3C2410_GPIO_BANKG   (32*6)

#define S3C2410_GPIO_BANKH   (32*7)

#include <mach/gpio-nrs.h>



#ifdef CONFIG_CPU_S3C2400

#define S3C24XX_GPIO_BASE(x)  S3C2400_GPIO_BASE(x)