phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SAMSUNG: make s5p common gpio functions 

Because of s5pc1xx gpio is same as s5p seires SoC,
move gpio functions to drvier/gpio/
and modify structure's name from s5pc1xx_ to s5p_.

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
This commit is contained in:
Minkyu Kang 2010-03-24 15:31:06 +09:00 committed by trix
parent 46a3b5c8df
commit 3bb6b037e8
4 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/cpu/arm_cortexa8/s5pc1xx/Makefile
View File

@ -33,7 +33,6 @@ SOBJS += reset.o
COBJS += clock.o
COBJS += cpu_info.o
COBJS += gpio.o
COBJS += sromc.o
COBJS += timer.o

192
arch/arm/include/asm/arch-s5pc1xx/gpio.h
View File

@ -22,7 +22,7 @@
#define __ASM_ARCH_GPIO_H
#ifndef __ASSEMBLY__
struct s5pc1xx_gpio_bank {
struct s5p_gpio_bank {
unsigned int con;
unsigned int dat;
unsigned int pull;
@ -33,107 +33,107 @@ struct s5pc1xx_gpio_bank {
};
struct s5pc100_gpio {
struct s5pc1xx_gpio_bank gpio_a0;
struct s5pc1xx_gpio_bank gpio_a1;
struct s5pc1xx_gpio_bank gpio_b;
struct s5pc1xx_gpio_bank gpio_c;
struct s5pc1xx_gpio_bank gpio_d;
struct s5pc1xx_gpio_bank gpio_e0;
struct s5pc1xx_gpio_bank gpio_e1;
struct s5pc1xx_gpio_bank gpio_f0;
struct s5pc1xx_gpio_bank gpio_f1;
struct s5pc1xx_gpio_bank gpio_f2;
struct s5pc1xx_gpio_bank gpio_f3;
struct s5pc1xx_gpio_bank gpio_g0;
struct s5pc1xx_gpio_bank gpio_g1;
struct s5pc1xx_gpio_bank gpio_g2;
struct s5pc1xx_gpio_bank gpio_g3;
struct s5pc1xx_gpio_bank gpio_i;
struct s5pc1xx_gpio_bank gpio_j0;
struct s5pc1xx_gpio_bank gpio_j1;
struct s5pc1xx_gpio_bank gpio_j2;
struct s5pc1xx_gpio_bank gpio_j3;
struct s5pc1xx_gpio_bank gpio_j4;
struct s5pc1xx_gpio_bank gpio_k0;
struct s5pc1xx_gpio_bank gpio_k1;
struct s5pc1xx_gpio_bank gpio_k2;
struct s5pc1xx_gpio_bank gpio_k3;
struct s5pc1xx_gpio_bank gpio_l0;
struct s5pc1xx_gpio_bank gpio_l1;
struct s5pc1xx_gpio_bank gpio_l2;
struct s5pc1xx_gpio_bank gpio_l3;
struct s5pc1xx_gpio_bank gpio_l4;
struct s5pc1xx_gpio_bank gpio_h0;
struct s5pc1xx_gpio_bank gpio_h1;
struct s5pc1xx_gpio_bank gpio_h2;
struct s5pc1xx_gpio_bank gpio_h3;
struct s5p_gpio_bank gpio_a0;
struct s5p_gpio_bank gpio_a1;
struct s5p_gpio_bank gpio_b;
struct s5p_gpio_bank gpio_c;
struct s5p_gpio_bank gpio_d;
struct s5p_gpio_bank gpio_e0;
struct s5p_gpio_bank gpio_e1;
struct s5p_gpio_bank gpio_f0;
struct s5p_gpio_bank gpio_f1;
struct s5p_gpio_bank gpio_f2;
struct s5p_gpio_bank gpio_f3;
struct s5p_gpio_bank gpio_g0;
struct s5p_gpio_bank gpio_g1;
struct s5p_gpio_bank gpio_g2;
struct s5p_gpio_bank gpio_g3;
struct s5p_gpio_bank gpio_i;
struct s5p_gpio_bank gpio_j0;
struct s5p_gpio_bank gpio_j1;
struct s5p_gpio_bank gpio_j2;
struct s5p_gpio_bank gpio_j3;
struct s5p_gpio_bank gpio_j4;
struct s5p_gpio_bank gpio_k0;
struct s5p_gpio_bank gpio_k1;
struct s5p_gpio_bank gpio_k2;
struct s5p_gpio_bank gpio_k3;
struct s5p_gpio_bank gpio_l0;
struct s5p_gpio_bank gpio_l1;
struct s5p_gpio_bank gpio_l2;
struct s5p_gpio_bank gpio_l3;
struct s5p_gpio_bank gpio_l4;
struct s5p_gpio_bank gpio_h0;
struct s5p_gpio_bank gpio_h1;
struct s5p_gpio_bank gpio_h2;
struct s5p_gpio_bank gpio_h3;
};
struct s5pc110_gpio {
struct s5pc1xx_gpio_bank gpio_a0;
struct s5pc1xx_gpio_bank gpio_a1;
struct s5pc1xx_gpio_bank gpio_b;
struct s5pc1xx_gpio_bank gpio_c0;
struct s5pc1xx_gpio_bank gpio_c1;
struct s5pc1xx_gpio_bank gpio_d0;
struct s5pc1xx_gpio_bank gpio_d1;
struct s5pc1xx_gpio_bank gpio_e0;
struct s5pc1xx_gpio_bank gpio_e1;
struct s5pc1xx_gpio_bank gpio_f0;
struct s5pc1xx_gpio_bank gpio_f1;
struct s5pc1xx_gpio_bank gpio_f2;
struct s5pc1xx_gpio_bank gpio_f3;
struct s5pc1xx_gpio_bank gpio_g0;
struct s5pc1xx_gpio_bank gpio_g1;
struct s5pc1xx_gpio_bank gpio_g2;
struct s5pc1xx_gpio_bank gpio_g3;
struct s5pc1xx_gpio_bank gpio_i;
struct s5pc1xx_gpio_bank gpio_j0;
struct s5pc1xx_gpio_bank gpio_j1;
struct s5pc1xx_gpio_bank gpio_j2;
struct s5pc1xx_gpio_bank gpio_j3;
struct s5pc1xx_gpio_bank gpio_j4;
struct s5pc1xx_gpio_bank gpio_mp0_1;
struct s5pc1xx_gpio_bank gpio_mp0_2;
struct s5pc1xx_gpio_bank gpio_mp0_3;
struct s5pc1xx_gpio_bank gpio_mp0_4;
struct s5pc1xx_gpio_bank gpio_mp0_5;
struct s5pc1xx_gpio_bank gpio_mp0_6;
struct s5pc1xx_gpio_bank gpio_mp0_7;
struct s5pc1xx_gpio_bank gpio_mp1_0;
struct s5pc1xx_gpio_bank gpio_mp1_1;
struct s5pc1xx_gpio_bank gpio_mp1_2;
struct s5pc1xx_gpio_bank gpio_mp1_3;
struct s5pc1xx_gpio_bank gpio_mp1_4;
struct s5pc1xx_gpio_bank gpio_mp1_5;
struct s5pc1xx_gpio_bank gpio_mp1_6;
struct s5pc1xx_gpio_bank gpio_mp1_7;
struct s5pc1xx_gpio_bank gpio_mp1_8;
struct s5pc1xx_gpio_bank gpio_mp2_0;
struct s5pc1xx_gpio_bank gpio_mp2_1;
struct s5pc1xx_gpio_bank gpio_mp2_2;
struct s5pc1xx_gpio_bank gpio_mp2_3;
struct s5pc1xx_gpio_bank gpio_mp2_4;
struct s5pc1xx_gpio_bank gpio_mp2_5;
struct s5pc1xx_gpio_bank gpio_mp2_6;
struct s5pc1xx_gpio_bank gpio_mp2_7;
struct s5pc1xx_gpio_bank gpio_mp2_8;
struct s5pc1xx_gpio_bank res1[48];
struct s5pc1xx_gpio_bank gpio_h0;
struct s5pc1xx_gpio_bank gpio_h1;
struct s5pc1xx_gpio_bank gpio_h2;
struct s5pc1xx_gpio_bank gpio_h3;
struct s5p_gpio_bank gpio_a0;
struct s5p_gpio_bank gpio_a1;
struct s5p_gpio_bank gpio_b;
struct s5p_gpio_bank gpio_c0;
struct s5p_gpio_bank gpio_c1;
struct s5p_gpio_bank gpio_d0;
struct s5p_gpio_bank gpio_d1;
struct s5p_gpio_bank gpio_e0;
struct s5p_gpio_bank gpio_e1;
struct s5p_gpio_bank gpio_f0;
struct s5p_gpio_bank gpio_f1;
struct s5p_gpio_bank gpio_f2;
struct s5p_gpio_bank gpio_f3;
struct s5p_gpio_bank gpio_g0;
struct s5p_gpio_bank gpio_g1;
struct s5p_gpio_bank gpio_g2;
struct s5p_gpio_bank gpio_g3;
struct s5p_gpio_bank gpio_i;
struct s5p_gpio_bank gpio_j0;
struct s5p_gpio_bank gpio_j1;
struct s5p_gpio_bank gpio_j2;
struct s5p_gpio_bank gpio_j3;
struct s5p_gpio_bank gpio_j4;
struct s5p_gpio_bank gpio_mp0_1;
struct s5p_gpio_bank gpio_mp0_2;
struct s5p_gpio_bank gpio_mp0_3;
struct s5p_gpio_bank gpio_mp0_4;
struct s5p_gpio_bank gpio_mp0_5;
struct s5p_gpio_bank gpio_mp0_6;
struct s5p_gpio_bank gpio_mp0_7;
struct s5p_gpio_bank gpio_mp1_0;
struct s5p_gpio_bank gpio_mp1_1;
struct s5p_gpio_bank gpio_mp1_2;
struct s5p_gpio_bank gpio_mp1_3;
struct s5p_gpio_bank gpio_mp1_4;
struct s5p_gpio_bank gpio_mp1_5;
struct s5p_gpio_bank gpio_mp1_6;
struct s5p_gpio_bank gpio_mp1_7;
struct s5p_gpio_bank gpio_mp1_8;
struct s5p_gpio_bank gpio_mp2_0;
struct s5p_gpio_bank gpio_mp2_1;
struct s5p_gpio_bank gpio_mp2_2;
struct s5p_gpio_bank gpio_mp2_3;
struct s5p_gpio_bank gpio_mp2_4;
struct s5p_gpio_bank gpio_mp2_5;
struct s5p_gpio_bank gpio_mp2_6;
struct s5p_gpio_bank gpio_mp2_7;
struct s5p_gpio_bank gpio_mp2_8;
struct s5p_gpio_bank res1[48];
struct s5p_gpio_bank gpio_h0;
struct s5p_gpio_bank gpio_h1;
struct s5p_gpio_bank gpio_h2;
struct s5p_gpio_bank gpio_h3;
};
/* functions */
void gpio_cfg_pin(struct s5pc1xx_gpio_bank *bank, int gpio, int cfg);
void gpio_direction_output(struct s5pc1xx_gpio_bank *bank, int gpio, int en);
void gpio_direction_input(struct s5pc1xx_gpio_bank *bank, int gpio);
void gpio_set_value(struct s5pc1xx_gpio_bank *bank, int gpio, int en);
unsigned int gpio_get_value(struct s5pc1xx_gpio_bank *bank, int gpio);
void gpio_set_pull(struct s5pc1xx_gpio_bank *bank, int gpio, int mode);
void gpio_set_drv(struct s5pc1xx_gpio_bank *bank, int gpio, int mode);
void gpio_set_rate(struct s5pc1xx_gpio_bank *bank, int gpio, int mode);
void gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg);
void gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en);
void gpio_direction_input(struct s5p_gpio_bank *bank, int gpio);
void gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en);
unsigned int gpio_get_value(struct s5p_gpio_bank *bank, int gpio);
void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode);
void gpio_set_drv(struct s5p_gpio_bank *bank, int gpio, int mode);
void gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode);
#endif
/* Pin configurations */

