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

Commit c8bb9635 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Ben Dooks
Browse files

ARM: S5PC100: gpio.h cleanup 



This patch renames gpio related registers from s5pc1xx to s5pc100 to
better match the plat-s5p framework style. GPIO_MP* defines now used
anywhere thus has been removed.

Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 79044490

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

+42 −53
Original line number Original line Diff line number Diff line
@@ -12,6 +12,9 @@ 
 * published by the Free Software Foundation.

 * published by the Free Software Foundation.

*/

*/





#ifndef __ASM_ARCH_GPIO_H

#define __ASM_ARCH_GPIO_H __FILE__



#define gpio_get_value	__gpio_get_value

#define gpio_get_value	__gpio_get_value

#define gpio_set_value	__gpio_set_value

#define gpio_set_value	__gpio_set_value

#define gpio_cansleep	__gpio_cansleep

#define gpio_cansleep	__gpio_cansleep
@@ -52,11 +55,6 @@ 
#define S5PC100_GPIO_L2_NR	(8)

#define S5PC100_GPIO_L2_NR	(8)

#define S5PC100_GPIO_L3_NR	(8)

#define S5PC100_GPIO_L3_NR	(8)

#define S5PC100_GPIO_L4_NR	(8)

#define S5PC100_GPIO_L4_NR	(8)

#define S5PC100_GPIO_MP00_NR	(8)

#define S5PC100_GPIO_MP01_NR	(8)

#define S5PC100_GPIO_MP02_NR	(8)

#define S5PC100_GPIO_MP03_NR	(8)

#define S5PC100_GPIO_MP04_NR	(5)





/* GPIO bank numbes */

/* GPIO bank numbes */
@@ -65,50 +63,45 @@ 
 * change from one gpio bank to another can be caught.

 * change from one gpio bank to another can be caught.

*/

*/





#define S5PC1XX_GPIO_NEXT(__gpio) \

#define S5PC100_GPIO_NEXT(__gpio) \

	((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1)

	((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1)





enum s3c_gpio_number {

enum s5p_gpio_number {

	S5PC100_GPIO_A0_START	= 0,

	S5PC100_GPIO_A0_START	= 0,

	S5PC100_GPIO_A1_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_A0),

	S5PC100_GPIO_A1_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_A0),

	S5PC100_GPIO_B_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_A1),

	S5PC100_GPIO_B_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_A1),

	S5PC100_GPIO_C_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_B),

	S5PC100_GPIO_C_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_B),

	S5PC100_GPIO_D_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_C),

	S5PC100_GPIO_D_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_C),

	S5PC100_GPIO_E0_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_D),

	S5PC100_GPIO_E0_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_D),

	S5PC100_GPIO_E1_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_E0),

	S5PC100_GPIO_E1_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_E0),

	S5PC100_GPIO_F0_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_E1),

	S5PC100_GPIO_F0_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_E1),

	S5PC100_GPIO_F1_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_F0),

	S5PC100_GPIO_F1_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_F0),

	S5PC100_GPIO_F2_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_F1),

	S5PC100_GPIO_F2_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_F1),

	S5PC100_GPIO_F3_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_F2),

	S5PC100_GPIO_F3_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_F2),

	S5PC100_GPIO_G0_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_F3),

	S5PC100_GPIO_G0_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_F3),

	S5PC100_GPIO_G1_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_G0),

	S5PC100_GPIO_G1_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_G0),

	S5PC100_GPIO_G2_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_G1),

	S5PC100_GPIO_G2_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_G1),

	S5PC100_GPIO_G3_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_G2),

	S5PC100_GPIO_G3_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_G2),

	S5PC100_GPIO_H0_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_G3),

	S5PC100_GPIO_H0_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_G3),

	S5PC100_GPIO_H1_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_H0),

	S5PC100_GPIO_H1_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_H0),

	S5PC100_GPIO_H2_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_H1),

	S5PC100_GPIO_H2_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_H1),

	S5PC100_GPIO_H3_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_H2),

	S5PC100_GPIO_H3_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_H2),

	S5PC100_GPIO_I_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_H3),

	S5PC100_GPIO_I_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_H3),

	S5PC100_GPIO_J0_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_I),

	S5PC100_GPIO_J0_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_I),

	S5PC100_GPIO_J1_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_J0),

	S5PC100_GPIO_J1_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_J0),

	S5PC100_GPIO_J2_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_J1),

	S5PC100_GPIO_J2_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_J1),

	S5PC100_GPIO_J3_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_J2),

	S5PC100_GPIO_J3_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_J2),

	S5PC100_GPIO_J4_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_J3),

	S5PC100_GPIO_J4_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_J3),

	S5PC100_GPIO_K0_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_J4),

	S5PC100_GPIO_K0_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_J4),

	S5PC100_GPIO_K1_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_K0),

	S5PC100_GPIO_K1_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_K0),

	S5PC100_GPIO_K2_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_K1),

	S5PC100_GPIO_K2_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_K1),

	S5PC100_GPIO_K3_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_K2),

	S5PC100_GPIO_K3_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_K2),

	S5PC100_GPIO_L0_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_K3),

	S5PC100_GPIO_L0_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_K3),

	S5PC100_GPIO_L1_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L0),

	S5PC100_GPIO_L1_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_L0),

	S5PC100_GPIO_L2_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L1),

	S5PC100_GPIO_L2_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_L1),

	S5PC100_GPIO_L3_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L2),

	S5PC100_GPIO_L3_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_L2),

	S5PC100_GPIO_L4_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L3),

	S5PC100_GPIO_L4_START	= S5PC100_GPIO_NEXT(S5PC100_GPIO_L3),

	S5PC100_GPIO_MP00_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L4),

	S5PC100_GPIO_END	= S5PC100_GPIO_NEXT(S5PC100_GPIO_L4),

	S5PC100_GPIO_MP01_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP00),

	S5PC100_GPIO_MP02_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP01),

	S5PC100_GPIO_MP03_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP02),

	S5PC100_GPIO_MP04_START	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP03),

	S5PC100_GPIO_END	= S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP04),

};

};





