* [U-Boot] [PATCH 0/3 V5] EXYNOS5: Add GPIO numbering feature
@ 2013-04-03 11:54 Rajeshwari Shinde
2013-04-03 11:54 ` [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin " Rajeshwari Shinde
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Rajeshwari Shinde @ 2013-04-03 11:54 UTC (permalink / raw)
To: u-boot
Changes in V2:
- Enabled CMD_GPIO as suggested by Simon Glass and
supported same for EXYNOS5
Changes in V3:
- New patch added to rename S5P GPIO definitions to
S5P_GPIO
- GPIO Table added to calculate the base address
of input gpio bank.
Changes in V4:
- To have consistent 0..n-1 GPIO numbering the banks are divided
into different parts where ever they have holes in them.
- Function and table to support gpio command moved to s5p-gpio driver
- Rebased on latest u-boot-samsung tree
Changes in V5:
- Rebased on latest u-boot-samsung tree
- Removed Exynos5 specific code in gpio driver api to
get bank.
- Added #define HAVE_GENERIC_GPIO in config file
to remove conditinal CPU check in gpio driver.
Rajeshwari Shinde (3):
EXYNOS5: Add gpio pin numbering feature
S5P: Rename GPIO definitions
EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5
arch/arm/cpu/armv7/exynos/pinmux.c | 206 ++++++-------
arch/arm/include/asm/arch-exynos/cpu.h | 10 +-
arch/arm/include/asm/arch-exynos/gpio.h | 486 ++++++++++++++++++++++++++----
arch/arm/include/asm/arch-s5pc1xx/gpio.h | 26 +-
board/samsung/goni/goni.c | 4 +-
board/samsung/origen/origen.c | 8 +-
board/samsung/smdk5250/smdk5250.c | 24 +-
board/samsung/smdkc100/smdkc100.c | 2 +-
board/samsung/smdkv310/smdkv310.c | 10 +-
board/samsung/trats/trats.c | 17 +-
board/samsung/universal_c210/universal.c | 36 ++--
drivers/gpio/s5p_gpio.c | 111 ++++++-
include/configs/exynos5250-dt.h | 2 +
13 files changed, 683 insertions(+), 259 deletions(-)
--
1.7.4.4
^ permalink raw reply [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin numbering feature
2013-04-03 11:54 [U-Boot] [PATCH 0/3 V5] EXYNOS5: Add GPIO numbering feature Rajeshwari Shinde
@ 2013-04-03 11:54 ` Rajeshwari Shinde
2013-04-17 4:49 ` Rajeshwari Birje
2013-05-11 18:18 ` Simon Glass
2013-04-03 11:54 ` [U-Boot] [PATCH 2/3 V5] S5P: Rename GPIO definitions Rajeshwari Shinde
2013-04-03 11:54 ` [U-Boot] [PATCH 3/3 V5] EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5 Rajeshwari Shinde
2 siblings, 2 replies; 13+ messages in thread
From: Rajeshwari Shinde @ 2013-04-03 11:54 UTC (permalink / raw)
To: u-boot
This patch adds support for gpio pin numbering support on
EXYNOS5250
To have consistent 0..n-1 GPIO numbering the banks are divided
into different parts where ever they have holes in them.
Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
---
Changes in V2:
- none.
Changes in V3:
- none.
Changes in V4:
- To have consistent 0..n-1 GPIO numbering the banks are divided
into different parts where ever they have holes in them.
- Combined previous patch 1 and 2 into single patch.
Changes in V5:
- Removed Exynos5 specific code in gpio driver api to
get bank.
- Added #define HAVE_GENERIC_GPIO in config file
to remove conditinal CPU check in gpio driver.
arch/arm/cpu/armv7/exynos/pinmux.c | 150 ++++------
arch/arm/include/asm/arch-exynos/cpu.h | 10 +-
arch/arm/include/asm/arch-exynos/gpio.h | 452 +++++++++++++++++++++++++++----
board/samsung/smdk5250/smdk5250.c | 24 +-
drivers/gpio/s5p_gpio.c | 42 +++
include/configs/exynos5250-dt.h | 1 +
6 files changed, 522 insertions(+), 157 deletions(-)
diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c
index bd499b4..2fb5963 100644
--- a/arch/arm/cpu/armv7/exynos/pinmux.c
+++ b/arch/arm/cpu/armv7/exynos/pinmux.c
@@ -29,89 +29,77 @@
static void exynos5_uart_config(int peripheral)
{
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
- struct s5p_gpio_bank *bank;
int i, start, count;
switch (peripheral) {
case PERIPH_ID_UART0:
- bank = &gpio1->a0;
- start = 0;
+ start = EXYNOS5_GPIO_A00;
count = 4;
break;
case PERIPH_ID_UART1:
- bank = &gpio1->d0;
- start = 0;
+ start = EXYNOS5_GPIO_D00;
count = 4;
break;
case PERIPH_ID_UART2:
- bank = &gpio1->a1;
- start = 0;
+ start = EXYNOS5_GPIO_A10;
count = 4;
break;
case PERIPH_ID_UART3:
- bank = &gpio1->a1;
- start = 4;
+ start = EXYNOS5_GPIO_A14;
count = 2;
break;
}
for (i = start; i < start + count; i++) {
- s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
- s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
+ gpio_set_pull(i, GPIO_PULL_NONE);
+ gpio_cfg_pin(i, GPIO_FUNC(0x2));
}
}
static int exynos5_mmc_config(int peripheral, int flags)
{
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
- struct s5p_gpio_bank *bank, *bank_ext;
- int i, start = 0, gpio_func = 0;
+ int i, start, start_ext, gpio_func = 0;
switch (peripheral) {
case PERIPH_ID_SDMMC0:
- bank = &gpio1->c0;
- bank_ext = &gpio1->c1;
- start = 0;
+ start = EXYNOS5_GPIO_C00;
+ start_ext = EXYNOS5_GPIO_C10;
gpio_func = GPIO_FUNC(0x2);
break;
case PERIPH_ID_SDMMC1:
- bank = &gpio1->c2;
- bank_ext = NULL;
+ start = EXYNOS5_GPIO_C20;
+ start_ext = 0;
break;
case PERIPH_ID_SDMMC2:
- bank = &gpio1->c3;
- bank_ext = &gpio1->c4;
- start = 3;
+ start = EXYNOS5_GPIO_C30;
+ start_ext = EXYNOS5_GPIO_C43;
gpio_func = GPIO_FUNC(0x3);
break;
case PERIPH_ID_SDMMC3:
- bank = &gpio1->c4;
- bank_ext = NULL;
+ start = EXYNOS5_GPIO_C40;
+ start_ext = 0;
break;
}
- if ((flags & PINMUX_FLAG_8BIT_MODE) && !bank_ext) {
+ if ((flags & PINMUX_FLAG_8BIT_MODE) && !start_ext) {
debug("SDMMC device %d does not support 8bit mode",
peripheral);
return -1;
}
if (flags & PINMUX_FLAG_8BIT_MODE) {
- for (i = start; i <= (start + 3); i++) {
- s5p_gpio_cfg_pin(bank_ext, i, gpio_func);
- s5p_gpio_set_pull(bank_ext, i, GPIO_PULL_UP);
- s5p_gpio_set_drv(bank_ext, i, GPIO_DRV_4X);
+ for (i = start_ext; i <= (start_ext + 3); i++) {
+ gpio_cfg_pin(i, gpio_func);
+ gpio_set_pull(i, GPIO_PULL_UP);
+ gpio_set_drv(i, GPIO_DRV_4X);
}
}
for (i = 0; i < 2; i++) {
- s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
- s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
- s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);
+ gpio_cfg_pin(start + i, GPIO_FUNC(0x2));
+ gpio_set_pull(start + i, GPIO_PULL_NONE);
+ gpio_set_drv(start + i, GPIO_DRV_4X);
}
for (i = 3; i <= 6; i++) {
- s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
- s5p_gpio_set_pull(bank, i, GPIO_PULL_UP);
- s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);
+ gpio_cfg_pin(start + i, GPIO_FUNC(0x2));
+ gpio_set_pull(start + i, GPIO_PULL_UP);
+ gpio_set_drv(start + i, GPIO_DRV_4X);
}
return 0;
@@ -119,8 +107,6 @@ static int exynos5_mmc_config(int peripheral, int flags)
static void exynos5_sromc_config(int flags)
{
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
int i;
/*
@@ -138,13 +124,13 @@ static void exynos5_sromc_config(int flags)
* GPY1[2] SROM_WAIT(2)
* GPY1[3] EBI_DATA_RDn(2)
*/
- s5p_gpio_cfg_pin(&gpio1->y0, (flags & PINMUX_FLAG_BANK),
- GPIO_FUNC(2));
- s5p_gpio_cfg_pin(&gpio1->y0, 4, GPIO_FUNC(2));
- s5p_gpio_cfg_pin(&gpio1->y0, 5, GPIO_FUNC(2));
+ gpio_cfg_pin(EXYNOS5_GPIO_Y00 + (flags & PINMUX_FLAG_BANK),
+ GPIO_FUNC(2));
+ gpio_cfg_pin(EXYNOS5_GPIO_Y04, GPIO_FUNC(2));
+ gpio_cfg_pin(EXYNOS5_GPIO_Y05, GPIO_FUNC(2));
for (i = 0; i < 4; i++)
- s5p_gpio_cfg_pin(&gpio1->y1, i, GPIO_FUNC(2));
+ gpio_cfg_pin(EXYNOS5_GPIO_Y10 + i, GPIO_FUNC(2));
/*
* EBI: 8 Addrss Lines
@@ -179,55 +165,52 @@ static void exynos5_sromc_config(int flags)
* GPY6[7] EBI_DATA[15](2)
*/
for (i = 0; i < 8; i++) {
- s5p_gpio_cfg_pin(&gpio1->y3, i, GPIO_FUNC(2));
- s5p_gpio_set_pull(&gpio1->y3, i, GPIO_PULL_UP);
+ gpio_cfg_pin(EXYNOS5_GPIO_Y30 + i, GPIO_FUNC(2));
+ gpio_set_pull(EXYNOS5_GPIO_Y30 + i, GPIO_PULL_UP);
- s5p_gpio_cfg_pin(&gpio1->y5, i, GPIO_FUNC(2));
- s5p_gpio_set_pull(&gpio1->y5, i, GPIO_PULL_UP);
+ gpio_cfg_pin(EXYNOS5_GPIO_Y50 + i, GPIO_FUNC(2));
+ gpio_set_pull(EXYNOS5_GPIO_Y50 + i, GPIO_PULL_UP);
- s5p_gpio_cfg_pin(&gpio1->y6, i, GPIO_FUNC(2));
- s5p_gpio_set_pull(&gpio1->y6, i, GPIO_PULL_UP);
+ gpio_cfg_pin(EXYNOS5_GPIO_Y60 + i, GPIO_FUNC(2));
+ gpio_set_pull(EXYNOS5_GPIO_Y60 + i, GPIO_PULL_UP);
}
}
static void exynos5_i2c_config(int peripheral, int flags)
{
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
-
switch (peripheral) {
case PERIPH_ID_I2C0:
- s5p_gpio_cfg_pin(&gpio1->b3, 0, GPIO_FUNC(0x2));
- s5p_gpio_cfg_pin(&gpio1->b3, 1, GPIO_FUNC(0x2));
+ gpio_cfg_pin(EXYNOS5_GPIO_B30, GPIO_FUNC(0x2));
+ gpio_cfg_pin(EXYNOS5_GPIO_B31, GPIO_FUNC(0x2));
break;
case PERIPH_ID_I2C1:
- s5p_gpio_cfg_pin(&gpio1->b3, 2, GPIO_FUNC(0x2));
- s5p_gpio_cfg_pin(&gpio1->b3, 3, GPIO_FUNC(0x2));
+ gpio_cfg_pin(EXYNOS5_GPIO_B32, GPIO_FUNC(0x2));
+ gpio_cfg_pin(EXYNOS5_GPIO_B33, GPIO_FUNC(0x2));
break;
case PERIPH_ID_I2C2:
- s5p_gpio_cfg_pin(&gpio1->a0, 6, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->a0, 7, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A06, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A07, GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C3:
- s5p_gpio_cfg_pin(&gpio1->a1, 2, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->a1, 3, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A12, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A13, GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C4:
- s5p_gpio_cfg_pin(&gpio1->a2, 0, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->a2, 1, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A20, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A21, GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C5:
- s5p_gpio_cfg_pin(&gpio1->a2, 2, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->a2, 3, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A22, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A23, GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C6:
- s5p_gpio_cfg_pin(&gpio1->b1, 3, GPIO_FUNC(0x4));
- s5p_gpio_cfg_pin(&gpio1->b1, 4, GPIO_FUNC(0x4));
+ gpio_cfg_pin(EXYNOS5_GPIO_B13, GPIO_FUNC(0x4));
+ gpio_cfg_pin(EXYNOS5_GPIO_B14, GPIO_FUNC(0x4));
break;
case PERIPH_ID_I2C7:
- s5p_gpio_cfg_pin(&gpio1->b2, 2, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->b2, 3, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_B22, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_B23, GPIO_FUNC(0x3));
break;
}
}
@@ -235,53 +218,42 @@ static void exynos5_i2c_config(int peripheral, int flags)
static void exynos5_i2s_config(int peripheral)
{
int i;
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
for (i = 0; i < 5; i++)
- s5p_gpio_cfg_pin(&gpio1->b0, i, GPIO_FUNC(0x02));
+ gpio_cfg_pin(EXYNOS5_GPIO_B00+i, GPIO_FUNC(0x02));
}
void exynos5_spi_config(int peripheral)
{
int cfg = 0, pin = 0, i;
- struct s5p_gpio_bank *bank = NULL;
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
- struct exynos5_gpio_part2 *gpio2 =
- (struct exynos5_gpio_part2 *) samsung_get_base_gpio_part2();
switch (peripheral) {
case PERIPH_ID_SPI0:
- bank = &gpio1->a2;
cfg = GPIO_FUNC(0x2);
- pin = 0;
+ pin = EXYNOS5_GPIO_A20;
break;
case PERIPH_ID_SPI1:
- bank = &gpio1->a2;
cfg = GPIO_FUNC(0x2);
- pin = 4;
+ pin = EXYNOS5_GPIO_A24;
break;
case PERIPH_ID_SPI2:
- bank = &gpio1->b1;
cfg = GPIO_FUNC(0x5);
- pin = 1;
+ pin = EXYNOS5_GPIO_B11;
break;
case PERIPH_ID_SPI3:
- bank = &gpio2->f1;
cfg = GPIO_FUNC(0x2);
- pin = 0;
+ pin = EXYNOS5_GPIO_F10;
break;
case PERIPH_ID_SPI4:
for (i = 0; i < 2; i++) {
- s5p_gpio_cfg_pin(&gpio2->f0, i + 2, GPIO_FUNC(0x4));
- s5p_gpio_cfg_pin(&gpio2->e0, i + 4, GPIO_FUNC(0x4));
+ gpio_cfg_pin(EXYNOS5_GPIO_F02 + i, GPIO_FUNC(0x4));
+ gpio_cfg_pin(EXYNOS5_GPIO_E04 + i, GPIO_FUNC(0x4));
}
break;
}
if (peripheral != PERIPH_ID_SPI4) {
for (i = pin; i < pin + 4; i++)
- s5p_gpio_cfg_pin(bank, i, cfg);
+ gpio_cfg_pin(i, cfg);
}
}
diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h
index 2a20558..94b8864 100644
--- a/arch/arm/include/asm/arch-exynos/cpu.h
+++ b/arch/arm/include/asm/arch-exynos/cpu.h
@@ -101,7 +101,7 @@
/* EXYNOS5 Common*/
#define EXYNOS5_I2C_SPACING 0x10000
-#define EXYNOS5_GPIO_PART4_BASE 0x03860000
+#define EXYNOS5_GPIO_PART8_BASE 0x03860000
#define EXYNOS5_PRO_ID 0x10000000
#define EXYNOS5_CLOCK_BASE 0x10010000
#define EXYNOS5_POWER_BASE 0x10040000
@@ -111,9 +111,13 @@
#define EXYNOS5_ACE_SFR_BASE 0x10830000
#define EXYNOS5_DMC_PHY0_BASE 0x10C00000
#define EXYNOS5_DMC_PHY1_BASE 0x10C10000
-#define EXYNOS5_GPIO_PART3_BASE 0x10D10000
+#define EXYNOS5_GPIO_PART5_BASE 0x10D10000
+#define EXYNOS5_GPIO_PART6_BASE 0x10D10060
+#define EXYNOS5_GPIO_PART7_BASE 0x10D100C0
#define EXYNOS5_DMC_CTRL_BASE 0x10DD0000
#define EXYNOS5_GPIO_PART1_BASE 0x11400000
+#define EXYNOS5_GPIO_PART2_BASE 0x114002E0
+#define EXYNOS5_GPIO_PART3_BASE 0x11400C00
#define EXYNOS5_MIPI_DSIM_BASE 0x11D00000
#define EXYNOS5_USB_HOST_EHCI_BASE 0x12110000
#define EXYNOS5_USBPHY_BASE 0x12130000
@@ -126,7 +130,7 @@
#define EXYNOS5_I2S_BASE 0x12D60000
#define EXYNOS5_PWMTIMER_BASE 0x12DD0000
#define EXYNOS5_SPI_ISP_BASE 0x131A0000
-#define EXYNOS5_GPIO_PART2_BASE 0x13400000
+#define EXYNOS5_GPIO_PART4_BASE 0x13400000
#define EXYNOS5_FIMD_BASE 0x14400000
#define EXYNOS5_DP_BASE 0x145B0000
diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h
index cfe1024..20eb459 100644
--- a/arch/arm/include/asm/arch-exynos/gpio.h
+++ b/arch/arm/include/asm/arch-exynos/gpio.h
@@ -161,16 +161,20 @@ struct exynos5_gpio_part1 {
struct s5p_gpio_bank y4;
struct s5p_gpio_bank y5;
struct s5p_gpio_bank y6;
- struct s5p_gpio_bank res1[0x3];
+};
+
+struct exynos5_gpio_part2 {
struct s5p_gpio_bank c4;
- struct s5p_gpio_bank res2[0x48];
+};
+
+struct exynos5_gpio_part3 {
struct s5p_gpio_bank x0;
struct s5p_gpio_bank x1;
struct s5p_gpio_bank x2;
struct s5p_gpio_bank x3;
};
-struct exynos5_gpio_part2 {
+struct exynos5_gpio_part4 {
struct s5p_gpio_bank e0;
struct s5p_gpio_bank e1;
struct s5p_gpio_bank f0;
@@ -182,20 +186,25 @@ struct exynos5_gpio_part2 {
struct s5p_gpio_bank h1;
};
-struct exynos5_gpio_part3 {
+struct exynos5_gpio_part5 {
struct s5p_gpio_bank v0;
struct s5p_gpio_bank v1;
- struct s5p_gpio_bank res1[0x1];
+};
+
+struct exynos5_gpio_part6 {
struct s5p_gpio_bank v2;
struct s5p_gpio_bank v3;
- struct s5p_gpio_bank res2[0x1];
+};
+
+struct exynos5_gpio_part7 {
struct s5p_gpio_bank v4;
};
-struct exynos5_gpio_part4 {
+struct exynos5_gpio_part8 {
struct s5p_gpio_bank z;
};
+
/* functions */
void s5p_gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg);
void s5p_gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en);
@@ -248,41 +257,9 @@ void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode);
- EXYNOS4X12_GPIO_PART3_BASE) / sizeof(struct s5p_gpio_bank)) \
* GPIO_PER_BANK) + pin) + EXYNOS4X12_GPIO_PART2_MAX)
-#define exynos5_gpio_part1_get_nr(bank, pin) \
- ((((((unsigned int) &(((struct exynos5_gpio_part1 *) \
- EXYNOS5_GPIO_PART1_BASE)->bank)) \
- - EXYNOS5_GPIO_PART1_BASE) / sizeof(struct s5p_gpio_bank)) \
- * GPIO_PER_BANK) + pin)
-
-#define EXYNOS5_GPIO_PART1_MAX ((sizeof(struct exynos5_gpio_part1) \
- / sizeof(struct s5p_gpio_bank)) * GPIO_PER_BANK)
-
-#define exynos5_gpio_part2_get_nr(bank, pin) \
- (((((((unsigned int) &(((struct exynos5_gpio_part2 *) \
- EXYNOS5_GPIO_PART2_BASE)->bank)) \
- - EXYNOS5_GPIO_PART2_BASE) / sizeof(struct s5p_gpio_bank)) \
- * GPIO_PER_BANK) + pin) + EXYNOS5_GPIO_PART1_MAX)
-
-#define EXYNOS5_GPIO_PART2_MAX ((sizeof(struct exynos5_gpio_part2) \
- / sizeof(struct s5p_gpio_bank)) * GPIO_PER_BANK)
-
-#define exynos5_gpio_part3_get_nr(bank, pin) \
- (((((((unsigned int) &(((struct exynos5_gpio_part3 *) \
- EXYNOS5_GPIO_PART3_BASE)->bank)) \
- - EXYNOS5_GPIO_PART3_BASE) / sizeof(struct s5p_gpio_bank)) \
- * GPIO_PER_BANK) + pin) + EXYNOS5_GPIO_PART2_MAX)
-
static inline unsigned int s5p_gpio_base(int nr)
{
- if (cpu_is_exynos5()) {
- if (nr < EXYNOS5_GPIO_PART1_MAX)
- return EXYNOS5_GPIO_PART1_BASE;
- else if (nr < EXYNOS5_GPIO_PART2_MAX)
- return EXYNOS5_GPIO_PART2_BASE;
- else
- return EXYNOS5_GPIO_PART3_BASE;
-
- } else if (cpu_is_exynos4()) {
+ if (cpu_is_exynos4()) {
if (nr < EXYNOS4_GPIO_PART1_MAX)
return EXYNOS4_GPIO_PART1_BASE;
else
@@ -294,15 +271,7 @@ static inline unsigned int s5p_gpio_base(int nr)
static inline unsigned int s5p_gpio_part_max(int nr)
{
- if (cpu_is_exynos5()) {
- if (nr < EXYNOS5_GPIO_PART1_MAX)
- return 0;
- else if (nr < EXYNOS5_GPIO_PART2_MAX)
- return EXYNOS5_GPIO_PART1_MAX;
- else
- return EXYNOS5_GPIO_PART2_MAX;
-
- } else if (cpu_is_exynos4()) {
+ if (cpu_is_exynos4()) {
if (nr < EXYNOS4_GPIO_PART1_MAX)
return 0;
else
@@ -311,6 +280,391 @@ static inline unsigned int s5p_gpio_part_max(int nr)
return 0;
}
+
+/* A list of valid GPIO numbers for the asm-generic/gpio.h interface */
+enum exynos5_gpio_pin {
+ /* GPIO_PART1_STARTS */
+ EXYNOS5_GPIO_A00,
+ EXYNOS5_GPIO_A01,
+ EXYNOS5_GPIO_A02,
+ EXYNOS5_GPIO_A03,
+ EXYNOS5_GPIO_A04,
+ EXYNOS5_GPIO_A05,
+ EXYNOS5_GPIO_A06,
+ EXYNOS5_GPIO_A07,
+ EXYNOS5_GPIO_A10,
+ EXYNOS5_GPIO_A11,
+ EXYNOS5_GPIO_A12,
+ EXYNOS5_GPIO_A13,
+ EXYNOS5_GPIO_A14,
+ EXYNOS5_GPIO_A15,
+ EXYNOS5_GPIO_A16,
+ EXYNOS5_GPIO_A17,
+ EXYNOS5_GPIO_A20,
+ EXYNOS5_GPIO_A21,
+ EXYNOS5_GPIO_A22,
+ EXYNOS5_GPIO_A23,
+ EXYNOS5_GPIO_A24,
+ EXYNOS5_GPIO_A25,
+ EXYNOS5_GPIO_A26,
+ EXYNOS5_GPIO_A27,
+ EXYNOS5_GPIO_B00,
+ EXYNOS5_GPIO_B01,
+ EXYNOS5_GPIO_B02,
+ EXYNOS5_GPIO_B03,
+ EXYNOS5_GPIO_B04,
+ EXYNOS5_GPIO_B05,
+ EXYNOS5_GPIO_B06,
+ EXYNOS5_GPIO_B07,
+ EXYNOS5_GPIO_B10,
+ EXYNOS5_GPIO_B11,
+ EXYNOS5_GPIO_B12,
+ EXYNOS5_GPIO_B13,
+ EXYNOS5_GPIO_B14,
+ EXYNOS5_GPIO_B15,
+ EXYNOS5_GPIO_B16,
+ EXYNOS5_GPIO_B17,
+ EXYNOS5_GPIO_B20,
+ EXYNOS5_GPIO_B21,
+ EXYNOS5_GPIO_B22,
+ EXYNOS5_GPIO_B23,
+ EXYNOS5_GPIO_B24,
+ EXYNOS5_GPIO_B25,
+ EXYNOS5_GPIO_B26,
+ EXYNOS5_GPIO_B27,
+ EXYNOS5_GPIO_B30,
+ EXYNOS5_GPIO_B31,
+ EXYNOS5_GPIO_B32,
+ EXYNOS5_GPIO_B33,
+ EXYNOS5_GPIO_B34,
+ EXYNOS5_GPIO_B35,
+ EXYNOS5_GPIO_B36,
+ EXYNOS5_GPIO_B37,
+ EXYNOS5_GPIO_C00,
+ EXYNOS5_GPIO_C01,
+ EXYNOS5_GPIO_C02,
+ EXYNOS5_GPIO_C03,
+ EXYNOS5_GPIO_C04,
+ EXYNOS5_GPIO_C05,
+ EXYNOS5_GPIO_C06,
+ EXYNOS5_GPIO_C07,
+ EXYNOS5_GPIO_C10,
+ EXYNOS5_GPIO_C11,
+ EXYNOS5_GPIO_C12,
+ EXYNOS5_GPIO_C13,
+ EXYNOS5_GPIO_C14,
+ EXYNOS5_GPIO_C15,
+ EXYNOS5_GPIO_C16,
+ EXYNOS5_GPIO_C17,
+ EXYNOS5_GPIO_C20,
+ EXYNOS5_GPIO_C21,
+ EXYNOS5_GPIO_C22,
+ EXYNOS5_GPIO_C23,
+ EXYNOS5_GPIO_C24,
+ EXYNOS5_GPIO_C25,
+ EXYNOS5_GPIO_C26,
+ EXYNOS5_GPIO_C27,
+ EXYNOS5_GPIO_C30,
+ EXYNOS5_GPIO_C31,
+ EXYNOS5_GPIO_C32,
+ EXYNOS5_GPIO_C33,
+ EXYNOS5_GPIO_C34,
+ EXYNOS5_GPIO_C35,
+ EXYNOS5_GPIO_C36,
+ EXYNOS5_GPIO_C37,
+ EXYNOS5_GPIO_D00,
+ EXYNOS5_GPIO_D01,
+ EXYNOS5_GPIO_D02,
+ EXYNOS5_GPIO_D03,
+ EXYNOS5_GPIO_D04,
+ EXYNOS5_GPIO_D05,
+ EXYNOS5_GPIO_D06,
+ EXYNOS5_GPIO_D07,
+ EXYNOS5_GPIO_D10,
+ EXYNOS5_GPIO_D11,
+ EXYNOS5_GPIO_D12,
+ EXYNOS5_GPIO_D13,
+ EXYNOS5_GPIO_D14,
+ EXYNOS5_GPIO_D15,
+ EXYNOS5_GPIO_D16,
+ EXYNOS5_GPIO_D17,
+ EXYNOS5_GPIO_Y00,
+ EXYNOS5_GPIO_Y01,
+ EXYNOS5_GPIO_Y02,
+ EXYNOS5_GPIO_Y03,
+ EXYNOS5_GPIO_Y04,
+ EXYNOS5_GPIO_Y05,
+ EXYNOS5_GPIO_Y06,
+ EXYNOS5_GPIO_Y07,
+ EXYNOS5_GPIO_Y10,
+ EXYNOS5_GPIO_Y11,
+ EXYNOS5_GPIO_Y12,
+ EXYNOS5_GPIO_Y13,
+ EXYNOS5_GPIO_Y14,
+ EXYNOS5_GPIO_Y15,
+ EXYNOS5_GPIO_Y16,
+ EXYNOS5_GPIO_Y17,
+ EXYNOS5_GPIO_Y20,
+ EXYNOS5_GPIO_Y21,
+ EXYNOS5_GPIO_Y22,
+ EXYNOS5_GPIO_Y23,
+ EXYNOS5_GPIO_Y24,
+ EXYNOS5_GPIO_Y25,
+ EXYNOS5_GPIO_Y26,
+ EXYNOS5_GPIO_Y27,
+ EXYNOS5_GPIO_Y30,
+ EXYNOS5_GPIO_Y31,
+ EXYNOS5_GPIO_Y32,
+ EXYNOS5_GPIO_Y33,
+ EXYNOS5_GPIO_Y34,
+ EXYNOS5_GPIO_Y35,
+ EXYNOS5_GPIO_Y36,
+ EXYNOS5_GPIO_Y37,
+ EXYNOS5_GPIO_Y40,
+ EXYNOS5_GPIO_Y41,
+ EXYNOS5_GPIO_Y42,
+ EXYNOS5_GPIO_Y43,
+ EXYNOS5_GPIO_Y44,
+ EXYNOS5_GPIO_Y45,
+ EXYNOS5_GPIO_Y46,
+ EXYNOS5_GPIO_Y47,
+ EXYNOS5_GPIO_Y50,
+ EXYNOS5_GPIO_Y51,
+ EXYNOS5_GPIO_Y52,
+ EXYNOS5_GPIO_Y53,
+ EXYNOS5_GPIO_Y54,
+ EXYNOS5_GPIO_Y55,
+ EXYNOS5_GPIO_Y56,
+ EXYNOS5_GPIO_Y57,
+ EXYNOS5_GPIO_Y60,
+ EXYNOS5_GPIO_Y61,
+ EXYNOS5_GPIO_Y62,
+ EXYNOS5_GPIO_Y63,
+ EXYNOS5_GPIO_Y64,
+ EXYNOS5_GPIO_Y65,
+ EXYNOS5_GPIO_Y66,
+ EXYNOS5_GPIO_Y67,
+
+ /* GPIO_PART2_STARTS */
+ EXYNOS5_GPIO_MAX_PORT_PART_1,
+ EXYNOS5_GPIO_C40 = EXYNOS5_GPIO_MAX_PORT_PART_1,
+ EXYNOS5_GPIO_C41,
+ EXYNOS5_GPIO_C42,
+ EXYNOS5_GPIO_C43,
+ EXYNOS5_GPIO_C44,
+ EXYNOS5_GPIO_C45,
+ EXYNOS5_GPIO_C46,
+ EXYNOS5_GPIO_C47,
+
+ /* GPIO_PART3_STARTS */
+ EXYNOS5_GPIO_MAX_PORT_PART_2,
+ EXYNOS5_GPIO_X00 = EXYNOS5_GPIO_MAX_PORT_PART_2,
+ EXYNOS5_GPIO_X01,
+ EXYNOS5_GPIO_X02,
+ EXYNOS5_GPIO_X03,
+ EXYNOS5_GPIO_X04,
+ EXYNOS5_GPIO_X05,
+ EXYNOS5_GPIO_X06,
+ EXYNOS5_GPIO_X07,
+ EXYNOS5_GPIO_X10,
+ EXYNOS5_GPIO_X11,
+ EXYNOS5_GPIO_X12,
+ EXYNOS5_GPIO_X13,
+ EXYNOS5_GPIO_X14,
+ EXYNOS5_GPIO_X15,
+ EXYNOS5_GPIO_X16,
+ EXYNOS5_GPIO_X17,
+ EXYNOS5_GPIO_X20,
+ EXYNOS5_GPIO_X21,
+ EXYNOS5_GPIO_X22,
+ EXYNOS5_GPIO_X23,
+ EXYNOS5_GPIO_X24,
+ EXYNOS5_GPIO_X25,
+ EXYNOS5_GPIO_X26,
+ EXYNOS5_GPIO_X27,
+ EXYNOS5_GPIO_X30,
+ EXYNOS5_GPIO_X31,
+ EXYNOS5_GPIO_X32,
+ EXYNOS5_GPIO_X33,
+ EXYNOS5_GPIO_X34,
+ EXYNOS5_GPIO_X35,
+ EXYNOS5_GPIO_X36,
+ EXYNOS5_GPIO_X37,
+
+ /* GPIO_PART4_STARTS */
+ EXYNOS5_GPIO_MAX_PORT_PART_3,
+ EXYNOS5_GPIO_E00 = EXYNOS5_GPIO_MAX_PORT_PART_3,
+ EXYNOS5_GPIO_E01,
+ EXYNOS5_GPIO_E02,
+ EXYNOS5_GPIO_E03,
+ EXYNOS5_GPIO_E04,
+ EXYNOS5_GPIO_E05,
+ EXYNOS5_GPIO_E06,
+ EXYNOS5_GPIO_E07,
+ EXYNOS5_GPIO_E10,
+ EXYNOS5_GPIO_E11,
+ EXYNOS5_GPIO_E12,
+ EXYNOS5_GPIO_E13,
+ EXYNOS5_GPIO_E14,
+ EXYNOS5_GPIO_E15,
+ EXYNOS5_GPIO_E16,
+ EXYNOS5_GPIO_E17,
+ EXYNOS5_GPIO_F00,
+ EXYNOS5_GPIO_F01,
+ EXYNOS5_GPIO_F02,
+ EXYNOS5_GPIO_F03,
+ EXYNOS5_GPIO_F04,
+ EXYNOS5_GPIO_F05,
+ EXYNOS5_GPIO_F06,
+ EXYNOS5_GPIO_F07,
+ EXYNOS5_GPIO_F10,
+ EXYNOS5_GPIO_F11,
+ EXYNOS5_GPIO_F12,
+ EXYNOS5_GPIO_F13,
+ EXYNOS5_GPIO_F14,
+ EXYNOS5_GPIO_F15,
+ EXYNOS5_GPIO_F16,
+ EXYNOS5_GPIO_F17,
+ EXYNOS5_GPIO_G00,
+ EXYNOS5_GPIO_G01,
+ EXYNOS5_GPIO_G02,
+ EXYNOS5_GPIO_G03,
+ EXYNOS5_GPIO_G04,
+ EXYNOS5_GPIO_G05,
+ EXYNOS5_GPIO_G06,
+ EXYNOS5_GPIO_G07,
+ EXYNOS5_GPIO_G10,
+ EXYNOS5_GPIO_G11,
+ EXYNOS5_GPIO_G12,
+ EXYNOS5_GPIO_G13,
+ EXYNOS5_GPIO_G14,
+ EXYNOS5_GPIO_G15,
+ EXYNOS5_GPIO_G16,
+ EXYNOS5_GPIO_G17,
+ EXYNOS5_GPIO_G20,
+ EXYNOS5_GPIO_G21,
+ EXYNOS5_GPIO_G22,
+ EXYNOS5_GPIO_G23,
+ EXYNOS5_GPIO_G24,
+ EXYNOS5_GPIO_G25,
+ EXYNOS5_GPIO_G26,
+ EXYNOS5_GPIO_G27,
+ EXYNOS5_GPIO_H00,
+ EXYNOS5_GPIO_H01,
+ EXYNOS5_GPIO_H02,
+ EXYNOS5_GPIO_H03,
+ EXYNOS5_GPIO_H04,
+ EXYNOS5_GPIO_H05,
+ EXYNOS5_GPIO_H06,
+ EXYNOS5_GPIO_H07,
+ EXYNOS5_GPIO_H10,
+ EXYNOS5_GPIO_H11,
+ EXYNOS5_GPIO_H12,
+ EXYNOS5_GPIO_H13,
+ EXYNOS5_GPIO_H14,
+ EXYNOS5_GPIO_H15,
+ EXYNOS5_GPIO_H16,
+ EXYNOS5_GPIO_H17,
+
+ /* GPIO_PART4_STARTS */
+ EXYNOS5_GPIO_MAX_PORT_PART_4,
+ EXYNOS5_GPIO_V00 = EXYNOS5_GPIO_MAX_PORT_PART_4,
+ EXYNOS5_GPIO_V01,
+ EXYNOS5_GPIO_V02,
+ EXYNOS5_GPIO_V03,
+ EXYNOS5_GPIO_V04,
+ EXYNOS5_GPIO_V05,
+ EXYNOS5_GPIO_V06,
+ EXYNOS5_GPIO_V07,
+ EXYNOS5_GPIO_V10,
+ EXYNOS5_GPIO_V11,
+ EXYNOS5_GPIO_V12,
+ EXYNOS5_GPIO_V13,
+ EXYNOS5_GPIO_V14,
+ EXYNOS5_GPIO_V15,
+ EXYNOS5_GPIO_V16,
+ EXYNOS5_GPIO_V17,
+
+ /* GPIO_PART5_STARTS */
+ EXYNOS5_GPIO_MAX_PORT_PART_5,
+ EXYNOS5_GPIO_V20 = EXYNOS5_GPIO_MAX_PORT_PART_5,
+ EXYNOS5_GPIO_V21,
+ EXYNOS5_GPIO_V22,
+ EXYNOS5_GPIO_V23,
+ EXYNOS5_GPIO_V24,
+ EXYNOS5_GPIO_V25,
+ EXYNOS5_GPIO_V26,
+ EXYNOS5_GPIO_V27,
+ EXYNOS5_GPIO_V30,
+ EXYNOS5_GPIO_V31,
+ EXYNOS5_GPIO_V32,
+ EXYNOS5_GPIO_V33,
+ EXYNOS5_GPIO_V34,
+ EXYNOS5_GPIO_V35,
+ EXYNOS5_GPIO_V36,
+ EXYNOS5_GPIO_V37,
+
+ /* GPIO_PART6_STARTS */
+ EXYNOS5_GPIO_MAX_PORT_PART_6,
+ EXYNOS5_GPIO_V40 = EXYNOS5_GPIO_MAX_PORT_PART_6,
+ EXYNOS5_GPIO_V41,
+ EXYNOS5_GPIO_V42,
+ EXYNOS5_GPIO_V43,
+ EXYNOS5_GPIO_V44,
+ EXYNOS5_GPIO_V45,
+ EXYNOS5_GPIO_V46,
+ EXYNOS5_GPIO_V47,
+
+ /* GPIO_PART6_STARTS */
+ EXYNOS5_GPIO_MAX_PORT_PART_7,
+ EXYNOS5_GPIO_Z0 = EXYNOS5_GPIO_MAX_PORT_PART_7,
+ EXYNOS5_GPIO_Z1,
+ EXYNOS5_GPIO_Z2,
+ EXYNOS5_GPIO_Z3,
+ EXYNOS5_GPIO_Z4,
+ EXYNOS5_GPIO_Z5,
+ EXYNOS5_GPIO_Z6,
+ EXYNOS5_GPIO_MAX_PORT
+};
+
+struct gpio_info {
+ unsigned int reg_addr; /* Address of register for this part */
+ unsigned int max_gpio; /* Maximum GPIO in this part */
+};
+
+#define EXYNOS5_GPIO_NUM_PARTS 8
+static struct gpio_info exynos5_gpio_data[EXYNOS5_GPIO_NUM_PARTS] = {
+ { EXYNOS5_GPIO_PART1_BASE, EXYNOS5_GPIO_MAX_PORT_PART_1 },
+ { EXYNOS5_GPIO_PART2_BASE, EXYNOS5_GPIO_MAX_PORT_PART_2 },
+ { EXYNOS5_GPIO_PART3_BASE, EXYNOS5_GPIO_MAX_PORT_PART_3 },
+ { EXYNOS5_GPIO_PART4_BASE, EXYNOS5_GPIO_MAX_PORT_PART_4 },
+ { EXYNOS5_GPIO_PART5_BASE, EXYNOS5_GPIO_MAX_PORT_PART_5 },
+ { EXYNOS5_GPIO_PART6_BASE, EXYNOS5_GPIO_MAX_PORT_PART_6 },
+ { EXYNOS5_GPIO_PART7_BASE, EXYNOS5_GPIO_MAX_PORT_PART_7 },
+ { EXYNOS5_GPIO_PART8_BASE, EXYNOS5_GPIO_MAX_PORT },
+};
+
+static inline struct gpio_info *get_gpio_data(void)
+{
+ if (cpu_is_exynos5())
+ return exynos5_gpio_data;
+ else
+ return NULL;
+}
+
+static inline unsigned int get_bank_num(void)
+{
+ if (cpu_is_exynos5())
+ return EXYNOS5_GPIO_NUM_PARTS;
+ else
+ return 0;
+}
+
+void gpio_cfg_pin(int gpio, int cfg);
+void gpio_set_pull(int gpio, int mode);
+void gpio_set_drv(int gpio, int mode);
+int gpio_direction_output(unsigned gpio, int value);
+int gpio_set_value(unsigned gpio, int value);
#endif
/* Pin configurations */
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
index 8b09e1d..4b5b558 100644
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -73,11 +73,8 @@ static void boot_temp_check(void)
#ifdef CONFIG_USB_EHCI_EXYNOS
int board_usb_vbus_init(void)
{
- struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *)
- samsung_get_base_gpio_part1();
-
/* Enable VBUS power switch */
- s5p_gpio_direction_output(&gpio1->x2, 6, 1);
+ gpio_direction_output(EXYNOS5_GPIO_X26, 1);
/* VBUS turn ON time */
mdelay(3);
@@ -89,12 +86,9 @@ int board_usb_vbus_init(void)
#ifdef CONFIG_SOUND_MAX98095
static void board_enable_audio_codec(void)
{
- struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *)
- samsung_get_base_gpio_part1();
-
/* Enable MAX98095 Codec */
- s5p_gpio_direction_output(&gpio1->x1, 7, 1);
- s5p_gpio_set_pull(&gpio1->x1, 7, GPIO_PULL_NONE);
+ gpio_direction_output(EXYNOS5_GPIO_X17, 1);
+ gpio_set_pull(EXYNOS5_GPIO_X17, GPIO_PULL_NONE);
}
#endif
@@ -457,19 +451,17 @@ int board_early_init_f(void)
#ifdef CONFIG_LCD
void exynos_cfg_lcd_gpio(void)
{
- struct exynos5_gpio_part1 *gpio1 =
- (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
/* For Backlight */
- s5p_gpio_cfg_pin(&gpio1->b2, 0, GPIO_OUTPUT);
- s5p_gpio_set_value(&gpio1->b2, 0, 1);
+ gpio_cfg_pin(EXYNOS5_GPIO_B20, GPIO_OUTPUT);
+ gpio_set_value(EXYNOS5_GPIO_B20, 1);
/* LCD power on */
- s5p_gpio_cfg_pin(&gpio1->x1, 5, GPIO_OUTPUT);
- s5p_gpio_set_value(&gpio1->x1, 5, 1);
+ gpio_cfg_pin(EXYNOS5_GPIO_X15, GPIO_OUTPUT);
+ gpio_set_value(EXYNOS5_GPIO_X15, 1);
/* Set Hotplug detect for DP */
- s5p_gpio_cfg_pin(&gpio1->x0, 7, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_X07, GPIO_FUNC(0x3));
}
void exynos_set_dp_phy(unsigned int onoff)
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index 656bf4a..630ee6e 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -142,6 +142,29 @@ void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode)
writel(value, &bank->drv);
}
+#ifdef HAVE_GENERIC_GPIO
+static struct s5p_gpio_bank *s5p_gpio_get_bank(unsigned int gpio)
+{
+ const struct gpio_info *data;
+ unsigned int upto;
+ int i, count;
+
+ data = get_gpio_data();
+ count = get_bank_num();
+ for (i = upto = 0; i < count;
+ i++, upto = data->max_gpio, data++) {
+ debug("i=%d, upto=%d\n", i, upto);
+ if (gpio < data->max_gpio) {
+ struct s5p_gpio_bank *bank;
+ bank = (struct s5p_gpio_bank *)data->reg_addr;
+ bank += (gpio - upto) / GPIO_PER_BANK;
+ debug("gpio=%d, bank=%p\n", gpio, bank);
+ return bank;
+ }
+ }
+ return NULL;
+}
+#else
struct s5p_gpio_bank *s5p_gpio_get_bank(unsigned gpio)
{
int bank;
@@ -151,6 +174,7 @@ struct s5p_gpio_bank *s5p_gpio_get_bank(unsigned gpio)
bank *= sizeof(struct s5p_gpio_bank);
return (struct s5p_gpio_bank *) (s5p_gpio_base(gpio) + bank);
}
+#endif
int s5p_gpio_get_pin(unsigned gpio)
{
@@ -196,3 +220,21 @@ int gpio_set_value(unsigned gpio, int value)
return 0;
}
+
+void gpio_set_pull(int gpio, int mode)
+{
+ s5p_gpio_set_pull(s5p_gpio_get_bank(gpio),
+ s5p_gpio_get_pin(gpio), mode);
+}
+
+void gpio_set_drv(int gpio, int mode)
+{
+ s5p_gpio_set_drv(s5p_gpio_get_bank(gpio),
+ s5p_gpio_get_pin(gpio), mode);
+}
+
+void gpio_cfg_pin(int gpio, int cfg)
+{
+ s5p_gpio_cfg_pin(s5p_gpio_get_bank(gpio),
+ s5p_gpio_get_pin(gpio), cfg);
+}
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
index b648d6b..cbd1c4e 100644
--- a/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@ -37,6 +37,7 @@
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO
+#define HAVE_GENERIC_GPIO
/* Enable fdt support for Exynos5250 */
#define CONFIG_ARCH_DEVICE_TREE exynos5250
--
1.7.4.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 2/3 V5] S5P: Rename GPIO definitions
2013-04-03 11:54 [U-Boot] [PATCH 0/3 V5] EXYNOS5: Add GPIO numbering feature Rajeshwari Shinde
2013-04-03 11:54 ` [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin " Rajeshwari Shinde
@ 2013-04-03 11:54 ` Rajeshwari Shinde
2013-05-11 18:40 ` Simon Glass
2013-04-03 11:54 ` [U-Boot] [PATCH 3/3 V5] EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5 Rajeshwari Shinde
2 siblings, 1 reply; 13+ messages in thread
From: Rajeshwari Shinde @ 2013-04-03 11:54 UTC (permalink / raw)
To: u-boot
This patch rename GPIO definitions from GPIO_... to S5P_GPIO_...
This changes was done to enable cmd_gpio for EXYNOS and
cmd_gpio has GPIO_INPUT same as s5p_gpio driver and hence
getting a error during compilation.
Build tested for s5p_goni, origen, smdk5250, s5pc210_universal,
trats, smdkc100, smdkv310 config files.
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
---
Changes in V2:
- New patch
Changes in V3:
- Created a table to know the base address of input bank.
Changes in V4:
- Moved the function name_to_gpio to s5p gpio driver and
renamed to s5p_name_to_gpio.
Changes in V5:
- Rebased on latest u-boot-samsung tree
arch/arm/cpu/armv7/exynos/pinmux.c | 134 +++++++++++++++---------------
arch/arm/include/asm/arch-exynos/gpio.h | 26 +++---
arch/arm/include/asm/arch-s5pc1xx/gpio.h | 26 +++---
board/samsung/goni/goni.c | 4 +-
board/samsung/origen/origen.c | 8 +-
board/samsung/smdk5250/smdk5250.c | 8 +-
board/samsung/smdkc100/smdkc100.c | 2 +-
board/samsung/smdkv310/smdkv310.c | 10 +-
board/samsung/trats/trats.c | 17 ++--
board/samsung/universal_c210/universal.c | 36 ++++----
drivers/gpio/s5p_gpio.c | 20 ++--
11 files changed, 146 insertions(+), 145 deletions(-)
diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c
index 2fb5963..d70980b 100644
--- a/arch/arm/cpu/armv7/exynos/pinmux.c
+++ b/arch/arm/cpu/armv7/exynos/pinmux.c
@@ -50,8 +50,8 @@ static void exynos5_uart_config(int peripheral)
break;
}
for (i = start; i < start + count; i++) {
- gpio_set_pull(i, GPIO_PULL_NONE);
- gpio_cfg_pin(i, GPIO_FUNC(0x2));
+ gpio_set_pull(i, S5P_GPIO_PULL_NONE);
+ gpio_cfg_pin(i, S5P_GPIO_FUNC(0x2));
}
}
@@ -63,7 +63,7 @@ static int exynos5_mmc_config(int peripheral, int flags)
case PERIPH_ID_SDMMC0:
start = EXYNOS5_GPIO_C00;
start_ext = EXYNOS5_GPIO_C10;
- gpio_func = GPIO_FUNC(0x2);
+ gpio_func = S5P_GPIO_FUNC(0x2);
break;
case PERIPH_ID_SDMMC1:
start = EXYNOS5_GPIO_C20;
@@ -72,7 +72,7 @@ static int exynos5_mmc_config(int peripheral, int flags)
case PERIPH_ID_SDMMC2:
start = EXYNOS5_GPIO_C30;
start_ext = EXYNOS5_GPIO_C43;
- gpio_func = GPIO_FUNC(0x3);
+ gpio_func = S5P_GPIO_FUNC(0x3);
break;
case PERIPH_ID_SDMMC3:
start = EXYNOS5_GPIO_C40;
@@ -87,19 +87,19 @@ static int exynos5_mmc_config(int peripheral, int flags)
if (flags & PINMUX_FLAG_8BIT_MODE) {
for (i = start_ext; i <= (start_ext + 3); i++) {
gpio_cfg_pin(i, gpio_func);
- gpio_set_pull(i, GPIO_PULL_UP);
- gpio_set_drv(i, GPIO_DRV_4X);
+ gpio_set_pull(i, S5P_GPIO_PULL_UP);
+ gpio_set_drv(i, S5P_GPIO_DRV_4X);
}
}
for (i = 0; i < 2; i++) {
- gpio_cfg_pin(start + i, GPIO_FUNC(0x2));
- gpio_set_pull(start + i, GPIO_PULL_NONE);
- gpio_set_drv(start + i, GPIO_DRV_4X);
+ gpio_cfg_pin(start + i, S5P_GPIO_FUNC(0x2));
+ gpio_set_pull(start + i, S5P_GPIO_PULL_NONE);
+ gpio_set_drv(start + i, S5P_GPIO_DRV_4X);
}
for (i = 3; i <= 6; i++) {
- gpio_cfg_pin(start + i, GPIO_FUNC(0x2));
- gpio_set_pull(start + i, GPIO_PULL_UP);
- gpio_set_drv(start + i, GPIO_DRV_4X);
+ gpio_cfg_pin(start + i, S5P_GPIO_FUNC(0x2));
+ gpio_set_pull(start + i, S5P_GPIO_PULL_UP);
+ gpio_set_drv(start + i, S5P_GPIO_DRV_4X);
}
return 0;
@@ -125,12 +125,12 @@ static void exynos5_sromc_config(int flags)
* GPY1[3] EBI_DATA_RDn(2)
*/
gpio_cfg_pin(EXYNOS5_GPIO_Y00 + (flags & PINMUX_FLAG_BANK),
- GPIO_FUNC(2));
- gpio_cfg_pin(EXYNOS5_GPIO_Y04, GPIO_FUNC(2));
- gpio_cfg_pin(EXYNOS5_GPIO_Y05, GPIO_FUNC(2));
+ S5P_GPIO_FUNC(2));
+ gpio_cfg_pin(EXYNOS5_GPIO_Y04, S5P_GPIO_FUNC(2));
+ gpio_cfg_pin(EXYNOS5_GPIO_Y05, S5P_GPIO_FUNC(2));
for (i = 0; i < 4; i++)
- gpio_cfg_pin(EXYNOS5_GPIO_Y10 + i, GPIO_FUNC(2));
+ gpio_cfg_pin(EXYNOS5_GPIO_Y10 + i, S5P_GPIO_FUNC(2));
/*
* EBI: 8 Addrss Lines
@@ -165,14 +165,14 @@ static void exynos5_sromc_config(int flags)
* GPY6[7] EBI_DATA[15](2)
*/
for (i = 0; i < 8; i++) {
- gpio_cfg_pin(EXYNOS5_GPIO_Y30 + i, GPIO_FUNC(2));
- gpio_set_pull(EXYNOS5_GPIO_Y30 + i, GPIO_PULL_UP);
+ gpio_cfg_pin(EXYNOS5_GPIO_Y30 + i, S5P_GPIO_FUNC(2));
+ gpio_set_pull(EXYNOS5_GPIO_Y30 + i, S5P_GPIO_PULL_UP);
- gpio_cfg_pin(EXYNOS5_GPIO_Y50 + i, GPIO_FUNC(2));
- gpio_set_pull(EXYNOS5_GPIO_Y50 + i, GPIO_PULL_UP);
+ gpio_cfg_pin(EXYNOS5_GPIO_Y50 + i, S5P_GPIO_FUNC(2));
+ gpio_set_pull(EXYNOS5_GPIO_Y50 + i, S5P_GPIO_PULL_UP);
- gpio_cfg_pin(EXYNOS5_GPIO_Y60 + i, GPIO_FUNC(2));
- gpio_set_pull(EXYNOS5_GPIO_Y60 + i, GPIO_PULL_UP);
+ gpio_cfg_pin(EXYNOS5_GPIO_Y60 + i, S5P_GPIO_FUNC(2));
+ gpio_set_pull(EXYNOS5_GPIO_Y60 + i, S5P_GPIO_PULL_UP);
}
}
@@ -181,36 +181,36 @@ static void exynos5_i2c_config(int peripheral, int flags)
switch (peripheral) {
case PERIPH_ID_I2C0:
- gpio_cfg_pin(EXYNOS5_GPIO_B30, GPIO_FUNC(0x2));
- gpio_cfg_pin(EXYNOS5_GPIO_B31, GPIO_FUNC(0x2));
+ gpio_cfg_pin(EXYNOS5_GPIO_B30, S5P_GPIO_FUNC(0x2));
+ gpio_cfg_pin(EXYNOS5_GPIO_B31, S5P_GPIO_FUNC(0x2));
break;
case PERIPH_ID_I2C1:
- gpio_cfg_pin(EXYNOS5_GPIO_B32, GPIO_FUNC(0x2));
- gpio_cfg_pin(EXYNOS5_GPIO_B33, GPIO_FUNC(0x2));
+ gpio_cfg_pin(EXYNOS5_GPIO_B32, S5P_GPIO_FUNC(0x2));
+ gpio_cfg_pin(EXYNOS5_GPIO_B33, S5P_GPIO_FUNC(0x2));
break;
case PERIPH_ID_I2C2:
- gpio_cfg_pin(EXYNOS5_GPIO_A06, GPIO_FUNC(0x3));
- gpio_cfg_pin(EXYNOS5_GPIO_A07, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A06, S5P_GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A07, S5P_GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C3:
- gpio_cfg_pin(EXYNOS5_GPIO_A12, GPIO_FUNC(0x3));
- gpio_cfg_pin(EXYNOS5_GPIO_A13, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A12, S5P_GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A13, S5P_GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C4:
- gpio_cfg_pin(EXYNOS5_GPIO_A20, GPIO_FUNC(0x3));
- gpio_cfg_pin(EXYNOS5_GPIO_A21, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A20, S5P_GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A21, S5P_GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C5:
- gpio_cfg_pin(EXYNOS5_GPIO_A22, GPIO_FUNC(0x3));
- gpio_cfg_pin(EXYNOS5_GPIO_A23, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A22, S5P_GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_A23, S5P_GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C6:
- gpio_cfg_pin(EXYNOS5_GPIO_B13, GPIO_FUNC(0x4));
- gpio_cfg_pin(EXYNOS5_GPIO_B14, GPIO_FUNC(0x4));
+ gpio_cfg_pin(EXYNOS5_GPIO_B13, S5P_GPIO_FUNC(0x4));
+ gpio_cfg_pin(EXYNOS5_GPIO_B14, S5P_GPIO_FUNC(0x4));
break;
case PERIPH_ID_I2C7:
- gpio_cfg_pin(EXYNOS5_GPIO_B22, GPIO_FUNC(0x3));
- gpio_cfg_pin(EXYNOS5_GPIO_B23, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_B22, S5P_GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_B23, S5P_GPIO_FUNC(0x3));
break;
}
}
@@ -220,7 +220,7 @@ static void exynos5_i2s_config(int peripheral)
int i;
for (i = 0; i < 5; i++)
- gpio_cfg_pin(EXYNOS5_GPIO_B00+i, GPIO_FUNC(0x02));
+ gpio_cfg_pin(EXYNOS5_GPIO_B00+i, S5P_GPIO_FUNC(0x02));
}
void exynos5_spi_config(int peripheral)
@@ -229,25 +229,25 @@ void exynos5_spi_config(int peripheral)
switch (peripheral) {
case PERIPH_ID_SPI0:
- cfg = GPIO_FUNC(0x2);
+ cfg = S5P_GPIO_FUNC(0x2);
pin = EXYNOS5_GPIO_A20;
break;
case PERIPH_ID_SPI1:
- cfg = GPIO_FUNC(0x2);
+ cfg = S5P_GPIO_FUNC(0x2);
pin = EXYNOS5_GPIO_A24;
break;
case PERIPH_ID_SPI2:
- cfg = GPIO_FUNC(0x5);
+ cfg = S5P_GPIO_FUNC(0x5);
pin = EXYNOS5_GPIO_B11;
break;
case PERIPH_ID_SPI3:
- cfg = GPIO_FUNC(0x2);
+ cfg = S5P_GPIO_FUNC(0x2);
pin = EXYNOS5_GPIO_F10;
break;
case PERIPH_ID_SPI4:
for (i = 0; i < 2; i++) {
- gpio_cfg_pin(EXYNOS5_GPIO_F02 + i, GPIO_FUNC(0x4));
- gpio_cfg_pin(EXYNOS5_GPIO_E04 + i, GPIO_FUNC(0x4));
+ gpio_cfg_pin(EXYNOS5_GPIO_F02 + i, S5P_GPIO_FUNC(0x4));
+ gpio_cfg_pin(EXYNOS5_GPIO_E04 + i, S5P_GPIO_FUNC(0x4));
}
break;
}
@@ -309,36 +309,36 @@ static void exynos4_i2c_config(int peripheral, int flags)
switch (peripheral) {
case PERIPH_ID_I2C0:
- s5p_gpio_cfg_pin(&gpio1->d1, 0, GPIO_FUNC(0x2));
- s5p_gpio_cfg_pin(&gpio1->d1, 1, GPIO_FUNC(0x2));
+ s5p_gpio_cfg_pin(&gpio1->d1, 0, S5P_GPIO_FUNC(0x2));
+ s5p_gpio_cfg_pin(&gpio1->d1, 1, S5P_GPIO_FUNC(0x2));
break;
case PERIPH_ID_I2C1:
- s5p_gpio_cfg_pin(&gpio1->d1, 2, GPIO_FUNC(0x2));
- s5p_gpio_cfg_pin(&gpio1->d1, 3, GPIO_FUNC(0x2));
+ s5p_gpio_cfg_pin(&gpio1->d1, 2, S5P_GPIO_FUNC(0x2));
+ s5p_gpio_cfg_pin(&gpio1->d1, 3, S5P_GPIO_FUNC(0x2));
break;
case PERIPH_ID_I2C2:
- s5p_gpio_cfg_pin(&gpio1->a0, 6, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->a0, 7, GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->a0, 6, S5P_GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->a0, 7, S5P_GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C3:
- s5p_gpio_cfg_pin(&gpio1->a1, 2, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->a1, 3, GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->a1, 2, S5P_GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->a1, 3, S5P_GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C4:
- s5p_gpio_cfg_pin(&gpio1->b, 2, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->b, 3, GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->b, 2, S5P_GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->b, 3, S5P_GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C5:
- s5p_gpio_cfg_pin(&gpio1->b, 6, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->b, 7, GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->b, 6, S5P_GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->b, 7, S5P_GPIO_FUNC(0x3));
break;
case PERIPH_ID_I2C6:
- s5p_gpio_cfg_pin(&gpio1->c1, 3, GPIO_FUNC(0x4));
- s5p_gpio_cfg_pin(&gpio1->c1, 4, GPIO_FUNC(0x4));
+ s5p_gpio_cfg_pin(&gpio1->c1, 3, S5P_GPIO_FUNC(0x4));
+ s5p_gpio_cfg_pin(&gpio1->c1, 4, S5P_GPIO_FUNC(0x4));
break;
case PERIPH_ID_I2C7:
- s5p_gpio_cfg_pin(&gpio1->d0, 2, GPIO_FUNC(0x3));
- s5p_gpio_cfg_pin(&gpio1->d0, 3, GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->d0, 2, S5P_GPIO_FUNC(0x3));
+ s5p_gpio_cfg_pin(&gpio1->d0, 3, S5P_GPIO_FUNC(0x3));
break;
}
}
@@ -365,15 +365,15 @@ static int exynos4_mmc_config(int peripheral, int flags)
for (i = 0; i < 7; i++) {
if (i == 2)
continue;
- s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
- s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
- s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);
+ s5p_gpio_cfg_pin(bank, i, S5P_GPIO_FUNC(0x2));
+ s5p_gpio_set_pull(bank, i, S5P_GPIO_PULL_NONE);
+ s5p_gpio_set_drv(bank, i, S5P_GPIO_DRV_4X);
}
if (flags & PINMUX_FLAG_8BIT_MODE) {
for (i = 3; i < 7; i++) {
- s5p_gpio_cfg_pin(bank_ext, i, GPIO_FUNC(0x3));
- s5p_gpio_set_pull(bank_ext, i, GPIO_PULL_NONE);
- s5p_gpio_set_drv(bank_ext, i, GPIO_DRV_4X);
+ s5p_gpio_cfg_pin(bank_ext, i, S5P_GPIO_FUNC(0x3));
+ s5p_gpio_set_pull(bank_ext, i, S5P_GPIO_PULL_NONE);
+ s5p_gpio_set_drv(bank_ext, i, S5P_GPIO_DRV_4X);
}
}
diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h
index 20eb459..d8000af 100644
--- a/arch/arm/include/asm/arch-exynos/gpio.h
+++ b/arch/arm/include/asm/arch-exynos/gpio.h
@@ -668,21 +668,21 @@ int gpio_set_value(unsigned gpio, int value);
#endif
/* Pin configurations */
-#define GPIO_INPUT 0x0
-#define GPIO_OUTPUT 0x1
-#define GPIO_IRQ 0xf
-#define GPIO_FUNC(x) (x)
+#define S5P_GPIO_INPUT 0x0
+#define S5P_GPIO_OUTPUT 0x1
+#define S5P_GPIO_IRQ 0xf
+#define S5P_GPIO_FUNC(x) (x)
/* Pull mode */
-#define GPIO_PULL_NONE 0x0
-#define GPIO_PULL_DOWN 0x1
-#define GPIO_PULL_UP 0x3
+#define S5P_GPIO_PULL_NONE 0x0
+#define S5P_GPIO_PULL_DOWN 0x1
+#define S5P_GPIO_PULL_UP 0x3
/* Drive Strength level */
-#define GPIO_DRV_1X 0x0
-#define GPIO_DRV_3X 0x1
-#define GPIO_DRV_2X 0x2
-#define GPIO_DRV_4X 0x3
-#define GPIO_DRV_FAST 0x0
-#define GPIO_DRV_SLOW 0x1
+#define S5P_GPIO_DRV_1X 0x0
+#define S5P_GPIO_DRV_3X 0x1
+#define S5P_GPIO_DRV_2X 0x2
+#define S5P_GPIO_DRV_4X 0x3
+#define S5P_GPIO_DRV_FAST 0x0
+#define S5P_GPIO_DRV_SLOW 0x1
#endif
diff --git a/arch/arm/include/asm/arch-s5pc1xx/gpio.h b/arch/arm/include/asm/arch-s5pc1xx/gpio.h
index 00e498d..e0605a2 100644
--- a/arch/arm/include/asm/arch-s5pc1xx/gpio.h
+++ b/arch/arm/include/asm/arch-s5pc1xx/gpio.h
@@ -155,22 +155,22 @@ static inline unsigned int s5p_gpio_part_max(int nr)
#endif
/* Pin configurations */
-#define GPIO_INPUT 0x0
-#define GPIO_OUTPUT 0x1
-#define GPIO_IRQ 0xf
-#define GPIO_FUNC(x) (x)
+#define S5P_GPIO_INPUT 0x0
+#define S5P_GPIO_OUTPUT 0x1
+#define S5P_GPIO_IRQ 0xf
+#define S5P_GPIO_FUNC(x) (x)
/* Pull mode */
-#define GPIO_PULL_NONE 0x0
-#define GPIO_PULL_DOWN 0x1
-#define GPIO_PULL_UP 0x2
+#define S5P_GPIO_PULL_NONE 0x0
+#define S5P_GPIO_PULL_DOWN 0x1
+#define S5P_GPIO_PULL_UP 0x2
/* Drive Strength level */
-#define GPIO_DRV_1X 0x0
-#define GPIO_DRV_3X 0x1
-#define GPIO_DRV_2X 0x2
-#define GPIO_DRV_4X 0x3
-#define GPIO_DRV_FAST 0x0
-#define GPIO_DRV_SLOW 0x1
+#define S5P_GPIO_DRV_1X 0x0
+#define S5P_GPIO_DRV_3X 0x1
+#define S5P_GPIO_DRV_2X 0x2
+#define S5P_GPIO_DRV_4X 0x3
+#define S5P_GPIO_DRV_FAST 0x0
+#define S5P_GPIO_DRV_SLOW 0x1
#endif
diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c
index ff76963..daa0faa 100644
--- a/board/samsung/goni/goni.c
+++ b/board/samsung/goni/goni.c
@@ -102,9 +102,9 @@ int board_mmc_init(bd_t *bis)
/* GPG0[0:6] special function 2 */
s5p_gpio_cfg_pin(&s5pc110_gpio->g0, i, 0x2);
/* GPG0[0:6] pull disable */
- s5p_gpio_set_pull(&s5pc110_gpio->g0, i, GPIO_PULL_NONE);
+ s5p_gpio_set_pull(&s5pc110_gpio->g0, i, S5P_GPIO_PULL_NONE);
/* GPG0[0:6] drv 4x */
- s5p_gpio_set_drv(&s5pc110_gpio->g0, i, GPIO_DRV_4X);
+ s5p_gpio_set_drv(&s5pc110_gpio->g0, i, S5P_GPIO_DRV_4X);
}
return s5p_mmc_init(0, 4);
diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c
index 638e7b1..1c82ac6 100644
--- a/board/samsung/origen/origen.c
+++ b/board/samsung/origen/origen.c
@@ -88,19 +88,19 @@ int board_mmc_init(bd_t *bis)
*/
for (i = 0; i < 7; i++) {
/* GPK2[0:6] special function 2 */
- s5p_gpio_cfg_pin(&gpio2->k2, i, GPIO_FUNC(0x2));
+ s5p_gpio_cfg_pin(&gpio2->k2, i, S5P_GPIO_FUNC(0x2));
/* GPK2[0:6] drv 4x */
- s5p_gpio_set_drv(&gpio2->k2, i, GPIO_DRV_4X);
+ s5p_gpio_set_drv(&gpio2->k2, i, S5P_GPIO_DRV_4X);
/* GPK2[0:1] pull disable */
if (i == 0 || i == 1) {
- s5p_gpio_set_pull(&gpio2->k2, i, GPIO_PULL_NONE);
+ s5p_gpio_set_pull(&gpio2->k2, i, S5P_GPIO_PULL_NONE);
continue;
}
/* GPK2[2:6] pull up */
- s5p_gpio_set_pull(&gpio2->k2, i, GPIO_PULL_UP);
+ s5p_gpio_set_pull(&gpio2->k2, i, S5P_GPIO_PULL_UP);
}
err = s5p_mmc_init(2, 4);
diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
index 4b5b558..d7add44 100644
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -88,7 +88,7 @@ static void board_enable_audio_codec(void)
{
/* Enable MAX98095 Codec */
gpio_direction_output(EXYNOS5_GPIO_X17, 1);
- gpio_set_pull(EXYNOS5_GPIO_X17, GPIO_PULL_NONE);
+ gpio_set_pull(EXYNOS5_GPIO_X17, S5P_GPIO_PULL_NONE);
}
#endif
@@ -453,15 +453,15 @@ void exynos_cfg_lcd_gpio(void)
{
/* For Backlight */
- gpio_cfg_pin(EXYNOS5_GPIO_B20, GPIO_OUTPUT);
+ gpio_cfg_pin(EXYNOS5_GPIO_B20, S5P_GPIO_OUTPUT);
gpio_set_value(EXYNOS5_GPIO_B20, 1);
/* LCD power on */
- gpio_cfg_pin(EXYNOS5_GPIO_X15, GPIO_OUTPUT);
+ gpio_cfg_pin(EXYNOS5_GPIO_X15, S5P_GPIO_OUTPUT);
gpio_set_value(EXYNOS5_GPIO_X15, 1);
/* Set Hotplug detect for DP */
- gpio_cfg_pin(EXYNOS5_GPIO_X07, GPIO_FUNC(0x3));
+ gpio_cfg_pin(EXYNOS5_GPIO_X07, S5P_GPIO_FUNC(0x3));
}
void exynos_set_dp_phy(unsigned int onoff)
diff --git a/board/samsung/smdkc100/smdkc100.c b/board/samsung/smdkc100/smdkc100.c
index c41e610..87a8f5a 100644
--- a/board/samsung/smdkc100/smdkc100.c
+++ b/board/samsung/smdkc100/smdkc100.c
@@ -41,7 +41,7 @@ static void smc9115_pre_init(void)
(struct s5pc100_gpio *)samsung_get_base_gpio();
/* gpio configuration GPK0CON */
- s5p_gpio_cfg_pin(&gpio->k0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));
+ s5p_gpio_cfg_pin(&gpio->k0, CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
/* Ethernet needs bus width of 16 bits */
smc_bw_conf = SMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
diff --git a/board/samsung/smdkv310/smdkv310.c b/board/samsung/smdkv310/smdkv310.c
index 81ac8f6..24e8f18 100644
--- a/board/samsung/smdkv310/smdkv310.c
+++ b/board/samsung/smdkv310/smdkv310.c
@@ -37,7 +37,7 @@ static void smc9115_pre_init(void)
u32 smc_bw_conf, smc_bc_conf;
/* gpio configuration GPK0CON */
- s5p_gpio_cfg_pin(&gpio2->y0, CONFIG_ENV_SROM_BANK, GPIO_FUNC(2));
+ s5p_gpio_cfg_pin(&gpio2->y0, CONFIG_ENV_SROM_BANK, S5P_GPIO_FUNC(2));
/* Ethernet needs bus width of 16 bits */
smc_bw_conf = SROMC_DATA16_WIDTH(CONFIG_ENV_SROM_BANK);
@@ -119,19 +119,19 @@ int board_mmc_init(bd_t *bis)
*/
for (i = 0; i < 7; i++) {
/* GPK2[0:6] special function 2 */
- s5p_gpio_cfg_pin(&gpio2->k2, i, GPIO_FUNC(0x2));
+ s5p_gpio_cfg_pin(&gpio2->k2, i, S5P_GPIO_FUNC(0x2));
/* GPK2[0:6] drv 4x */
- s5p_gpio_set_drv(&gpio2->k2, i, GPIO_DRV_4X);
+ s5p_gpio_set_drv(&gpio2->k2, i, S5P_GPIO_DRV_4X);
/* GPK2[0:1] pull disable */
if (i == 0 || i == 1) {
- s5p_gpio_set_pull(&gpio2->k2, i, GPIO_PULL_NONE);
+ s5p_gpio_set_pull(&gpio2->k2, i, S5P_GPIO_PULL_NONE);
continue;
}
/* GPK2[2:6] pull up */
- s5p_gpio_set_pull(&gpio2->k2, i, GPIO_PULL_UP);
+ s5p_gpio_set_pull(&gpio2->k2, i, S5P_GPIO_PULL_UP);
}
err = s5p_mmc_init(2, 4);
return err;
diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index e20fb3d..e1d7210 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -391,8 +391,8 @@ static unsigned int get_hw_revision(void)
/* hw_rev[3:0] == GPE1[3:0] */
for (i = 0; i < 4; i++) {
- s5p_gpio_cfg_pin(&gpio->e1, i, GPIO_INPUT);
- s5p_gpio_set_pull(&gpio->e1, i, GPIO_PULL_NONE);
+ s5p_gpio_cfg_pin(&gpio->e1, i, S5P_GPIO_INPUT);
+ s5p_gpio_set_pull(&gpio->e1, i, S5P_GPIO_PULL_NONE);
}
udelay(1);
@@ -431,7 +431,7 @@ int board_mmc_init(bd_t *bis)
/* eMMC_EN: SD_0_CDn: GPK0[2] Output High */
s5p_gpio_direction_output(&gpio->k0, 2, 1);
- s5p_gpio_set_pull(&gpio->k0, 2, GPIO_PULL_NONE);
+ s5p_gpio_set_pull(&gpio->k0, 2, S5P_GPIO_PULL_NONE);
/*
* MMC device init
@@ -446,7 +446,7 @@ int board_mmc_init(bd_t *bis)
/* T-flash detect */
s5p_gpio_cfg_pin(&gpio->x3, 4, 0xf);
- s5p_gpio_set_pull(&gpio->x3, 4, GPIO_PULL_UP);
+ s5p_gpio_set_pull(&gpio->x3, 4, S5P_GPIO_PULL_UP);
/*
* Check the T-flash detect pin
@@ -523,7 +523,7 @@ static void pmic_reset(void)
(struct exynos4_gpio_part2 *)samsung_get_base_gpio_part2();
s5p_gpio_direction_output(&gpio->x0, 7, 1);
- s5p_gpio_set_pull(&gpio->x2, 7, GPIO_PULL_NONE);
+ s5p_gpio_set_pull(&gpio->x2, 7, S5P_GPIO_PULL_NONE);
}
static void board_clock_init(void)
@@ -615,12 +615,13 @@ static void board_uart_init(void)
*/
for (i = 0; i < 4; i++) {
- s5p_gpio_set_pull(&gpio1->a1, i, GPIO_PULL_NONE);
- s5p_gpio_cfg_pin(&gpio1->a1, i, GPIO_FUNC((i > 1) ? 0x3 : 0x2));
+ s5p_gpio_set_pull(&gpio1->a1, i, S5P_GPIO_PULL_NONE);
+ s5p_gpio_cfg_pin(&gpio1->a1, i, S5P_GPIO_FUNC((i > 1) ?
+ 0x3 : 0x2));
}
/* UART_SEL GPY4[7] (part2) at EXYNOS4 */
- s5p_gpio_set_pull(&gpio2->y4, 7, GPIO_PULL_UP);
+ s5p_gpio_set_pull(&gpio2->y4, 7, S5P_GPIO_PULL_UP);
s5p_gpio_direction_output(&gpio2->y4, 7, 1);
}
diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index 9b2770f..45bd12f 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -216,7 +216,7 @@ int board_mmc_init(bd_t *bis)
/* T-flash detect */
s5p_gpio_cfg_pin(&gpio2->x3, 4, 0xf);
- s5p_gpio_set_pull(&gpio2->x3, 4, GPIO_PULL_UP);
+ s5p_gpio_set_pull(&gpio2->x3, 4, S5P_GPIO_PULL_UP);
/*
* Check the T-flash detect pin
@@ -390,35 +390,35 @@ void exynos_cfg_lcd_gpio(void)
for (i = 0; i < 8; i++) {
/* set GPF0,1,2[0:7] for RGB Interface and Data lines (32bit) */
- s5p_gpio_cfg_pin(&gpio1->f0, i, GPIO_FUNC(2));
- s5p_gpio_cfg_pin(&gpio1->f1, i, GPIO_FUNC(2));
- s5p_gpio_cfg_pin(&gpio1->f2, i, GPIO_FUNC(2));
+ s5p_gpio_cfg_pin(&gpio1->f0, i, S5P_GPIO_FUNC(2));
+ s5p_gpio_cfg_pin(&gpio1->f1, i, S5P_GPIO_FUNC(2));
+ s5p_gpio_cfg_pin(&gpio1->f2, i, S5P_GPIO_FUNC(2));
/* pull-up/down disable */
- s5p_gpio_set_pull(&gpio1->f0, i, GPIO_PULL_NONE);
- s5p_gpio_set_pull(&gpio1->f1, i, GPIO_PULL_NONE);
- s5p_gpio_set_pull(&gpio1->f2, i, GPIO_PULL_NONE);
+ s5p_gpio_set_pull(&gpio1->f0, i, S5P_GPIO_PULL_NONE);
+ s5p_gpio_set_pull(&gpio1->f1, i, S5P_GPIO_PULL_NONE);
+ s5p_gpio_set_pull(&gpio1->f2, i, S5P_GPIO_PULL_NONE);
/* drive strength to max (24bit) */
- s5p_gpio_set_drv(&gpio1->f0, i, GPIO_DRV_4X);
- s5p_gpio_set_rate(&gpio1->f0, i, GPIO_DRV_SLOW);
- s5p_gpio_set_drv(&gpio1->f1, i, GPIO_DRV_4X);
- s5p_gpio_set_rate(&gpio1->f1, i, GPIO_DRV_SLOW);
- s5p_gpio_set_drv(&gpio1->f2, i, GPIO_DRV_4X);
- s5p_gpio_set_rate(&gpio1->f0, i, GPIO_DRV_SLOW);
+ s5p_gpio_set_drv(&gpio1->f0, i, S5P_GPIO_DRV_4X);
+ s5p_gpio_set_rate(&gpio1->f0, i, S5P_GPIO_DRV_SLOW);
+ s5p_gpio_set_drv(&gpio1->f1, i, S5P_GPIO_DRV_4X);
+ s5p_gpio_set_rate(&gpio1->f1, i, S5P_GPIO_DRV_SLOW);
+ s5p_gpio_set_drv(&gpio1->f2, i, S5P_GPIO_DRV_4X);
+ s5p_gpio_set_rate(&gpio1->f0, i, S5P_GPIO_DRV_SLOW);
}
for (i = 0; i < f3_end; i++) {
/* set GPF3[0:3] for RGB Interface and Data lines (32bit) */
- s5p_gpio_cfg_pin(&gpio1->f3, i, GPIO_FUNC(2));
+ s5p_gpio_cfg_pin(&gpio1->f3, i, S5P_GPIO_FUNC(2));
/* pull-up/down disable */
- s5p_gpio_set_pull(&gpio1->f3, i, GPIO_PULL_NONE);
+ s5p_gpio_set_pull(&gpio1->f3, i, S5P_GPIO_PULL_NONE);
/* drive strength to max (24bit) */
- s5p_gpio_set_drv(&gpio1->f3, i, GPIO_DRV_4X);
- s5p_gpio_set_rate(&gpio1->f3, i, GPIO_DRV_SLOW);
+
+ s5p_gpio_set_rate(&gpio1->f3, i, S5P_GPIO_DRV_SLOW);
}
/* gpio pad configuration for LCD reset. */
- s5p_gpio_cfg_pin(&gpio2->y4, 5, GPIO_OUTPUT);
+ s5p_gpio_cfg_pin(&gpio2->y4, 5, S5P_GPIO_OUTPUT);
spi_init();
}
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index 630ee6e..d6650c3 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -50,7 +50,7 @@ void s5p_gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en)
{
unsigned int value;
- s5p_gpio_cfg_pin(bank, gpio, GPIO_OUTPUT);
+ s5p_gpio_cfg_pin(bank, gpio, S5P_GPIO_OUTPUT);
value = readl(&bank->dat);
value &= ~DAT_MASK(gpio);
@@ -61,7 +61,7 @@ void s5p_gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en)
void s5p_gpio_direction_input(struct s5p_gpio_bank *bank, int gpio)
{
- s5p_gpio_cfg_pin(bank, gpio, GPIO_INPUT);
+ s5p_gpio_cfg_pin(bank, gpio, S5P_GPIO_INPUT);
}
void s5p_gpio_set_value(struct s5p_gpio_bank *bank, int gpio, int en)
@@ -91,8 +91,8 @@ void s5p_gpio_set_pull(struct s5p_gpio_bank *bank, int gpio, int mode)
value &= ~PULL_MASK(gpio);
switch (mode) {
- case GPIO_PULL_DOWN:
- case GPIO_PULL_UP:
+ case S5P_GPIO_PULL_DOWN:
+ case S5P_GPIO_PULL_UP:
value |= PULL_MODE(gpio, mode);
break;
default:
@@ -110,10 +110,10 @@ void s5p_gpio_set_drv(struct s5p_gpio_bank *bank, int gpio, int mode)
value &= ~DRV_MASK(gpio);
switch (mode) {
- case GPIO_DRV_1X:
- case GPIO_DRV_2X:
- case GPIO_DRV_3X:
- case GPIO_DRV_4X:
+ case S5P_GPIO_DRV_1X:
+ case S5P_GPIO_DRV_2X:
+ case S5P_GPIO_DRV_3X:
+ case S5P_GPIO_DRV_4X:
value |= DRV_SET(gpio, mode);
break;
default:
@@ -131,8 +131,8 @@ void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode)
value &= ~RATE_MASK(gpio);
switch (mode) {
- case GPIO_DRV_FAST:
- case GPIO_DRV_SLOW:
+ case S5P_GPIO_DRV_FAST:
+ case S5P_GPIO_DRV_SLOW:
value |= RATE_SET(gpio);
break;
default:
--
1.7.4.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 3/3 V5] EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5
2013-04-03 11:54 [U-Boot] [PATCH 0/3 V5] EXYNOS5: Add GPIO numbering feature Rajeshwari Shinde
2013-04-03 11:54 ` [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin " Rajeshwari Shinde
2013-04-03 11:54 ` [U-Boot] [PATCH 2/3 V5] S5P: Rename GPIO definitions Rajeshwari Shinde
@ 2013-04-03 11:54 ` Rajeshwari Shinde
2013-05-11 18:41 ` Simon Glass
2013-05-21 7:44 ` Minkyu Kang
2 siblings, 2 replies; 13+ messages in thread
From: Rajeshwari Shinde @ 2013-04-03 11:54 UTC (permalink / raw)
To: u-boot
This patch enables GPIO Command for EXYNOS5.
Function has been added to asm/gpio.h to decode the
input gpio name to gpio number.
example: gpio set gpa00
Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
---
Changes in V2:
- New patch
Changes in V3:
- Created a table to know the base address of input bank.
Changes in V4:
- Moved the function name_to_gpio to s5p gpio driver and
renamed to s5p_name_to_gpio.
Changes in V5:
- Rebased on latest u-boot-samsung tree
arch/arm/include/asm/arch-exynos/gpio.h | 8 +++++
drivers/gpio/s5p_gpio.c | 49 +++++++++++++++++++++++++++++++
include/configs/exynos5250-dt.h | 1 +
3 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h
index d8000af..9b31dc2 100644
--- a/arch/arm/include/asm/arch-exynos/gpio.h
+++ b/arch/arm/include/asm/arch-exynos/gpio.h
@@ -660,6 +660,14 @@ static inline unsigned int get_bank_num(void)
return 0;
}
+struct gpio_name_num_table {
+ char bank;
+ unsigned int base;
+};
+
+int s5p_name_to_gpio(const char *name);
+#define name_to_gpio(n) s5p_name_to_gpio(n)
+
void gpio_cfg_pin(int gpio, int cfg);
void gpio_set_pull(int gpio, int mode);
void gpio_set_drv(int gpio, int mode);
diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
index d6650c3..824977b 100644
--- a/drivers/gpio/s5p_gpio.c
+++ b/drivers/gpio/s5p_gpio.c
@@ -36,6 +36,21 @@
#define RATE_MASK(x) (0x1 << (x + 16))
#define RATE_SET(x) (0x1 << (x + 16))
+struct gpio_name_num_table exynos5_gpio_table[] = {
+ { 'a', EXYNOS5_GPIO_A00 },
+ { 'b', EXYNOS5_GPIO_B00 },
+ { 'c', EXYNOS5_GPIO_C00 },
+ { 'd', EXYNOS5_GPIO_D00 },
+ { 'y', EXYNOS5_GPIO_Y00 },
+ { 'x', EXYNOS5_GPIO_X00 },
+ { 'e', EXYNOS5_GPIO_E00 },
+ { 'f', EXYNOS5_GPIO_F00 },
+ { 'g', EXYNOS5_GPIO_G00 },
+ { 'h', EXYNOS5_GPIO_H00 },
+ { 'v', EXYNOS5_GPIO_V00 },
+ { 'z', EXYNOS5_GPIO_Z0 },
+};
+
void s5p_gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg)
{
unsigned int value;
@@ -238,3 +253,37 @@ void gpio_cfg_pin(int gpio, int cfg)
s5p_gpio_cfg_pin(s5p_gpio_get_bank(gpio),
s5p_gpio_get_pin(gpio), cfg);
}
+
+int s5p_name_to_gpio(const char *name)
+{
+ unsigned int num, i;
+
+ name++;
+
+ if (*name == 'p')
+ ++name;
+
+ for (i = 0; i < ARRAY_SIZE(exynos5_gpio_table); i++) {
+ if (*name == exynos5_gpio_table[i].bank) {
+ if (*name == 'c') {
+ name++;
+ num = simple_strtoul(name, NULL, 10);
+ if (num >= 40) {
+ num = EXYNOS5_GPIO_C40 + (num - 40);
+ } else {
+ num = simple_strtoul(name, NULL, 8);
+ num = exynos5_gpio_table[i].base + num;
+ }
+ } else {
+ name++;
+ num = simple_strtoul(name, NULL, 8);
+ num = exynos5_gpio_table[i].base + num;
+ }
+ break;
+ }
+ }
+
+ if (i == ARRAY_SIZE(exynos5_gpio_table))
+ return -1;
+ return num;
+}
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
index cbd1c4e..46a4e75 100644
--- a/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@ -122,6 +122,7 @@
#define CONFIG_CMD_FAT
#define CONFIG_CMD_NET
#define CONFIG_CMD_HASH
+#define CONFIG_CMD_GPIO
#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK
--
1.7.4.4
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin numbering feature
2013-04-03 11:54 ` [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin " Rajeshwari Shinde
@ 2013-04-17 4:49 ` Rajeshwari Birje
2013-04-19 1:28 ` Minkyu Kang
2013-05-11 18:18 ` Simon Glass
1 sibling, 1 reply; 13+ messages in thread
From: Rajeshwari Birje @ 2013-04-17 4:49 UTC (permalink / raw)
To: u-boot
Hi Minkyu Kang,
Please do let me know if any comments on these patchset.
Regards,
Rajeshwari Shinde
On Wed, Apr 3, 2013 at 5:24 PM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> This patch adds support for gpio pin numbering support on
> EXYNOS5250
> To have consistent 0..n-1 GPIO numbering the banks are divided
> into different parts where ever they have holes in them.
>
> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
> ---
> Changes in V2:
> - none.
> Changes in V3:
> - none.
> Changes in V4:
> - To have consistent 0..n-1 GPIO numbering the banks are divided
> into different parts where ever they have holes in them.
> - Combined previous patch 1 and 2 into single patch.
> Changes in V5:
> - Removed Exynos5 specific code in gpio driver api to
> get bank.
> - Added #define HAVE_GENERIC_GPIO in config file
> to remove conditinal CPU check in gpio driver.
> arch/arm/cpu/armv7/exynos/pinmux.c | 150 ++++------
> arch/arm/include/asm/arch-exynos/cpu.h | 10 +-
> arch/arm/include/asm/arch-exynos/gpio.h | 452 +++++++++++++++++++++++++++----
> board/samsung/smdk5250/smdk5250.c | 24 +-
> drivers/gpio/s5p_gpio.c | 42 +++
> include/configs/exynos5250-dt.h | 1 +
> 6 files changed, 522 insertions(+), 157 deletions(-)
>
> diff --git a/arch/arm/cpu/armv7/exynos/pinmux.c b/arch/arm/cpu/armv7/exynos/pinmux.c
> index bd499b4..2fb5963 100644
> --- a/arch/arm/cpu/armv7/exynos/pinmux.c
> +++ b/arch/arm/cpu/armv7/exynos/pinmux.c
> @@ -29,89 +29,77 @@
>
> static void exynos5_uart_config(int peripheral)
> {
> - struct exynos5_gpio_part1 *gpio1 =
> - (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
> - struct s5p_gpio_bank *bank;
> int i, start, count;
>
> switch (peripheral) {
> case PERIPH_ID_UART0:
> - bank = &gpio1->a0;
> - start = 0;
> + start = EXYNOS5_GPIO_A00;
> count = 4;
> break;
> case PERIPH_ID_UART1:
> - bank = &gpio1->d0;
> - start = 0;
> + start = EXYNOS5_GPIO_D00;
> count = 4;
> break;
> case PERIPH_ID_UART2:
> - bank = &gpio1->a1;
> - start = 0;
> + start = EXYNOS5_GPIO_A10;
> count = 4;
> break;
> case PERIPH_ID_UART3:
> - bank = &gpio1->a1;
> - start = 4;
> + start = EXYNOS5_GPIO_A14;
> count = 2;
> break;
> }
> for (i = start; i < start + count; i++) {
> - s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
> - s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
> + gpio_set_pull(i, GPIO_PULL_NONE);
> + gpio_cfg_pin(i, GPIO_FUNC(0x2));
> }
> }
>
> static int exynos5_mmc_config(int peripheral, int flags)
> {
> - struct exynos5_gpio_part1 *gpio1 =
> - (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
> - struct s5p_gpio_bank *bank, *bank_ext;
> - int i, start = 0, gpio_func = 0;
> + int i, start, start_ext, gpio_func = 0;
>
> switch (peripheral) {
> case PERIPH_ID_SDMMC0:
> - bank = &gpio1->c0;
> - bank_ext = &gpio1->c1;
> - start = 0;
> + start = EXYNOS5_GPIO_C00;
> + start_ext = EXYNOS5_GPIO_C10;
> gpio_func = GPIO_FUNC(0x2);
> break;
> case PERIPH_ID_SDMMC1:
> - bank = &gpio1->c2;
> - bank_ext = NULL;
> + start = EXYNOS5_GPIO_C20;
> + start_ext = 0;
> break;
> case PERIPH_ID_SDMMC2:
> - bank = &gpio1->c3;
> - bank_ext = &gpio1->c4;
> - start = 3;
> + start = EXYNOS5_GPIO_C30;
> + start_ext = EXYNOS5_GPIO_C43;
> gpio_func = GPIO_FUNC(0x3);
> break;
> case PERIPH_ID_SDMMC3:
> - bank = &gpio1->c4;
> - bank_ext = NULL;
> + start = EXYNOS5_GPIO_C40;
> + start_ext = 0;
> break;
> }
> - if ((flags & PINMUX_FLAG_8BIT_MODE) && !bank_ext) {
> + if ((flags & PINMUX_FLAG_8BIT_MODE) && !start_ext) {
> debug("SDMMC device %d does not support 8bit mode",
> peripheral);
> return -1;
> }
> if (flags & PINMUX_FLAG_8BIT_MODE) {
> - for (i = start; i <= (start + 3); i++) {
> - s5p_gpio_cfg_pin(bank_ext, i, gpio_func);
> - s5p_gpio_set_pull(bank_ext, i, GPIO_PULL_UP);
> - s5p_gpio_set_drv(bank_ext, i, GPIO_DRV_4X);
> + for (i = start_ext; i <= (start_ext + 3); i++) {
> + gpio_cfg_pin(i, gpio_func);
> + gpio_set_pull(i, GPIO_PULL_UP);
> + gpio_set_drv(i, GPIO_DRV_4X);
> }
> }
> for (i = 0; i < 2; i++) {
> - s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
> - s5p_gpio_set_pull(bank, i, GPIO_PULL_NONE);
> - s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);
> + gpio_cfg_pin(start + i, GPIO_FUNC(0x2));
> + gpio_set_pull(start + i, GPIO_PULL_NONE);
> + gpio_set_drv(start + i, GPIO_DRV_4X);
> }
> for (i = 3; i <= 6; i++) {
> - s5p_gpio_cfg_pin(bank, i, GPIO_FUNC(0x2));
> - s5p_gpio_set_pull(bank, i, GPIO_PULL_UP);
> - s5p_gpio_set_drv(bank, i, GPIO_DRV_4X);
> + gpio_cfg_pin(start + i, GPIO_FUNC(0x2));
> + gpio_set_pull(start + i, GPIO_PULL_UP);
> + gpio_set_drv(start + i, GPIO_DRV_4X);
> }
>
> return 0;
> @@ -119,8 +107,6 @@ static int exynos5_mmc_config(int peripheral, int flags)
>
> static void exynos5_sromc_config(int flags)
> {
> - struct exynos5_gpio_part1 *gpio1 =
> - (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
> int i;
>
> /*
> @@ -138,13 +124,13 @@ static void exynos5_sromc_config(int flags)
> * GPY1[2] SROM_WAIT(2)
> * GPY1[3] EBI_DATA_RDn(2)
> */
> - s5p_gpio_cfg_pin(&gpio1->y0, (flags & PINMUX_FLAG_BANK),
> - GPIO_FUNC(2));
> - s5p_gpio_cfg_pin(&gpio1->y0, 4, GPIO_FUNC(2));
> - s5p_gpio_cfg_pin(&gpio1->y0, 5, GPIO_FUNC(2));
> + gpio_cfg_pin(EXYNOS5_GPIO_Y00 + (flags & PINMUX_FLAG_BANK),
> + GPIO_FUNC(2));
> + gpio_cfg_pin(EXYNOS5_GPIO_Y04, GPIO_FUNC(2));
> + gpio_cfg_pin(EXYNOS5_GPIO_Y05, GPIO_FUNC(2));
>
> for (i = 0; i < 4; i++)
> - s5p_gpio_cfg_pin(&gpio1->y1, i, GPIO_FUNC(2));
> + gpio_cfg_pin(EXYNOS5_GPIO_Y10 + i, GPIO_FUNC(2));
>
> /*
> * EBI: 8 Addrss Lines
> @@ -179,55 +165,52 @@ static void exynos5_sromc_config(int flags)
> * GPY6[7] EBI_DATA[15](2)
> */
> for (i = 0; i < 8; i++) {
> - s5p_gpio_cfg_pin(&gpio1->y3, i, GPIO_FUNC(2));
> - s5p_gpio_set_pull(&gpio1->y3, i, GPIO_PULL_UP);
> + gpio_cfg_pin(EXYNOS5_GPIO_Y30 + i, GPIO_FUNC(2));
> + gpio_set_pull(EXYNOS5_GPIO_Y30 + i, GPIO_PULL_UP);
>
> - s5p_gpio_cfg_pin(&gpio1->y5, i, GPIO_FUNC(2));
> - s5p_gpio_set_pull(&gpio1->y5, i, GPIO_PULL_UP);
> + gpio_cfg_pin(EXYNOS5_GPIO_Y50 + i, GPIO_FUNC(2));
> + gpio_set_pull(EXYNOS5_GPIO_Y50 + i, GPIO_PULL_UP);
>
> - s5p_gpio_cfg_pin(&gpio1->y6, i, GPIO_FUNC(2));
> - s5p_gpio_set_pull(&gpio1->y6, i, GPIO_PULL_UP);
> + gpio_cfg_pin(EXYNOS5_GPIO_Y60 + i, GPIO_FUNC(2));
> + gpio_set_pull(EXYNOS5_GPIO_Y60 + i, GPIO_PULL_UP);
> }
> }
>
> static void exynos5_i2c_config(int peripheral, int flags)
> {
>
> - struct exynos5_gpio_part1 *gpio1 =
> - (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
> -
> switch (peripheral) {
> case PERIPH_ID_I2C0:
> - s5p_gpio_cfg_pin(&gpio1->b3, 0, GPIO_FUNC(0x2));
> - s5p_gpio_cfg_pin(&gpio1->b3, 1, GPIO_FUNC(0x2));
> + gpio_cfg_pin(EXYNOS5_GPIO_B30, GPIO_FUNC(0x2));
> + gpio_cfg_pin(EXYNOS5_GPIO_B31, GPIO_FUNC(0x2));
> break;
> case PERIPH_ID_I2C1:
> - s5p_gpio_cfg_pin(&gpio1->b3, 2, GPIO_FUNC(0x2));
> - s5p_gpio_cfg_pin(&gpio1->b3, 3, GPIO_FUNC(0x2));
> + gpio_cfg_pin(EXYNOS5_GPIO_B32, GPIO_FUNC(0x2));
> + gpio_cfg_pin(EXYNOS5_GPIO_B33, GPIO_FUNC(0x2));
> break;
> case PERIPH_ID_I2C2:
> - s5p_gpio_cfg_pin(&gpio1->a0, 6, GPIO_FUNC(0x3));
> - s5p_gpio_cfg_pin(&gpio1->a0, 7, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_A06, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_A07, GPIO_FUNC(0x3));
> break;
> case PERIPH_ID_I2C3:
> - s5p_gpio_cfg_pin(&gpio1->a1, 2, GPIO_FUNC(0x3));
> - s5p_gpio_cfg_pin(&gpio1->a1, 3, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_A12, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_A13, GPIO_FUNC(0x3));
> break;
> case PERIPH_ID_I2C4:
> - s5p_gpio_cfg_pin(&gpio1->a2, 0, GPIO_FUNC(0x3));
> - s5p_gpio_cfg_pin(&gpio1->a2, 1, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_A20, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_A21, GPIO_FUNC(0x3));
> break;
> case PERIPH_ID_I2C5:
> - s5p_gpio_cfg_pin(&gpio1->a2, 2, GPIO_FUNC(0x3));
> - s5p_gpio_cfg_pin(&gpio1->a2, 3, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_A22, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_A23, GPIO_FUNC(0x3));
> break;
> case PERIPH_ID_I2C6:
> - s5p_gpio_cfg_pin(&gpio1->b1, 3, GPIO_FUNC(0x4));
> - s5p_gpio_cfg_pin(&gpio1->b1, 4, GPIO_FUNC(0x4));
> + gpio_cfg_pin(EXYNOS5_GPIO_B13, GPIO_FUNC(0x4));
> + gpio_cfg_pin(EXYNOS5_GPIO_B14, GPIO_FUNC(0x4));
> break;
> case PERIPH_ID_I2C7:
> - s5p_gpio_cfg_pin(&gpio1->b2, 2, GPIO_FUNC(0x3));
> - s5p_gpio_cfg_pin(&gpio1->b2, 3, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_B22, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_B23, GPIO_FUNC(0x3));
> break;
> }
> }
> @@ -235,53 +218,42 @@ static void exynos5_i2c_config(int peripheral, int flags)
> static void exynos5_i2s_config(int peripheral)
> {
> int i;
> - struct exynos5_gpio_part1 *gpio1 =
> - (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
>
> for (i = 0; i < 5; i++)
> - s5p_gpio_cfg_pin(&gpio1->b0, i, GPIO_FUNC(0x02));
> + gpio_cfg_pin(EXYNOS5_GPIO_B00+i, GPIO_FUNC(0x02));
> }
>
> void exynos5_spi_config(int peripheral)
> {
> int cfg = 0, pin = 0, i;
> - struct s5p_gpio_bank *bank = NULL;
> - struct exynos5_gpio_part1 *gpio1 =
> - (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
> - struct exynos5_gpio_part2 *gpio2 =
> - (struct exynos5_gpio_part2 *) samsung_get_base_gpio_part2();
>
> switch (peripheral) {
> case PERIPH_ID_SPI0:
> - bank = &gpio1->a2;
> cfg = GPIO_FUNC(0x2);
> - pin = 0;
> + pin = EXYNOS5_GPIO_A20;
> break;
> case PERIPH_ID_SPI1:
> - bank = &gpio1->a2;
> cfg = GPIO_FUNC(0x2);
> - pin = 4;
> + pin = EXYNOS5_GPIO_A24;
> break;
> case PERIPH_ID_SPI2:
> - bank = &gpio1->b1;
> cfg = GPIO_FUNC(0x5);
> - pin = 1;
> + pin = EXYNOS5_GPIO_B11;
> break;
> case PERIPH_ID_SPI3:
> - bank = &gpio2->f1;
> cfg = GPIO_FUNC(0x2);
> - pin = 0;
> + pin = EXYNOS5_GPIO_F10;
> break;
> case PERIPH_ID_SPI4:
> for (i = 0; i < 2; i++) {
> - s5p_gpio_cfg_pin(&gpio2->f0, i + 2, GPIO_FUNC(0x4));
> - s5p_gpio_cfg_pin(&gpio2->e0, i + 4, GPIO_FUNC(0x4));
> + gpio_cfg_pin(EXYNOS5_GPIO_F02 + i, GPIO_FUNC(0x4));
> + gpio_cfg_pin(EXYNOS5_GPIO_E04 + i, GPIO_FUNC(0x4));
> }
> break;
> }
> if (peripheral != PERIPH_ID_SPI4) {
> for (i = pin; i < pin + 4; i++)
> - s5p_gpio_cfg_pin(bank, i, cfg);
> + gpio_cfg_pin(i, cfg);
> }
> }
>
> diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h
> index 2a20558..94b8864 100644
> --- a/arch/arm/include/asm/arch-exynos/cpu.h
> +++ b/arch/arm/include/asm/arch-exynos/cpu.h
> @@ -101,7 +101,7 @@
> /* EXYNOS5 Common*/
> #define EXYNOS5_I2C_SPACING 0x10000
>
> -#define EXYNOS5_GPIO_PART4_BASE 0x03860000
> +#define EXYNOS5_GPIO_PART8_BASE 0x03860000
> #define EXYNOS5_PRO_ID 0x10000000
> #define EXYNOS5_CLOCK_BASE 0x10010000
> #define EXYNOS5_POWER_BASE 0x10040000
> @@ -111,9 +111,13 @@
> #define EXYNOS5_ACE_SFR_BASE 0x10830000
> #define EXYNOS5_DMC_PHY0_BASE 0x10C00000
> #define EXYNOS5_DMC_PHY1_BASE 0x10C10000
> -#define EXYNOS5_GPIO_PART3_BASE 0x10D10000
> +#define EXYNOS5_GPIO_PART5_BASE 0x10D10000
> +#define EXYNOS5_GPIO_PART6_BASE 0x10D10060
> +#define EXYNOS5_GPIO_PART7_BASE 0x10D100C0
> #define EXYNOS5_DMC_CTRL_BASE 0x10DD0000
> #define EXYNOS5_GPIO_PART1_BASE 0x11400000
> +#define EXYNOS5_GPIO_PART2_BASE 0x114002E0
> +#define EXYNOS5_GPIO_PART3_BASE 0x11400C00
> #define EXYNOS5_MIPI_DSIM_BASE 0x11D00000
> #define EXYNOS5_USB_HOST_EHCI_BASE 0x12110000
> #define EXYNOS5_USBPHY_BASE 0x12130000
> @@ -126,7 +130,7 @@
> #define EXYNOS5_I2S_BASE 0x12D60000
> #define EXYNOS5_PWMTIMER_BASE 0x12DD0000
> #define EXYNOS5_SPI_ISP_BASE 0x131A0000
> -#define EXYNOS5_GPIO_PART2_BASE 0x13400000
> +#define EXYNOS5_GPIO_PART4_BASE 0x13400000
> #define EXYNOS5_FIMD_BASE 0x14400000
> #define EXYNOS5_DP_BASE 0x145B0000
>
> diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h
> index cfe1024..20eb459 100644
> --- a/arch/arm/include/asm/arch-exynos/gpio.h
> +++ b/arch/arm/include/asm/arch-exynos/gpio.h
> @@ -161,16 +161,20 @@ struct exynos5_gpio_part1 {
> struct s5p_gpio_bank y4;
> struct s5p_gpio_bank y5;
> struct s5p_gpio_bank y6;
> - struct s5p_gpio_bank res1[0x3];
> +};
> +
> +struct exynos5_gpio_part2 {
> struct s5p_gpio_bank c4;
> - struct s5p_gpio_bank res2[0x48];
> +};
> +
> +struct exynos5_gpio_part3 {
> struct s5p_gpio_bank x0;
> struct s5p_gpio_bank x1;
> struct s5p_gpio_bank x2;
> struct s5p_gpio_bank x3;
> };
>
> -struct exynos5_gpio_part2 {
> +struct exynos5_gpio_part4 {
> struct s5p_gpio_bank e0;
> struct s5p_gpio_bank e1;
> struct s5p_gpio_bank f0;
> @@ -182,20 +186,25 @@ struct exynos5_gpio_part2 {
> struct s5p_gpio_bank h1;
> };
>
> -struct exynos5_gpio_part3 {
> +struct exynos5_gpio_part5 {
> struct s5p_gpio_bank v0;
> struct s5p_gpio_bank v1;
> - struct s5p_gpio_bank res1[0x1];
> +};
> +
> +struct exynos5_gpio_part6 {
> struct s5p_gpio_bank v2;
> struct s5p_gpio_bank v3;
> - struct s5p_gpio_bank res2[0x1];
> +};
> +
> +struct exynos5_gpio_part7 {
> struct s5p_gpio_bank v4;
> };
>
> -struct exynos5_gpio_part4 {
> +struct exynos5_gpio_part8 {
> struct s5p_gpio_bank z;
> };
>
> +
> /* functions */
> void s5p_gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg);
> void s5p_gpio_direction_output(struct s5p_gpio_bank *bank, int gpio, int en);
> @@ -248,41 +257,9 @@ void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode);
> - EXYNOS4X12_GPIO_PART3_BASE) / sizeof(struct s5p_gpio_bank)) \
> * GPIO_PER_BANK) + pin) + EXYNOS4X12_GPIO_PART2_MAX)
>
> -#define exynos5_gpio_part1_get_nr(bank, pin) \
> - ((((((unsigned int) &(((struct exynos5_gpio_part1 *) \
> - EXYNOS5_GPIO_PART1_BASE)->bank)) \
> - - EXYNOS5_GPIO_PART1_BASE) / sizeof(struct s5p_gpio_bank)) \
> - * GPIO_PER_BANK) + pin)
> -
> -#define EXYNOS5_GPIO_PART1_MAX ((sizeof(struct exynos5_gpio_part1) \
> - / sizeof(struct s5p_gpio_bank)) * GPIO_PER_BANK)
> -
> -#define exynos5_gpio_part2_get_nr(bank, pin) \
> - (((((((unsigned int) &(((struct exynos5_gpio_part2 *) \
> - EXYNOS5_GPIO_PART2_BASE)->bank)) \
> - - EXYNOS5_GPIO_PART2_BASE) / sizeof(struct s5p_gpio_bank)) \
> - * GPIO_PER_BANK) + pin) + EXYNOS5_GPIO_PART1_MAX)
> -
> -#define EXYNOS5_GPIO_PART2_MAX ((sizeof(struct exynos5_gpio_part2) \
> - / sizeof(struct s5p_gpio_bank)) * GPIO_PER_BANK)
> -
> -#define exynos5_gpio_part3_get_nr(bank, pin) \
> - (((((((unsigned int) &(((struct exynos5_gpio_part3 *) \
> - EXYNOS5_GPIO_PART3_BASE)->bank)) \
> - - EXYNOS5_GPIO_PART3_BASE) / sizeof(struct s5p_gpio_bank)) \
> - * GPIO_PER_BANK) + pin) + EXYNOS5_GPIO_PART2_MAX)
> -
> static inline unsigned int s5p_gpio_base(int nr)
> {
> - if (cpu_is_exynos5()) {
> - if (nr < EXYNOS5_GPIO_PART1_MAX)
> - return EXYNOS5_GPIO_PART1_BASE;
> - else if (nr < EXYNOS5_GPIO_PART2_MAX)
> - return EXYNOS5_GPIO_PART2_BASE;
> - else
> - return EXYNOS5_GPIO_PART3_BASE;
> -
> - } else if (cpu_is_exynos4()) {
> + if (cpu_is_exynos4()) {
> if (nr < EXYNOS4_GPIO_PART1_MAX)
> return EXYNOS4_GPIO_PART1_BASE;
> else
> @@ -294,15 +271,7 @@ static inline unsigned int s5p_gpio_base(int nr)
>
> static inline unsigned int s5p_gpio_part_max(int nr)
> {
> - if (cpu_is_exynos5()) {
> - if (nr < EXYNOS5_GPIO_PART1_MAX)
> - return 0;
> - else if (nr < EXYNOS5_GPIO_PART2_MAX)
> - return EXYNOS5_GPIO_PART1_MAX;
> - else
> - return EXYNOS5_GPIO_PART2_MAX;
> -
> - } else if (cpu_is_exynos4()) {
> + if (cpu_is_exynos4()) {
> if (nr < EXYNOS4_GPIO_PART1_MAX)
> return 0;
> else
> @@ -311,6 +280,391 @@ static inline unsigned int s5p_gpio_part_max(int nr)
>
> return 0;
> }
> +
> +/* A list of valid GPIO numbers for the asm-generic/gpio.h interface */
> +enum exynos5_gpio_pin {
> + /* GPIO_PART1_STARTS */
> + EXYNOS5_GPIO_A00,
> + EXYNOS5_GPIO_A01,
> + EXYNOS5_GPIO_A02,
> + EXYNOS5_GPIO_A03,
> + EXYNOS5_GPIO_A04,
> + EXYNOS5_GPIO_A05,
> + EXYNOS5_GPIO_A06,
> + EXYNOS5_GPIO_A07,
> + EXYNOS5_GPIO_A10,
> + EXYNOS5_GPIO_A11,
> + EXYNOS5_GPIO_A12,
> + EXYNOS5_GPIO_A13,
> + EXYNOS5_GPIO_A14,
> + EXYNOS5_GPIO_A15,
> + EXYNOS5_GPIO_A16,
> + EXYNOS5_GPIO_A17,
> + EXYNOS5_GPIO_A20,
> + EXYNOS5_GPIO_A21,
> + EXYNOS5_GPIO_A22,
> + EXYNOS5_GPIO_A23,
> + EXYNOS5_GPIO_A24,
> + EXYNOS5_GPIO_A25,
> + EXYNOS5_GPIO_A26,
> + EXYNOS5_GPIO_A27,
> + EXYNOS5_GPIO_B00,
> + EXYNOS5_GPIO_B01,
> + EXYNOS5_GPIO_B02,
> + EXYNOS5_GPIO_B03,
> + EXYNOS5_GPIO_B04,
> + EXYNOS5_GPIO_B05,
> + EXYNOS5_GPIO_B06,
> + EXYNOS5_GPIO_B07,
> + EXYNOS5_GPIO_B10,
> + EXYNOS5_GPIO_B11,
> + EXYNOS5_GPIO_B12,
> + EXYNOS5_GPIO_B13,
> + EXYNOS5_GPIO_B14,
> + EXYNOS5_GPIO_B15,
> + EXYNOS5_GPIO_B16,
> + EXYNOS5_GPIO_B17,
> + EXYNOS5_GPIO_B20,
> + EXYNOS5_GPIO_B21,
> + EXYNOS5_GPIO_B22,
> + EXYNOS5_GPIO_B23,
> + EXYNOS5_GPIO_B24,
> + EXYNOS5_GPIO_B25,
> + EXYNOS5_GPIO_B26,
> + EXYNOS5_GPIO_B27,
> + EXYNOS5_GPIO_B30,
> + EXYNOS5_GPIO_B31,
> + EXYNOS5_GPIO_B32,
> + EXYNOS5_GPIO_B33,
> + EXYNOS5_GPIO_B34,
> + EXYNOS5_GPIO_B35,
> + EXYNOS5_GPIO_B36,
> + EXYNOS5_GPIO_B37,
> + EXYNOS5_GPIO_C00,
> + EXYNOS5_GPIO_C01,
> + EXYNOS5_GPIO_C02,
> + EXYNOS5_GPIO_C03,
> + EXYNOS5_GPIO_C04,
> + EXYNOS5_GPIO_C05,
> + EXYNOS5_GPIO_C06,
> + EXYNOS5_GPIO_C07,
> + EXYNOS5_GPIO_C10,
> + EXYNOS5_GPIO_C11,
> + EXYNOS5_GPIO_C12,
> + EXYNOS5_GPIO_C13,
> + EXYNOS5_GPIO_C14,
> + EXYNOS5_GPIO_C15,
> + EXYNOS5_GPIO_C16,
> + EXYNOS5_GPIO_C17,
> + EXYNOS5_GPIO_C20,
> + EXYNOS5_GPIO_C21,
> + EXYNOS5_GPIO_C22,
> + EXYNOS5_GPIO_C23,
> + EXYNOS5_GPIO_C24,
> + EXYNOS5_GPIO_C25,
> + EXYNOS5_GPIO_C26,
> + EXYNOS5_GPIO_C27,
> + EXYNOS5_GPIO_C30,
> + EXYNOS5_GPIO_C31,
> + EXYNOS5_GPIO_C32,
> + EXYNOS5_GPIO_C33,
> + EXYNOS5_GPIO_C34,
> + EXYNOS5_GPIO_C35,
> + EXYNOS5_GPIO_C36,
> + EXYNOS5_GPIO_C37,
> + EXYNOS5_GPIO_D00,
> + EXYNOS5_GPIO_D01,
> + EXYNOS5_GPIO_D02,
> + EXYNOS5_GPIO_D03,
> + EXYNOS5_GPIO_D04,
> + EXYNOS5_GPIO_D05,
> + EXYNOS5_GPIO_D06,
> + EXYNOS5_GPIO_D07,
> + EXYNOS5_GPIO_D10,
> + EXYNOS5_GPIO_D11,
> + EXYNOS5_GPIO_D12,
> + EXYNOS5_GPIO_D13,
> + EXYNOS5_GPIO_D14,
> + EXYNOS5_GPIO_D15,
> + EXYNOS5_GPIO_D16,
> + EXYNOS5_GPIO_D17,
> + EXYNOS5_GPIO_Y00,
> + EXYNOS5_GPIO_Y01,
> + EXYNOS5_GPIO_Y02,
> + EXYNOS5_GPIO_Y03,
> + EXYNOS5_GPIO_Y04,
> + EXYNOS5_GPIO_Y05,
> + EXYNOS5_GPIO_Y06,
> + EXYNOS5_GPIO_Y07,
> + EXYNOS5_GPIO_Y10,
> + EXYNOS5_GPIO_Y11,
> + EXYNOS5_GPIO_Y12,
> + EXYNOS5_GPIO_Y13,
> + EXYNOS5_GPIO_Y14,
> + EXYNOS5_GPIO_Y15,
> + EXYNOS5_GPIO_Y16,
> + EXYNOS5_GPIO_Y17,
> + EXYNOS5_GPIO_Y20,
> + EXYNOS5_GPIO_Y21,
> + EXYNOS5_GPIO_Y22,
> + EXYNOS5_GPIO_Y23,
> + EXYNOS5_GPIO_Y24,
> + EXYNOS5_GPIO_Y25,
> + EXYNOS5_GPIO_Y26,
> + EXYNOS5_GPIO_Y27,
> + EXYNOS5_GPIO_Y30,
> + EXYNOS5_GPIO_Y31,
> + EXYNOS5_GPIO_Y32,
> + EXYNOS5_GPIO_Y33,
> + EXYNOS5_GPIO_Y34,
> + EXYNOS5_GPIO_Y35,
> + EXYNOS5_GPIO_Y36,
> + EXYNOS5_GPIO_Y37,
> + EXYNOS5_GPIO_Y40,
> + EXYNOS5_GPIO_Y41,
> + EXYNOS5_GPIO_Y42,
> + EXYNOS5_GPIO_Y43,
> + EXYNOS5_GPIO_Y44,
> + EXYNOS5_GPIO_Y45,
> + EXYNOS5_GPIO_Y46,
> + EXYNOS5_GPIO_Y47,
> + EXYNOS5_GPIO_Y50,
> + EXYNOS5_GPIO_Y51,
> + EXYNOS5_GPIO_Y52,
> + EXYNOS5_GPIO_Y53,
> + EXYNOS5_GPIO_Y54,
> + EXYNOS5_GPIO_Y55,
> + EXYNOS5_GPIO_Y56,
> + EXYNOS5_GPIO_Y57,
> + EXYNOS5_GPIO_Y60,
> + EXYNOS5_GPIO_Y61,
> + EXYNOS5_GPIO_Y62,
> + EXYNOS5_GPIO_Y63,
> + EXYNOS5_GPIO_Y64,
> + EXYNOS5_GPIO_Y65,
> + EXYNOS5_GPIO_Y66,
> + EXYNOS5_GPIO_Y67,
> +
> + /* GPIO_PART2_STARTS */
> + EXYNOS5_GPIO_MAX_PORT_PART_1,
> + EXYNOS5_GPIO_C40 = EXYNOS5_GPIO_MAX_PORT_PART_1,
> + EXYNOS5_GPIO_C41,
> + EXYNOS5_GPIO_C42,
> + EXYNOS5_GPIO_C43,
> + EXYNOS5_GPIO_C44,
> + EXYNOS5_GPIO_C45,
> + EXYNOS5_GPIO_C46,
> + EXYNOS5_GPIO_C47,
> +
> + /* GPIO_PART3_STARTS */
> + EXYNOS5_GPIO_MAX_PORT_PART_2,
> + EXYNOS5_GPIO_X00 = EXYNOS5_GPIO_MAX_PORT_PART_2,
> + EXYNOS5_GPIO_X01,
> + EXYNOS5_GPIO_X02,
> + EXYNOS5_GPIO_X03,
> + EXYNOS5_GPIO_X04,
> + EXYNOS5_GPIO_X05,
> + EXYNOS5_GPIO_X06,
> + EXYNOS5_GPIO_X07,
> + EXYNOS5_GPIO_X10,
> + EXYNOS5_GPIO_X11,
> + EXYNOS5_GPIO_X12,
> + EXYNOS5_GPIO_X13,
> + EXYNOS5_GPIO_X14,
> + EXYNOS5_GPIO_X15,
> + EXYNOS5_GPIO_X16,
> + EXYNOS5_GPIO_X17,
> + EXYNOS5_GPIO_X20,
> + EXYNOS5_GPIO_X21,
> + EXYNOS5_GPIO_X22,
> + EXYNOS5_GPIO_X23,
> + EXYNOS5_GPIO_X24,
> + EXYNOS5_GPIO_X25,
> + EXYNOS5_GPIO_X26,
> + EXYNOS5_GPIO_X27,
> + EXYNOS5_GPIO_X30,
> + EXYNOS5_GPIO_X31,
> + EXYNOS5_GPIO_X32,
> + EXYNOS5_GPIO_X33,
> + EXYNOS5_GPIO_X34,
> + EXYNOS5_GPIO_X35,
> + EXYNOS5_GPIO_X36,
> + EXYNOS5_GPIO_X37,
> +
> + /* GPIO_PART4_STARTS */
> + EXYNOS5_GPIO_MAX_PORT_PART_3,
> + EXYNOS5_GPIO_E00 = EXYNOS5_GPIO_MAX_PORT_PART_3,
> + EXYNOS5_GPIO_E01,
> + EXYNOS5_GPIO_E02,
> + EXYNOS5_GPIO_E03,
> + EXYNOS5_GPIO_E04,
> + EXYNOS5_GPIO_E05,
> + EXYNOS5_GPIO_E06,
> + EXYNOS5_GPIO_E07,
> + EXYNOS5_GPIO_E10,
> + EXYNOS5_GPIO_E11,
> + EXYNOS5_GPIO_E12,
> + EXYNOS5_GPIO_E13,
> + EXYNOS5_GPIO_E14,
> + EXYNOS5_GPIO_E15,
> + EXYNOS5_GPIO_E16,
> + EXYNOS5_GPIO_E17,
> + EXYNOS5_GPIO_F00,
> + EXYNOS5_GPIO_F01,
> + EXYNOS5_GPIO_F02,
> + EXYNOS5_GPIO_F03,
> + EXYNOS5_GPIO_F04,
> + EXYNOS5_GPIO_F05,
> + EXYNOS5_GPIO_F06,
> + EXYNOS5_GPIO_F07,
> + EXYNOS5_GPIO_F10,
> + EXYNOS5_GPIO_F11,
> + EXYNOS5_GPIO_F12,
> + EXYNOS5_GPIO_F13,
> + EXYNOS5_GPIO_F14,
> + EXYNOS5_GPIO_F15,
> + EXYNOS5_GPIO_F16,
> + EXYNOS5_GPIO_F17,
> + EXYNOS5_GPIO_G00,
> + EXYNOS5_GPIO_G01,
> + EXYNOS5_GPIO_G02,
> + EXYNOS5_GPIO_G03,
> + EXYNOS5_GPIO_G04,
> + EXYNOS5_GPIO_G05,
> + EXYNOS5_GPIO_G06,
> + EXYNOS5_GPIO_G07,
> + EXYNOS5_GPIO_G10,
> + EXYNOS5_GPIO_G11,
> + EXYNOS5_GPIO_G12,
> + EXYNOS5_GPIO_G13,
> + EXYNOS5_GPIO_G14,
> + EXYNOS5_GPIO_G15,
> + EXYNOS5_GPIO_G16,
> + EXYNOS5_GPIO_G17,
> + EXYNOS5_GPIO_G20,
> + EXYNOS5_GPIO_G21,
> + EXYNOS5_GPIO_G22,
> + EXYNOS5_GPIO_G23,
> + EXYNOS5_GPIO_G24,
> + EXYNOS5_GPIO_G25,
> + EXYNOS5_GPIO_G26,
> + EXYNOS5_GPIO_G27,
> + EXYNOS5_GPIO_H00,
> + EXYNOS5_GPIO_H01,
> + EXYNOS5_GPIO_H02,
> + EXYNOS5_GPIO_H03,
> + EXYNOS5_GPIO_H04,
> + EXYNOS5_GPIO_H05,
> + EXYNOS5_GPIO_H06,
> + EXYNOS5_GPIO_H07,
> + EXYNOS5_GPIO_H10,
> + EXYNOS5_GPIO_H11,
> + EXYNOS5_GPIO_H12,
> + EXYNOS5_GPIO_H13,
> + EXYNOS5_GPIO_H14,
> + EXYNOS5_GPIO_H15,
> + EXYNOS5_GPIO_H16,
> + EXYNOS5_GPIO_H17,
> +
> + /* GPIO_PART4_STARTS */
> + EXYNOS5_GPIO_MAX_PORT_PART_4,
> + EXYNOS5_GPIO_V00 = EXYNOS5_GPIO_MAX_PORT_PART_4,
> + EXYNOS5_GPIO_V01,
> + EXYNOS5_GPIO_V02,
> + EXYNOS5_GPIO_V03,
> + EXYNOS5_GPIO_V04,
> + EXYNOS5_GPIO_V05,
> + EXYNOS5_GPIO_V06,
> + EXYNOS5_GPIO_V07,
> + EXYNOS5_GPIO_V10,
> + EXYNOS5_GPIO_V11,
> + EXYNOS5_GPIO_V12,
> + EXYNOS5_GPIO_V13,
> + EXYNOS5_GPIO_V14,
> + EXYNOS5_GPIO_V15,
> + EXYNOS5_GPIO_V16,
> + EXYNOS5_GPIO_V17,
> +
> + /* GPIO_PART5_STARTS */
> + EXYNOS5_GPIO_MAX_PORT_PART_5,
> + EXYNOS5_GPIO_V20 = EXYNOS5_GPIO_MAX_PORT_PART_5,
> + EXYNOS5_GPIO_V21,
> + EXYNOS5_GPIO_V22,
> + EXYNOS5_GPIO_V23,
> + EXYNOS5_GPIO_V24,
> + EXYNOS5_GPIO_V25,
> + EXYNOS5_GPIO_V26,
> + EXYNOS5_GPIO_V27,
> + EXYNOS5_GPIO_V30,
> + EXYNOS5_GPIO_V31,
> + EXYNOS5_GPIO_V32,
> + EXYNOS5_GPIO_V33,
> + EXYNOS5_GPIO_V34,
> + EXYNOS5_GPIO_V35,
> + EXYNOS5_GPIO_V36,
> + EXYNOS5_GPIO_V37,
> +
> + /* GPIO_PART6_STARTS */
> + EXYNOS5_GPIO_MAX_PORT_PART_6,
> + EXYNOS5_GPIO_V40 = EXYNOS5_GPIO_MAX_PORT_PART_6,
> + EXYNOS5_GPIO_V41,
> + EXYNOS5_GPIO_V42,
> + EXYNOS5_GPIO_V43,
> + EXYNOS5_GPIO_V44,
> + EXYNOS5_GPIO_V45,
> + EXYNOS5_GPIO_V46,
> + EXYNOS5_GPIO_V47,
> +
> + /* GPIO_PART6_STARTS */
> + EXYNOS5_GPIO_MAX_PORT_PART_7,
> + EXYNOS5_GPIO_Z0 = EXYNOS5_GPIO_MAX_PORT_PART_7,
> + EXYNOS5_GPIO_Z1,
> + EXYNOS5_GPIO_Z2,
> + EXYNOS5_GPIO_Z3,
> + EXYNOS5_GPIO_Z4,
> + EXYNOS5_GPIO_Z5,
> + EXYNOS5_GPIO_Z6,
> + EXYNOS5_GPIO_MAX_PORT
> +};
> +
> +struct gpio_info {
> + unsigned int reg_addr; /* Address of register for this part */
> + unsigned int max_gpio; /* Maximum GPIO in this part */
> +};
> +
> +#define EXYNOS5_GPIO_NUM_PARTS 8
> +static struct gpio_info exynos5_gpio_data[EXYNOS5_GPIO_NUM_PARTS] = {
> + { EXYNOS5_GPIO_PART1_BASE, EXYNOS5_GPIO_MAX_PORT_PART_1 },
> + { EXYNOS5_GPIO_PART2_BASE, EXYNOS5_GPIO_MAX_PORT_PART_2 },
> + { EXYNOS5_GPIO_PART3_BASE, EXYNOS5_GPIO_MAX_PORT_PART_3 },
> + { EXYNOS5_GPIO_PART4_BASE, EXYNOS5_GPIO_MAX_PORT_PART_4 },
> + { EXYNOS5_GPIO_PART5_BASE, EXYNOS5_GPIO_MAX_PORT_PART_5 },
> + { EXYNOS5_GPIO_PART6_BASE, EXYNOS5_GPIO_MAX_PORT_PART_6 },
> + { EXYNOS5_GPIO_PART7_BASE, EXYNOS5_GPIO_MAX_PORT_PART_7 },
> + { EXYNOS5_GPIO_PART8_BASE, EXYNOS5_GPIO_MAX_PORT },
> +};
> +
> +static inline struct gpio_info *get_gpio_data(void)
> +{
> + if (cpu_is_exynos5())
> + return exynos5_gpio_data;
> + else
> + return NULL;
> +}
> +
> +static inline unsigned int get_bank_num(void)
> +{
> + if (cpu_is_exynos5())
> + return EXYNOS5_GPIO_NUM_PARTS;
> + else
> + return 0;
> +}
> +
> +void gpio_cfg_pin(int gpio, int cfg);
> +void gpio_set_pull(int gpio, int mode);
> +void gpio_set_drv(int gpio, int mode);
> +int gpio_direction_output(unsigned gpio, int value);
> +int gpio_set_value(unsigned gpio, int value);
> #endif
>
> /* Pin configurations */
> diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
> index 8b09e1d..4b5b558 100644
> --- a/board/samsung/smdk5250/smdk5250.c
> +++ b/board/samsung/smdk5250/smdk5250.c
> @@ -73,11 +73,8 @@ static void boot_temp_check(void)
> #ifdef CONFIG_USB_EHCI_EXYNOS
> int board_usb_vbus_init(void)
> {
> - struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *)
> - samsung_get_base_gpio_part1();
> -
> /* Enable VBUS power switch */
> - s5p_gpio_direction_output(&gpio1->x2, 6, 1);
> + gpio_direction_output(EXYNOS5_GPIO_X26, 1);
>
> /* VBUS turn ON time */
> mdelay(3);
> @@ -89,12 +86,9 @@ int board_usb_vbus_init(void)
> #ifdef CONFIG_SOUND_MAX98095
> static void board_enable_audio_codec(void)
> {
> - struct exynos5_gpio_part1 *gpio1 = (struct exynos5_gpio_part1 *)
> - samsung_get_base_gpio_part1();
> -
> /* Enable MAX98095 Codec */
> - s5p_gpio_direction_output(&gpio1->x1, 7, 1);
> - s5p_gpio_set_pull(&gpio1->x1, 7, GPIO_PULL_NONE);
> + gpio_direction_output(EXYNOS5_GPIO_X17, 1);
> + gpio_set_pull(EXYNOS5_GPIO_X17, GPIO_PULL_NONE);
> }
> #endif
>
> @@ -457,19 +451,17 @@ int board_early_init_f(void)
> #ifdef CONFIG_LCD
> void exynos_cfg_lcd_gpio(void)
> {
> - struct exynos5_gpio_part1 *gpio1 =
> - (struct exynos5_gpio_part1 *) samsung_get_base_gpio_part1();
>
> /* For Backlight */
> - s5p_gpio_cfg_pin(&gpio1->b2, 0, GPIO_OUTPUT);
> - s5p_gpio_set_value(&gpio1->b2, 0, 1);
> + gpio_cfg_pin(EXYNOS5_GPIO_B20, GPIO_OUTPUT);
> + gpio_set_value(EXYNOS5_GPIO_B20, 1);
>
> /* LCD power on */
> - s5p_gpio_cfg_pin(&gpio1->x1, 5, GPIO_OUTPUT);
> - s5p_gpio_set_value(&gpio1->x1, 5, 1);
> + gpio_cfg_pin(EXYNOS5_GPIO_X15, GPIO_OUTPUT);
> + gpio_set_value(EXYNOS5_GPIO_X15, 1);
>
> /* Set Hotplug detect for DP */
> - s5p_gpio_cfg_pin(&gpio1->x0, 7, GPIO_FUNC(0x3));
> + gpio_cfg_pin(EXYNOS5_GPIO_X07, GPIO_FUNC(0x3));
> }
>
> void exynos_set_dp_phy(unsigned int onoff)
> diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
> index 656bf4a..630ee6e 100644
> --- a/drivers/gpio/s5p_gpio.c
> +++ b/drivers/gpio/s5p_gpio.c
> @@ -142,6 +142,29 @@ void s5p_gpio_set_rate(struct s5p_gpio_bank *bank, int gpio, int mode)
> writel(value, &bank->drv);
> }
>
> +#ifdef HAVE_GENERIC_GPIO
> +static struct s5p_gpio_bank *s5p_gpio_get_bank(unsigned int gpio)
> +{
> + const struct gpio_info *data;
> + unsigned int upto;
> + int i, count;
> +
> + data = get_gpio_data();
> + count = get_bank_num();
> + for (i = upto = 0; i < count;
> + i++, upto = data->max_gpio, data++) {
> + debug("i=%d, upto=%d\n", i, upto);
> + if (gpio < data->max_gpio) {
> + struct s5p_gpio_bank *bank;
> + bank = (struct s5p_gpio_bank *)data->reg_addr;
> + bank += (gpio - upto) / GPIO_PER_BANK;
> + debug("gpio=%d, bank=%p\n", gpio, bank);
> + return bank;
> + }
> + }
> + return NULL;
> +}
> +#else
> struct s5p_gpio_bank *s5p_gpio_get_bank(unsigned gpio)
> {
> int bank;
> @@ -151,6 +174,7 @@ struct s5p_gpio_bank *s5p_gpio_get_bank(unsigned gpio)
> bank *= sizeof(struct s5p_gpio_bank);
> return (struct s5p_gpio_bank *) (s5p_gpio_base(gpio) + bank);
> }
> +#endif
>
> int s5p_gpio_get_pin(unsigned gpio)
> {
> @@ -196,3 +220,21 @@ int gpio_set_value(unsigned gpio, int value)
>
> return 0;
> }
> +
> +void gpio_set_pull(int gpio, int mode)
> +{
> + s5p_gpio_set_pull(s5p_gpio_get_bank(gpio),
> + s5p_gpio_get_pin(gpio), mode);
> +}
> +
> +void gpio_set_drv(int gpio, int mode)
> +{
> + s5p_gpio_set_drv(s5p_gpio_get_bank(gpio),
> + s5p_gpio_get_pin(gpio), mode);
> +}
> +
> +void gpio_cfg_pin(int gpio, int cfg)
> +{
> + s5p_gpio_cfg_pin(s5p_gpio_get_bank(gpio),
> + s5p_gpio_get_pin(gpio), cfg);
> +}
> diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
> index b648d6b..cbd1c4e 100644
> --- a/include/configs/exynos5250-dt.h
> +++ b/include/configs/exynos5250-dt.h
> @@ -37,6 +37,7 @@
> #define CONFIG_ARCH_CPU_INIT
> #define CONFIG_DISPLAY_CPUINFO
> #define CONFIG_DISPLAY_BOARDINFO
> +#define HAVE_GENERIC_GPIO
>
> /* Enable fdt support for Exynos5250 */
> #define CONFIG_ARCH_DEVICE_TREE exynos5250
> --
> 1.7.4.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
--
Regards,
Rajeshwari Shinde
^ permalink raw reply [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin numbering feature
2013-04-17 4:49 ` Rajeshwari Birje
@ 2013-04-19 1:28 ` Minkyu Kang
0 siblings, 0 replies; 13+ messages in thread
From: Minkyu Kang @ 2013-04-19 1:28 UTC (permalink / raw)
To: u-boot
Dear Rajeshwari,
On 17/04/13 13:49, Rajeshwari Birje wrote:
> Hi Minkyu Kang,
>
> Please do let me know if any comments on these patchset.
>
will progress after release.
> Regards,
> Rajeshwari Shinde
>
Thanks,
Minkyu Kang.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin numbering feature
2013-04-03 11:54 ` [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin " Rajeshwari Shinde
2013-04-17 4:49 ` Rajeshwari Birje
@ 2013-05-11 18:18 ` Simon Glass
2013-05-13 4:07 ` Rajeshwari Birje
1 sibling, 1 reply; 13+ messages in thread
From: Simon Glass @ 2013-05-11 18:18 UTC (permalink / raw)
To: u-boot
HI Rajeshwari,
On Wed, Apr 3, 2013 at 5:54 AM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> This patch adds support for gpio pin numbering support on
> EXYNOS5250
> To have consistent 0..n-1 GPIO numbering the banks are divided
> into different parts where ever they have holes in them.
>
> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
> ---
> Changes in V2:
> - none.
> Changes in V3:
> - none.
> Changes in V4:
> - To have consistent 0..n-1 GPIO numbering the banks are divided
> into different parts where ever they have holes in them.
> - Combined previous patch 1 and 2 into single patch.
> Changes in V5:
> - Removed Exynos5 specific code in gpio driver api to
> get bank.
> - Added #define HAVE_GENERIC_GPIO in config file
> to remove conditinal CPU check in gpio driver.
With this series I am getting errors in exynos5-dt.c:
25: EXYNOS5: Add gpio pin numbering feature
arm: + snow
+exynos5-dt.c: In function 'board_usb_vbus_init':
+exynos5-dt.c:79: error: 'struct exynos5_gpio_part1' has no member named 'x2'
+exynos5-dt.c: In function 'board_enable_audio_codec':
+exynos5-dt.c:95: error: 'struct exynos5_gpio_part1' has no member named 'x1'
+exynos5-dt.c:96: error: 'struct exynos5_gpio_part1' has no member named 'x1'
+exynos5-dt.c: In function 'exynos_cfg_lcd_gpio':
+exynos5-dt.c:412: error: 'struct exynos5_gpio_part1' has no member named 'x1'
+exynos5-dt.c:413: error: 'struct exynos5_gpio_part1' has no member named 'x1'
+exynos5-dt.c:416: error: 'struct exynos5_gpio_part1' has no member named 'x0'
This is probably due to new support added, so I think you need to
adjust your patch.
Here is the sequence I am testing with (reverse order of application):
9529fd4 (HEAD, ws/snow, snow) EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5
0f81b33 S5P: Rename GPIO definitions
0c6254b EXYNOS5: Add gpio pin numbering feature
5a35ef9 CONFIG: EXYNOS5: Enable silent console
6083f4f S5P: Serial: Add fdt support to driver
2f78e0f EXYNOS5: FDT: Add serial device node values
5b85902 EXYNOS5: FDT: Add compatible strings for Serial
6402856 exynos: dts: Use 50MHz SPI flash speed on snow
1a6900e EXYNOS: SPL: Add a custom spi copy function
27530a7 EXYNOS: SPI: Support word transfers
7f8ba96 EXYNOS: SPI: Minimise access to SPI FIFO level
149742a EXYNOS: SPI: Support a delay after deactivate
f3d8caf EXYNOS: Export timer_get_us() to get microsecond timer
1aaa266 EXYNOS: SPI: Support SPI_PREAMBLE mode
2752d08 SPI: Add support for preamble bytes
279a5cb exynos: Enable mmc for snow
a6280ba COMMON: MMC: Command to support EMMC booting and to resize
EMMC boot partition
19425ea SMDK5250: Enable EMMC booting
5253ae0 MMC: APIs to support resize of EMMC boot partition
15bb05e SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
eeef540 EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
a4d8bf2 EXYNOS5: DWMMC: Added FDT support for DWMMC
71b87c4 DWMMC: Initialise dwmci and resolve EMMC read write issues
97c6565 EXYNOS5: FDT: Add DWMMC device node data
ec5fb8b FDT: Add compatible string for DWMMC
e7c528b EXYNOS5: I2C: Add FDT and non-FDT support for I2C
Regards,
Simon
> arch/arm/cpu/armv7/exynos/pinmux.c | 150 ++++------
> arch/arm/include/asm/arch-exynos/cpu.h | 10 +-
> arch/arm/include/asm/arch-exynos/gpio.h | 452 +++++++++++++++++++++++++++----
> board/samsung/smdk5250/smdk5250.c | 24 +-
> drivers/gpio/s5p_gpio.c | 42 +++
> include/configs/exynos5250-dt.h | 1 +
> 6 files changed, 522 insertions(+), 157 deletions(-)
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 2/3 V5] S5P: Rename GPIO definitions
2013-04-03 11:54 ` [U-Boot] [PATCH 2/3 V5] S5P: Rename GPIO definitions Rajeshwari Shinde
@ 2013-05-11 18:40 ` Simon Glass
0 siblings, 0 replies; 13+ messages in thread
From: Simon Glass @ 2013-05-11 18:40 UTC (permalink / raw)
To: u-boot
On Wed, Apr 3, 2013 at 5:54 AM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> This patch rename GPIO definitions from GPIO_... to S5P_GPIO_...
> This changes was done to enable cmd_gpio for EXYNOS and
> cmd_gpio has GPIO_INPUT same as s5p_gpio driver and hence
> getting a error during compilation.
>
> Build tested for s5p_goni, origen, smdk5250, s5pc210_universal,
> trats, smdkc100, smdkv310 config files.
>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Still looks good to me. Hope you can arrange the ordering to land this soon.
> ---
> Changes in V2:
> - New patch
> Changes in V3:
> - Created a table to know the base address of input bank.
> Changes in V4:
> - Moved the function name_to_gpio to s5p gpio driver and
> renamed to s5p_name_to_gpio.
> Changes in V5:
> - Rebased on latest u-boot-samsung tree
> arch/arm/cpu/armv7/exynos/pinmux.c | 134 +++++++++++++++---------------
> arch/arm/include/asm/arch-exynos/gpio.h | 26 +++---
> arch/arm/include/asm/arch-s5pc1xx/gpio.h | 26 +++---
> board/samsung/goni/goni.c | 4 +-
> board/samsung/origen/origen.c | 8 +-
> board/samsung/smdk5250/smdk5250.c | 8 +-
> board/samsung/smdkc100/smdkc100.c | 2 +-
> board/samsung/smdkv310/smdkv310.c | 10 +-
> board/samsung/trats/trats.c | 17 ++--
> board/samsung/universal_c210/universal.c | 36 ++++----
> drivers/gpio/s5p_gpio.c | 20 ++--
> 11 files changed, 146 insertions(+), 145 deletions(-)
^ permalink raw reply [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 3/3 V5] EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5
2013-04-03 11:54 ` [U-Boot] [PATCH 3/3 V5] EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5 Rajeshwari Shinde
@ 2013-05-11 18:41 ` Simon Glass
2013-05-21 7:44 ` Minkyu Kang
1 sibling, 0 replies; 13+ messages in thread
From: Simon Glass @ 2013-05-11 18:41 UTC (permalink / raw)
To: u-boot
On Wed, Apr 3, 2013 at 5:54 AM, Rajeshwari Shinde
<rajeshwari.s@samsung.com> wrote:
> This patch enables GPIO Command for EXYNOS5.
> Function has been added to asm/gpio.h to decode the
> input gpio name to gpio number.
> example: gpio set gpa00
>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
Acked-by: Simon Glass <sjg@chromium.org>
> ---
> Changes in V2:
> - New patch
> Changes in V3:
> - Created a table to know the base address of input bank.
> Changes in V4:
> - Moved the function name_to_gpio to s5p gpio driver and
> renamed to s5p_name_to_gpio.
> Changes in V5:
> - Rebased on latest u-boot-samsung tree
> arch/arm/include/asm/arch-exynos/gpio.h | 8 +++++
> drivers/gpio/s5p_gpio.c | 49 +++++++++++++++++++++++++++++++
> include/configs/exynos5250-dt.h | 1 +
> 3 files changed, 58 insertions(+), 0 deletions(-)
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin numbering feature
2013-05-11 18:18 ` Simon Glass
@ 2013-05-13 4:07 ` Rajeshwari Birje
2013-05-15 13:29 ` Simon Glass
0 siblings, 1 reply; 13+ messages in thread
From: Rajeshwari Birje @ 2013-05-13 4:07 UTC (permalink / raw)
To: u-boot
Hi Simon,
I applied the V5 patches on the latest u-boot-samsung tree and need
seem to compile fine.
Yes I will need to rebase them once the MMC patches get in, but will
wait for comments from Minkyu Kang as well
so that I can incorporate them and rebase the patch set once the MMC
patches get in.
Regards,
Rajeshwari Shinde.
On Sat, May 11, 2013 at 11:48 PM, Simon Glass <sjg@chromium.org> wrote:
> HI Rajeshwari,
>
> On Wed, Apr 3, 2013 at 5:54 AM, Rajeshwari Shinde
> <rajeshwari.s@samsung.com> wrote:
>> This patch adds support for gpio pin numbering support on
>> EXYNOS5250
>> To have consistent 0..n-1 GPIO numbering the banks are divided
>> into different parts where ever they have holes in them.
>>
>> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
>> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
>> ---
>> Changes in V2:
>> - none.
>> Changes in V3:
>> - none.
>> Changes in V4:
>> - To have consistent 0..n-1 GPIO numbering the banks are divided
>> into different parts where ever they have holes in them.
>> - Combined previous patch 1 and 2 into single patch.
>> Changes in V5:
>> - Removed Exynos5 specific code in gpio driver api to
>> get bank.
>> - Added #define HAVE_GENERIC_GPIO in config file
>> to remove conditinal CPU check in gpio driver.
>
> With this series I am getting errors in exynos5-dt.c:
>
> 25: EXYNOS5: Add gpio pin numbering feature
> arm: + snow
> +exynos5-dt.c: In function 'board_usb_vbus_init':
> +exynos5-dt.c:79: error: 'struct exynos5_gpio_part1' has no member named 'x2'
> +exynos5-dt.c: In function 'board_enable_audio_codec':
> +exynos5-dt.c:95: error: 'struct exynos5_gpio_part1' has no member named 'x1'
> +exynos5-dt.c:96: error: 'struct exynos5_gpio_part1' has no member named 'x1'
> +exynos5-dt.c: In function 'exynos_cfg_lcd_gpio':
> +exynos5-dt.c:412: error: 'struct exynos5_gpio_part1' has no member named 'x1'
> +exynos5-dt.c:413: error: 'struct exynos5_gpio_part1' has no member named 'x1'
> +exynos5-dt.c:416: error: 'struct exynos5_gpio_part1' has no member named 'x0'
>
>
> This is probably due to new support added, so I think you need to
> adjust your patch.
>
> Here is the sequence I am testing with (reverse order of application):
>
> 9529fd4 (HEAD, ws/snow, snow) EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5
> 0f81b33 S5P: Rename GPIO definitions
> 0c6254b EXYNOS5: Add gpio pin numbering feature
> 5a35ef9 CONFIG: EXYNOS5: Enable silent console
> 6083f4f S5P: Serial: Add fdt support to driver
> 2f78e0f EXYNOS5: FDT: Add serial device node values
> 5b85902 EXYNOS5: FDT: Add compatible strings for Serial
> 6402856 exynos: dts: Use 50MHz SPI flash speed on snow
> 1a6900e EXYNOS: SPL: Add a custom spi copy function
> 27530a7 EXYNOS: SPI: Support word transfers
> 7f8ba96 EXYNOS: SPI: Minimise access to SPI FIFO level
> 149742a EXYNOS: SPI: Support a delay after deactivate
> f3d8caf EXYNOS: Export timer_get_us() to get microsecond timer
> 1aaa266 EXYNOS: SPI: Support SPI_PREAMBLE mode
> 2752d08 SPI: Add support for preamble bytes
> 279a5cb exynos: Enable mmc for snow
> a6280ba COMMON: MMC: Command to support EMMC booting and to resize
> EMMC boot partition
> 19425ea SMDK5250: Enable EMMC booting
> 5253ae0 MMC: APIs to support resize of EMMC boot partition
> 15bb05e SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
> eeef540 EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
> a4d8bf2 EXYNOS5: DWMMC: Added FDT support for DWMMC
> 71b87c4 DWMMC: Initialise dwmci and resolve EMMC read write issues
> 97c6565 EXYNOS5: FDT: Add DWMMC device node data
> ec5fb8b FDT: Add compatible string for DWMMC
> e7c528b EXYNOS5: I2C: Add FDT and non-FDT support for I2C
>
> Regards,
> Simon
>
>
>> arch/arm/cpu/armv7/exynos/pinmux.c | 150 ++++------
>> arch/arm/include/asm/arch-exynos/cpu.h | 10 +-
>> arch/arm/include/asm/arch-exynos/gpio.h | 452 +++++++++++++++++++++++++++----
>> board/samsung/smdk5250/smdk5250.c | 24 +-
>> drivers/gpio/s5p_gpio.c | 42 +++
>> include/configs/exynos5250-dt.h | 1 +
>> 6 files changed, 522 insertions(+), 157 deletions(-)
>>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
--
Regards,
Rajeshwari Shinde
^ permalink raw reply [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin numbering feature
2013-05-13 4:07 ` Rajeshwari Birje
@ 2013-05-15 13:29 ` Simon Glass
2013-05-16 5:25 ` Minkyu Kang
0 siblings, 1 reply; 13+ messages in thread
From: Simon Glass @ 2013-05-15 13:29 UTC (permalink / raw)
To: u-boot
Hi Minkyu,
On Sun, May 12, 2013 at 9:07 PM, Rajeshwari Birje
<rajeshwari.birje@gmail.com> wrote:
> Hi Simon,
>
> I applied the V5 patches on the latest u-boot-samsung tree and need
> seem to compile fine.
> Yes I will need to rebase them once the MMC patches get in, but will
> wait for comments from Minkyu Kang as well
> so that I can incorporate them and rebase the patch set once the MMC
> patches get in.
I am looking forward to seeing the outstanding patches applied - will
this be soon?
Regards,
Simon
>
> Regards,
> Rajeshwari Shinde.
>
> On Sat, May 11, 2013 at 11:48 PM, Simon Glass <sjg@chromium.org> wrote:
>> HI Rajeshwari,
>>
>> On Wed, Apr 3, 2013 at 5:54 AM, Rajeshwari Shinde
>> <rajeshwari.s@samsung.com> wrote:
>>> This patch adds support for gpio pin numbering support on
>>> EXYNOS5250
>>> To have consistent 0..n-1 GPIO numbering the banks are divided
>>> into different parts where ever they have holes in them.
>>>
>>> Signed-off-by: Leela Krishna Amudala <l.krishna@samsung.com>
>>> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
>>> ---
>>> Changes in V2:
>>> - none.
>>> Changes in V3:
>>> - none.
>>> Changes in V4:
>>> - To have consistent 0..n-1 GPIO numbering the banks are divided
>>> into different parts where ever they have holes in them.
>>> - Combined previous patch 1 and 2 into single patch.
>>> Changes in V5:
>>> - Removed Exynos5 specific code in gpio driver api to
>>> get bank.
>>> - Added #define HAVE_GENERIC_GPIO in config file
>>> to remove conditinal CPU check in gpio driver.
>>
>> With this series I am getting errors in exynos5-dt.c:
>>
>> 25: EXYNOS5: Add gpio pin numbering feature
>> arm: + snow
>> +exynos5-dt.c: In function 'board_usb_vbus_init':
>> +exynos5-dt.c:79: error: 'struct exynos5_gpio_part1' has no member named 'x2'
>> +exynos5-dt.c: In function 'board_enable_audio_codec':
>> +exynos5-dt.c:95: error: 'struct exynos5_gpio_part1' has no member named 'x1'
>> +exynos5-dt.c:96: error: 'struct exynos5_gpio_part1' has no member named 'x1'
>> +exynos5-dt.c: In function 'exynos_cfg_lcd_gpio':
>> +exynos5-dt.c:412: error: 'struct exynos5_gpio_part1' has no member named 'x1'
>> +exynos5-dt.c:413: error: 'struct exynos5_gpio_part1' has no member named 'x1'
>> +exynos5-dt.c:416: error: 'struct exynos5_gpio_part1' has no member named 'x0'
>>
>>
>> This is probably due to new support added, so I think you need to
>> adjust your patch.
>>
>> Here is the sequence I am testing with (reverse order of application):
>>
>> 9529fd4 (HEAD, ws/snow, snow) EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5
>> 0f81b33 S5P: Rename GPIO definitions
>> 0c6254b EXYNOS5: Add gpio pin numbering feature
>> 5a35ef9 CONFIG: EXYNOS5: Enable silent console
>> 6083f4f S5P: Serial: Add fdt support to driver
>> 2f78e0f EXYNOS5: FDT: Add serial device node values
>> 5b85902 EXYNOS5: FDT: Add compatible strings for Serial
>> 6402856 exynos: dts: Use 50MHz SPI flash speed on snow
>> 1a6900e EXYNOS: SPL: Add a custom spi copy function
>> 27530a7 EXYNOS: SPI: Support word transfers
>> 7f8ba96 EXYNOS: SPI: Minimise access to SPI FIFO level
>> 149742a EXYNOS: SPI: Support a delay after deactivate
>> f3d8caf EXYNOS: Export timer_get_us() to get microsecond timer
>> 1aaa266 EXYNOS: SPI: Support SPI_PREAMBLE mode
>> 2752d08 SPI: Add support for preamble bytes
>> 279a5cb exynos: Enable mmc for snow
>> a6280ba COMMON: MMC: Command to support EMMC booting and to resize
>> EMMC boot partition
>> 19425ea SMDK5250: Enable EMMC booting
>> 5253ae0 MMC: APIs to support resize of EMMC boot partition
>> 15bb05e SMDK5250: Initialise and Enable DWMMC, support FDT and non-FDT
>> eeef540 EXYNOS5: DWMMC: Initialise the local variable to avoid unwanted results.
>> a4d8bf2 EXYNOS5: DWMMC: Added FDT support for DWMMC
>> 71b87c4 DWMMC: Initialise dwmci and resolve EMMC read write issues
>> 97c6565 EXYNOS5: FDT: Add DWMMC device node data
>> ec5fb8b FDT: Add compatible string for DWMMC
>> e7c528b EXYNOS5: I2C: Add FDT and non-FDT support for I2C
>>
>> Regards,
>> Simon
>>
>>
>>> arch/arm/cpu/armv7/exynos/pinmux.c | 150 ++++------
>>> arch/arm/include/asm/arch-exynos/cpu.h | 10 +-
>>> arch/arm/include/asm/arch-exynos/gpio.h | 452 +++++++++++++++++++++++++++----
>>> board/samsung/smdk5250/smdk5250.c | 24 +-
>>> drivers/gpio/s5p_gpio.c | 42 +++
>>> include/configs/exynos5250-dt.h | 1 +
>>> 6 files changed, 522 insertions(+), 157 deletions(-)
>>>
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> http://lists.denx.de/mailman/listinfo/u-boot
>
>
>
> --
> Regards,
> Rajeshwari Shinde
^ permalink raw reply [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin numbering feature
2013-05-15 13:29 ` Simon Glass
@ 2013-05-16 5:25 ` Minkyu Kang
0 siblings, 0 replies; 13+ messages in thread
From: Minkyu Kang @ 2013-05-16 5:25 UTC (permalink / raw)
To: u-boot
Hello,
On 15/05/13 22:29, Simon Glass wrote:
> Hi Minkyu,
>
> On Sun, May 12, 2013 at 9:07 PM, Rajeshwari Birje
> <rajeshwari.birje@gmail.com> wrote:
>> Hi Simon,
>>
>> I applied the V5 patches on the latest u-boot-samsung tree and need
>> seem to compile fine.
>> Yes I will need to rebase them once the MMC patches get in, but will
>> wait for comments from Minkyu Kang as well
>> so that I can incorporate them and rebase the patch set once the MMC
>> patches get in.
>
> I am looking forward to seeing the outstanding patches applied - will
> this be soon?
>
I've away from mailing list for some reasons.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [U-Boot] [PATCH 3/3 V5] EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5
2013-04-03 11:54 ` [U-Boot] [PATCH 3/3 V5] EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5 Rajeshwari Shinde
2013-05-11 18:41 ` Simon Glass
@ 2013-05-21 7:44 ` Minkyu Kang
1 sibling, 0 replies; 13+ messages in thread
From: Minkyu Kang @ 2013-05-21 7:44 UTC (permalink / raw)
To: u-boot
Dear Rajeshwari Shinde,
On 03/04/13 20:54, Rajeshwari Shinde wrote:
> This patch enables GPIO Command for EXYNOS5.
> Function has been added to asm/gpio.h to decode the
> input gpio name to gpio number.
> example: gpio set gpa00
>
> Signed-off-by: Rajeshwari Shinde <rajeshwari.s@samsung.com>
> ---
> Changes in V2:
> - New patch
> Changes in V3:
> - Created a table to know the base address of input bank.
> Changes in V4:
> - Moved the function name_to_gpio to s5p gpio driver and
> renamed to s5p_name_to_gpio.
> Changes in V5:
> - Rebased on latest u-boot-samsung tree
> arch/arm/include/asm/arch-exynos/gpio.h | 8 +++++
> drivers/gpio/s5p_gpio.c | 49 +++++++++++++++++++++++++++++++
> include/configs/exynos5250-dt.h | 1 +
> 3 files changed, 58 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-exynos/gpio.h b/arch/arm/include/asm/arch-exynos/gpio.h
> index d8000af..9b31dc2 100644
> --- a/arch/arm/include/asm/arch-exynos/gpio.h
> +++ b/arch/arm/include/asm/arch-exynos/gpio.h
> @@ -660,6 +660,14 @@ static inline unsigned int get_bank_num(void)
> return 0;
> }
>
> +struct gpio_name_num_table {
> + char bank;
> + unsigned int base;
> +};
> +
> +int s5p_name_to_gpio(const char *name);
> +#define name_to_gpio(n) s5p_name_to_gpio(n)
> +
> void gpio_cfg_pin(int gpio, int cfg);
> void gpio_set_pull(int gpio, int mode);
> void gpio_set_drv(int gpio, int mode);
> diff --git a/drivers/gpio/s5p_gpio.c b/drivers/gpio/s5p_gpio.c
> index d6650c3..824977b 100644
> --- a/drivers/gpio/s5p_gpio.c
> +++ b/drivers/gpio/s5p_gpio.c
> @@ -36,6 +36,21 @@
> #define RATE_MASK(x) (0x1 << (x + 16))
> #define RATE_SET(x) (0x1 << (x + 16))
>
> +struct gpio_name_num_table exynos5_gpio_table[] = {
> + { 'a', EXYNOS5_GPIO_A00 },
> + { 'b', EXYNOS5_GPIO_B00 },
> + { 'c', EXYNOS5_GPIO_C00 },
> + { 'd', EXYNOS5_GPIO_D00 },
> + { 'y', EXYNOS5_GPIO_Y00 },
> + { 'x', EXYNOS5_GPIO_X00 },
> + { 'e', EXYNOS5_GPIO_E00 },
> + { 'f', EXYNOS5_GPIO_F00 },
> + { 'g', EXYNOS5_GPIO_G00 },
> + { 'h', EXYNOS5_GPIO_H00 },
> + { 'v', EXYNOS5_GPIO_V00 },
> + { 'z', EXYNOS5_GPIO_Z0 },
> +};
> +
> void s5p_gpio_cfg_pin(struct s5p_gpio_bank *bank, int gpio, int cfg)
> {
> unsigned int value;
> @@ -238,3 +253,37 @@ void gpio_cfg_pin(int gpio, int cfg)
> s5p_gpio_cfg_pin(s5p_gpio_get_bank(gpio),
> s5p_gpio_get_pin(gpio), cfg);
> }
> +
> +int s5p_name_to_gpio(const char *name)
> +{
> + unsigned int num, i;
> +
> + name++;
Maybe you missing my comments on V3 patch.
Please check.
http://lists.denx.de/pipermail/u-boot/2013-February/146206.html
> +
> + if (*name == 'p')
> + ++name;
> +
> + for (i = 0; i < ARRAY_SIZE(exynos5_gpio_table); i++) {
> + if (*name == exynos5_gpio_table[i].bank) {
> + if (*name == 'c') {
> + name++;
> + num = simple_strtoul(name, NULL, 10);
> + if (num >= 40) {
> + num = EXYNOS5_GPIO_C40 + (num - 40);
> + } else {
> + num = simple_strtoul(name, NULL, 8);
> + num = exynos5_gpio_table[i].base + num;
> + }
> + } else {
> + name++;
> + num = simple_strtoul(name, NULL, 8);
> + num = exynos5_gpio_table[i].base + num;
> + }
> + break;
> + }
> + }
> +
> + if (i == ARRAY_SIZE(exynos5_gpio_table))
> + return -1;
> + return num;
> +}
> diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
> index cbd1c4e..46a4e75 100644
> --- a/include/configs/exynos5250-dt.h
> +++ b/include/configs/exynos5250-dt.h
> @@ -122,6 +122,7 @@
> #define CONFIG_CMD_FAT
> #define CONFIG_CMD_NET
> #define CONFIG_CMD_HASH
> +#define CONFIG_CMD_GPIO
>
> #define CONFIG_BOOTDELAY 3
> #define CONFIG_ZERO_BOOTDELAY_CHECK
>
Thanks,
Minkyu Kang.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-05-21 7:44 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-03 11:54 [U-Boot] [PATCH 0/3 V5] EXYNOS5: Add GPIO numbering feature Rajeshwari Shinde
2013-04-03 11:54 ` [U-Boot] [PATCH 1/3 V5] EXYNOS5: Add gpio pin " Rajeshwari Shinde
2013-04-17 4:49 ` Rajeshwari Birje
2013-04-19 1:28 ` Minkyu Kang
2013-05-11 18:18 ` Simon Glass
2013-05-13 4:07 ` Rajeshwari Birje
2013-05-15 13:29 ` Simon Glass
2013-05-16 5:25 ` Minkyu Kang
2013-04-03 11:54 ` [U-Boot] [PATCH 2/3 V5] S5P: Rename GPIO definitions Rajeshwari Shinde
2013-05-11 18:40 ` Simon Glass
2013-04-03 11:54 ` [U-Boot] [PATCH 3/3 V5] EXYNOS5: GPIO: Enable GPIO Command for EXYNOS5 Rajeshwari Shinde
2013-05-11 18:41 ` Simon Glass
2013-05-21 7:44 ` Minkyu Kang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.