1
drivers/gpio/Makefile
View File

@ -29,6 +29,7 @@ COBJS-$(CONFIG_AT91_GPIO) += at91_gpio.o
COBJS-$(CONFIG_KIRKWOOD_GPIO) += kw_gpio.o
COBJS-$(CONFIG_MX31_GPIO) += mx31_gpio.o
COBJS-$(CONFIG_PCA953X) += pca953x.o
COBJS-$(CONFIG_S5PC1XX) += s5p_gpio.o
COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c)

16
arch/arm/cpu/arm_cortexa8/s5pc1xx/gpio.c → drivers/gpio/s5p_gpio.c
View File

@ -36,7 +36,7 @@
#define RATE_MASK(x) (0x1 << (x + 16))
#define RATE_SET(x) (0x1 << (x + 16))
void gpio_cfg_pin(struct s5pc1xx_gpio_bank *bank, int gpio, int cfg)
void gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg)
{
unsigned int value;
@ -46,7 +46,7 @@ void gpio_cfg_pin(struct s5pc1xx_gpio_bank *bank, int gpio, int cfg)
writel(value, &bank->con);
}
void gpio_direction_output(struct s5pc1xx_gpio_bank *bank, int gpio, int en)
void gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en)
{
unsigned int value;
@ -59,12 +59,12 @@ void gpio_direction_output(struct s5pc1xx_gpio_bank *bank, int gpio, int en)
writel(value, &bank->dat);
}
void gpio_direction_input(struct s5pc1xx_gpio_bank *bank, int gpio)
void gpio_direction_input(struct s5p_gpio_bank *bank, int gpio)
{
gpio_cfg_pin(bank, gpio, GPIO_INPUT);
}
void gpio_set_value(struct s5pc1xx_gpio_bank *bank, int gpio, int en)
void gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en)
{
unsigned int value;
@ -75,7 +75,7 @@ void gpio_set_value(struct s5pc1xx_gpio_bank *bank, int gpio, int en)
writel(value, &bank->dat);
}
unsigned int gpio_get_value(struct s5pc1xx_gpio_bank *bank, int gpio)
unsigned int gpio_get_value(struct s5p_gpio_bank *bank, int gpio)
{
unsigned int value;
@ -83,7 +83,7 @@ unsigned int gpio_get_value(struct s5pc1xx_gpio_bank *bank, int gpio)
return !!(value & DAT_MASK(gpio));
}
void gpio_set_pull(struct s5pc1xx_gpio_bank *bank, int gpio, int mode)
void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode)
{
unsigned int value;
@ -102,7 +102,7 @@ void gpio_set_pull(struct s5pc1xx_gpio_bank *bank, int gpio, int mode)
writel(value, &bank->pull);
}
void gpio_set_drv(struct s5pc1xx_gpio_bank *bank, int gpio, int mode)
void gpio_set_drv(struct s5p_gpio_bank *bank, int gpio, int mode)
{
unsigned int value;
@ -123,7 +123,7 @@ void gpio_set_drv(struct s5pc1xx_gpio_bank *bank, int gpio, int mode)
writel(value, &bank->drv);
}
void gpio_set_rate(struct s5pc1xx_gpio_bank *bank, int gpio, int mode)
void gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode)
{
unsigned int value;