Patchwork [U-Boot] gpio:samsung: s5p_ suffix add for GPIO functions (C210_universal)

login
register
mail settings
Submitter Łukasz Majewski
Date Aug. 10, 2011, 9:18 a.m.
Message ID <1312967934-13157-1-git-send-email-l.majewski@samsung.com>
Download mbox | patch
Permalink /patch/109354/
State Accepted
Commit c8fc4284cf2e447e07c7e0718982902a4f6e6bff
Delegated to: Minkyu Kang
Headers show

Comments

Łukasz Majewski - Aug. 10, 2011, 9:18 a.m.
This is a cosmetic patch, which is changing the gpio_ prefix to
s5p_gpio_.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
---
 board/samsung/universal_c210/universal.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)
Minkyu Kang - Aug. 11, 2011, 9:51 a.m.
Dear Lukasz,

On 10 August 2011 18:18, Lukasz Majewski <l.majewski@samsung.com> wrote:
> This is a cosmetic patch, which is changing the gpio_ prefix to
> s5p_gpio_.
>
> Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: Minkyu Kang <mk7.kang@samsung.com>
> ---
>  board/samsung/universal_c210/universal.c |   28 ++++++++++++++--------------
>  1 files changed, 14 insertions(+), 14 deletions(-)

applied to u-boot-samsung

Thanks
Minkyu Kang

Patch

diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c
index b65bc6e..1b27e8b 100644
--- a/board/samsung/universal_c210/universal.c
+++ b/board/samsung/universal_c210/universal.c
@@ -160,7 +160,7 @@  int board_mmc_init(bd_t *bis)
 		 * you should set it HIGH since it removes the inverter
 		 */
 		/* MASSMEMORY_EN: XMDMDATA_6: GPE3[6] */
-		gpio_direction_output(&gpio1->e3, 6, 0);
+		s5p_gpio_direction_output(&gpio1->e3, 6, 0);
 		break;
 	default:
 		/*
@@ -168,7 +168,7 @@  int board_mmc_init(bd_t *bis)
 		 * But set it as HIGH to ensure
 		 */
 		/* MASSMEMORY_EN: XMDMADDR_3: GPE1[3] */
-		gpio_direction_output(&gpio1->e1, 3, 1);
+		s5p_gpio_direction_output(&gpio1->e1, 3, 1);
 		break;
 	}
 
@@ -192,25 +192,25 @@  int board_mmc_init(bd_t *bis)
 		if (i == 2)
 			continue;
 		/* GPK0[0:6] special function 2 */
-		gpio_cfg_pin(&gpio2->k0, i, 0x2);
+		s5p_gpio_cfg_pin(&gpio2->k0, i, 0x2);
 		/* GPK0[0:6] pull disable */
-		gpio_set_pull(&gpio2->k0, i, GPIO_PULL_NONE);
+		s5p_gpio_set_pull(&gpio2->k0, i, GPIO_PULL_NONE);
 		/* GPK0[0:6] drv 4x */
-		gpio_set_drv(&gpio2->k0, i, GPIO_DRV_4X);
+		s5p_gpio_set_drv(&gpio2->k0, i, GPIO_DRV_4X);
 	}
 
 	for (i = 3; i < 7; i++) {
 		/* GPK1[3:6] special function 3 */
-		gpio_cfg_pin(&gpio2->k1, i, 0x3);
+		s5p_gpio_cfg_pin(&gpio2->k1, i, 0x3);
 		/* GPK1[3:6] pull disable */
-		gpio_set_pull(&gpio2->k1, i, GPIO_PULL_NONE);
+		s5p_gpio_set_pull(&gpio2->k1, i, GPIO_PULL_NONE);
 		/* GPK1[3:6] drv 4x */
-		gpio_set_drv(&gpio2->k1, i, GPIO_DRV_4X);
+		s5p_gpio_set_drv(&gpio2->k1, i, GPIO_DRV_4X);
 	}
 
 	/* T-flash detect */
-	gpio_cfg_pin(&gpio2->x3, 4, 0xf);
-	gpio_set_pull(&gpio2->x3, 4, GPIO_PULL_UP);
+	s5p_gpio_cfg_pin(&gpio2->x3, 4, 0xf);
+	s5p_gpio_set_pull(&gpio2->x3, 4, GPIO_PULL_UP);
 
 	/*
 	 * MMC device init
@@ -223,7 +223,7 @@  int board_mmc_init(bd_t *bis)
 	 * Check the T-flash  detect pin
 	 * GPX3[4] T-flash detect pin
 	 */
-	if (!gpio_get_value(&gpio2->x3, 4)) {
+	if (!s5p_gpio_get_value(&gpio2->x3, 4)) {
 		/*
 		 * SD card GPIO:
 		 * GPK2[0]	SD_2_CLK(2)
@@ -235,11 +235,11 @@  int board_mmc_init(bd_t *bis)
 			if (i == 2)
 				continue;
 			/* GPK2[0:6] special function 2 */
-			gpio_cfg_pin(&gpio2->k2, i, 0x2);
+			s5p_gpio_cfg_pin(&gpio2->k2, i, 0x2);
 			/* GPK2[0:6] pull disable */
-			gpio_set_pull(&gpio2->k2, i, GPIO_PULL_NONE);
+			s5p_gpio_set_pull(&gpio2->k2, i, GPIO_PULL_NONE);
 			/* GPK2[0:6] drv 4x */
-			gpio_set_drv(&gpio2->k2, i, GPIO_DRV_4X);
+			s5p_gpio_set_drv(&gpio2->k2, i, GPIO_DRV_4X);
 		}
 		err = s5p_mmc_init(2, 4);
 	}