/* S5PC100 GPIO number definitions. */

/* S5PC100 GPIO number definitions. */
@@ -146,17 +139,13 @@ enum s3c_gpio_number { 
#define S5PC100_GPL2(_nr)	(S5PC100_GPIO_L2_START + (_nr))

#define S5PC100_GPL2(_nr)	(S5PC100_GPIO_L2_START + (_nr))

#define S5PC100_GPL3(_nr)	(S5PC100_GPIO_L3_START + (_nr))

#define S5PC100_GPL3(_nr)	(S5PC100_GPIO_L3_START + (_nr))

#define S5PC100_GPL4(_nr)	(S5PC100_GPIO_L4_START + (_nr))

#define S5PC100_GPL4(_nr)	(S5PC100_GPIO_L4_START + (_nr))

#define S5PC100_MP00(_nr)	(S5PC100_GPIO_MP00_START + (_nr))

#define S5PC100_MP01(_nr)	(S5PC100_GPIO_MP01_START + (_nr))

#define S5PC100_MP02(_nr)	(S5PC100_GPIO_MP02_START + (_nr))

#define S5PC100_MP03(_nr)	(S5PC100_GPIO_MP03_START + (_nr))

#define S5PC100_MP04(_nr)	(S5PC100_GPIO_MP04_START + (_nr))

#define S5PC100_MP05(_nr)	(S5PC100_GPIO_MP05_START + (_nr))





/* It used the end of the S5PC1XX gpios */

/* It used the end of the S5PC100 gpios */

#define S3C_GPIO_END		S5PC100_GPIO_END

#define S3C_GPIO_END		S5PC100_GPIO_END





/* define the number of gpios we need to the one after the MP04() range */

/* define the number of gpios we need to the one after the MP04() range */

#define ARCH_NR_GPIOS		(S5PC100_GPIO_END + 1)

#define ARCH_NR_GPIOS		(S5PC100_GPIO_END + 1)





#include <asm-generic/gpio.h>

#include <asm-generic/gpio.h>



#endif /* __ASM_ARCH_GPIO_H */

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -3,11 +3,11 @@ 
 * Copyright 2009 Samsung Electronics Co.

 * Copyright 2009 Samsung Electronics Co.

 *      Byungho Min <bhmin@samsung.com>

 *      Byungho Min <bhmin@samsung.com>

 *

 *

 * S5PC1XX - GPIO register definitions

 * S5PC100 - GPIO register definitions

 */

 */





#ifndef __ASM_PLAT_S5PC1XX_REGS_GPIO_H

#ifndef __ASM_MACH_S5PC100_REGS_GPIO_H

#define __ASM_PLAT_S5PC1XX_REGS_GPIO_H __FILE__

#define __ASM_MACH_S5PC100_REGS_GPIO_H __FILE__





#include <mach/map.h>

#include <mach/map.h>
@@ -66,5 +66,5 @@ 
#define S5PC100_GPx_OUTPUT(__gpio)	(0x1 << ((__gpio) * 4))

#define S5PC100_GPx_OUTPUT(__gpio)	(0x1 << ((__gpio) * 4))

#define S5PC100_GPx_CONMASK(__gpio)	(0xf << ((__gpio) * 4))

#define S5PC100_GPx_CONMASK(__gpio)	(0xf << ((__gpio) * 4))





#endif /* __ASM_PLAT_S5PC1XX_REGS_GPIO_H */

#endif /* __ASM_MACH_S5PC100_REGS_GPIO_H */