Skip to content
Snippets Groups Projects
Commit ef5d9eb9 authored by Łukasz Majewski's avatar Łukasz Majewski Committed by Albert ARIBAUD
Browse files

gpio:samsung s5p_ suffix add for GPIO functions 


This change is driven by need of general gpio_* functions,
which as their parameter are accepting the GPIO pin number, NOT
block and pin.

This makes the code alike to omap, and allows for using more
generic frameworks (e.g. software I2C).

Signed-off-by: default avatarLukasz Majewski <l.majewski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMinkyu Kang <mk7.kang@samsung.com>
Acked-by: default avatarMike Frysinger <vapier@gentoo.org>
parent 9070872b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
arch/arm/include/asm/arch-s5pc1xx/gpio.h
+ 8
− 8
View file @ ef5d9eb9
...@@ -126,14 +126,14 @@ struct s5pc110_gpio { ...@@ -126,14 +126,14 @@ struct s5pc110_gpio {
}; };
/* functions */ /* functions */
void gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg); void s5p_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 s5p_gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en);
void gpio_direction_input(struct s5p_gpio_bank *bank, int gpio); void s5p_gpio_direction_input(struct s5p_gpio_bank *bank, int gpio);
void gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en); void s5p_gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en);
unsigned int gpio_get_value(struct s5p_gpio_bank *bank, int gpio); unsigned int s5p_gpio_get_value(struct s5p_gpio_bank *bank, int gpio);
void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode); void s5p_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 s5p_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); void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode);
#endif #endif
/* Pin configurations */ /* Pin configurations */
......
arch/arm/include/asm/arch-s5pc2xx/gpio.h
+ 8
− 8
View file @ ef5d9eb9
...@@ -80,14 +80,14 @@ struct s5pc210_gpio_part3 { ...@@ -80,14 +80,14 @@ struct s5pc210_gpio_part3 {
}; };
/* functions */ /* functions */
void gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg); void s5p_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 s5p_gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en);
void gpio_direction_input(struct s5p_gpio_bank *bank, int gpio); void s5p_gpio_direction_input(struct s5p_gpio_bank *bank, int gpio);
void gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en); void s5p_gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en);
unsigned int gpio_get_value(struct s5p_gpio_bank *bank, int gpio); unsigned int s5p_gpio_get_value(struct s5p_gpio_bank *bank, int gpio);
void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode); void s5p_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 s5p_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); void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode);
#endif #endif
/* Pin configurations */ /* Pin configurations */
......
board/samsung/goni/goni.c
+ 4
− 4
View file @ ef5d9eb9
...@@ -73,7 +73,7 @@ int board_mmc_init(bd_t *bis) ...@@ -73,7 +73,7 @@ int board_mmc_init(bd_t *bis)
int i; int i;
/* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */ /* MASSMEMORY_EN: XMSMDATA7: GPJ2[7] output high */
gpio_direction_output(&s5pc110_gpio->j2, 7, 1); s5p_gpio_direction_output(&s5pc110_gpio->j2, 7, 1);
/* /*
* MMC0 GPIO * MMC0 GPIO
...@@ -86,11 +86,11 @@ int board_mmc_init(bd_t *bis) ...@@ -86,11 +86,11 @@ int board_mmc_init(bd_t *bis)
if (i == 2) if (i == 2)
continue; continue;
/* GPG0[0:6] special function 2 */ /* GPG0[0:6] special function 2 */
gpio_cfg_pin(&s5pc110_gpio->g0, i, 0x2); s5p_gpio_cfg_pin(&s5pc110_gpio->g0, i, 0x2);
/* GPG0[0:6] pull disable */ /* GPG0[0:6] pull disable */
gpio_set_pull(&s5pc110_gpio->g0, i, GPIO_PULL_NONE); s5p_gpio_set_pull(&s5pc110_gpio->g0, i, GPIO_PULL_NONE);
/* GPG0[0:6] drv 4x */ /* GPG0[0:6] drv 4x */
gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X); s5p_gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X);
} }
return s5p_mmc_init(0, 4); return s5p_mmc_init(0, 4);
......
board/samsung/smdkc100/smdkc100.c
+ 1
− 1
View file @ ef5d9eb9
...@@ -41,7 +41,7 @@ static void smc9115_pre_init(void) ...@@ -41,7 +41,7 @@ static void smc9115_pre_init(void)
(struct s5pc100_gpio *)samsung_get_base_gpio(); (struct s5pc100_gpio *)samsung_get_base_gpio();
/* gpio configuration GPK0CON */ /* gpio configuration GPK0CON */
gpio_cfg_pin(&gpio->k0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2)); s5p_gpio_cfg_pin(&gpio->k0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));
/* Ethernet needs bus width of 16 bits */ /* Ethernet needs bus width of 16 bits */
smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK); smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
......
board/samsung/smdkv310/smdkv310.c
+ 4
− 4
View file @ ef5d9eb9
...@@ -37,7 +37,7 @@ static void smc9115_pre_init(void) ...@@ -37,7 +37,7 @@ static void smc9115_pre_init(void)
u32 smc_bw_conf, smc_bc_conf; u32 smc_bw_conf, smc_bc_conf;
/* gpio configuration GPK0CON */ /* gpio configuration GPK0CON */
gpio_cfg_pin(&gpio2->y0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2)); s5p_gpio_cfg_pin(&gpio2->y0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));
/* Ethernet needs bus width of 16 bits */ /* Ethernet needs bus width of 16 bits */
smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK); smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
...@@ -116,10 +116,10 @@ int board_mmc_init(bd_t *bis) ...@@ -116,10 +116,10 @@ int board_mmc_init(bd_t *bis)
*/ */
for (i = 0; i < 7; i++) { for (i = 0; i < 7; i++) {
/* GPK2[0:6] special function 2 */ /* GPK2[0:6] special function 2 */
gpio_cfg_pin(&gpio2->k2, i, GPIO_FUNC(0x2)); s5p_gpio_cfg_pin(&gpio2->k2, i, GPIO_FUNC(0x2));
/* GPK2[0:6] drv 4x */ /* GPK2[0:6] drv 4x */
gpio_set_drv(&gpio2->k2, i, GPIO_DRV_4X); s5p_gpio_set_drv(&gpio2->k2, i, GPIO_DRV_4X);
/* GPK2[0:1] pull disable */ /* GPK2[0:1] pull disable */
if (i == 0 || i == 1) { if (i == 0 || i == 1) {
...@@ -128,7 +128,7 @@ int board_mmc_init(bd_t *bis) ...@@ -128,7 +128,7 @@ int board_mmc_init(bd_t *bis)
} }
/* GPK2[2:6] pull up */ /* GPK2[2:6] pull up */
gpio_set_pull(&gpio2->k2, i, GPIO_PULL_UP); s5p_gpio_set_pull(&gpio2->k2, i, GPIO_PULL_UP);
} }
err = s5p_mmc_init(2, 4); err = s5p_mmc_init(2, 4);
return err; return err;
......
drivers/gpio/s5p_gpio.c
+ 10
− 10
View file @ ef5d9eb9
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define RATE_MASK(x) (0x1 << (x + 16)) #define RATE_MASK(x) (0x1 << (x + 16))
#define RATE_SET(x) (0x1 << (x + 16)) #define RATE_SET(x) (0x1 << (x + 16))
void gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg) void s5p_gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg)
{ {
unsigned int value; unsigned int value;
...@@ -46,11 +46,11 @@ void gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg) ...@@ -46,11 +46,11 @@ void gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg)
writel(value, &bank->con); writel(value, &bank->con);
} }
void gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en) void s5p_gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en)
{ {
unsigned int value; unsigned int value;
gpio_cfg_pin(bank, gpio, GPIO_OUTPUT); s5p_gpio_cfg_pin(bank, gpio, GPIO_OUTPUT);
value = readl(&bank->dat); value = readl(&bank->dat);
value &= ~DAT_MASK(gpio); value &= ~DAT_MASK(gpio);
...@@ -59,12 +59,12 @@ void gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en) ...@@ -59,12 +59,12 @@ void gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en)
writel(value, &bank->dat); writel(value, &bank->dat);
} }
void gpio_direction_input(struct s5p_gpio_bank *bank, int gpio) void s5p_gpio_direction_input(struct s5p_gpio_bank *bank, int gpio)
{ {
gpio_cfg_pin(bank, gpio, GPIO_INPUT); s5p_gpio_cfg_pin(bank, gpio, GPIO_INPUT);
} }
void gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en) void s5p_gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en)
{ {
unsigned int value; unsigned int value;
...@@ -75,7 +75,7 @@ void gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en) ...@@ -75,7 +75,7 @@ void gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en)
writel(value, &bank->dat); writel(value, &bank->dat);
} }
unsigned int gpio_get_value(struct s5p_gpio_bank *bank, int gpio) unsigned int s5p_gpio_get_value(struct s5p_gpio_bank *bank, int gpio)
{ {
unsigned int value; unsigned int value;
...@@ -83,7 +83,7 @@ unsigned int gpio_get_value(struct s5p_gpio_bank *bank, int gpio) ...@@ -83,7 +83,7 @@ unsigned int gpio_get_value(struct s5p_gpio_bank *bank, int gpio)
return !!(value & DAT_MASK(gpio)); return !!(value & DAT_MASK(gpio));
} }
void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode) void s5p_gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode)
{ {
unsigned int value; unsigned int value;
...@@ -102,7 +102,7 @@ void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode) ...@@ -102,7 +102,7 @@ void gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode)
writel(value, &bank->pull); writel(value, &bank->pull);
} }
void gpio_set_drv(struct s5p_gpio_bank *bank, int gpio, int mode) void s5p_gpio_set_drv(struct s5p_gpio_bank *bank, int gpio, int mode)
{ {
unsigned int value; unsigned int value;
...@@ -123,7 +123,7 @@ void gpio_set_drv(struct s5p_gpio_bank *bank, int gpio, int mode) ...@@ -123,7 +123,7 @@ void gpio_set_drv(struct s5p_gpio_bank *bank, int gpio, int mode)
writel(value, &bank->drv); writel(value, &bank->drv);
} }
void gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode) void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode)
{ {
unsigned int value; unsigned int value;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment