S5P: Exynos: Config: Enable GPIO CMD config

Enabling configs for GPIO CMD, EXYNOS4 family and replacing
exynos_gpio_get with new linear GPIO pin number required
because of the new function asking only 2 arguments (pin
and value) instead of 3 (bank, pin and value).

Signed-off-by: Akshay Saraswat <akshay.s@samsung.com>
Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/configs/exynos5-dt.h b/include/configs/exynos5-dt.h
index 414db420dc30684ebc8d42614198a951fe195a52..5a9b1b42d31090466008d9a985560a76052a8909 100644 (file)
--- a/include/configs/exynos5-dt.h
+++ b/include/configs/exynos5-dt.h
@@ -288,4 +288,6 @@
 
 #define CONFIG_CMD_BOOTZ
 
+#define CONFIG_CMD_GPIO
+
 #endif /* __CONFIG_H */

diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
index 991c43e1cc2c3638816ac15124d684174194bbf8..799d4fe9d8c986406905024d2ba6c47e4412dd57 100644 (file)
--- a/include/configs/s5p_goni.h
+++ b/include/configs/s5p_goni.h
@@ -214,8 +214,8 @@
 /*
  * I2C Settings
  */
-#define CONFIG_SOFT_I2C_GPIO_SCL s5pc110_gpio_get(j4, 3)
-#define CONFIG_SOFT_I2C_GPIO_SDA s5pc110_gpio_get(j4, 0)
+#define CONFIG_SOFT_I2C_GPIO_SCL S5PC110_GPIO_J43
+#define CONFIG_SOFT_I2C_GPIO_SDA S5PC110_GPIO_J40
 
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_SOFT            /* I2C bit-banged */

diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h
index db5561ab8c9532ccf887a817f066fd00808f501b..eb046cdac92aa403197c7808b62bf2d3312a07fd 100644 (file)
--- a/include/configs/s5pc210_universal.h
+++ b/include/configs/s5pc210_universal.h
@@ -167,8 +167,8 @@
 /*
  * I2C Settings
  */
-#define CONFIG_SOFT_I2C_GPIO_SCL exynos4_gpio_get(1, b, 7)
-#define CONFIG_SOFT_I2C_GPIO_SDA exynos4_gpio_get(1, b, 6)
+#define CONFIG_SOFT_I2C_GPIO_SCL EXYNOS4_GPIO_B7
+#define CONFIG_SOFT_I2C_GPIO_SDA EXYNOS4_GPIO_B6
 
 #define CONFIG_CMD_I2C
 
@@ -193,10 +193,10 @@
  */
 #define CONFIG_SOFT_SPI
 #define CONFIG_SOFT_SPI_MODE SPI_MODE_3
-#define CONFIG_SOFT_SPI_GPIO_SCLK exynos4_gpio_get(2, y3, 1)
-#define CONFIG_SOFT_SPI_GPIO_MOSI exynos4_gpio_get(2, y3, 3)
-#define CONFIG_SOFT_SPI_GPIO_MISO exynos4_gpio_get(2, y3, 0)
-#define CONFIG_SOFT_SPI_GPIO_CS exynos4_gpio_get(2, y4, 3)
+#define CONFIG_SOFT_SPI_GPIO_SCLK EXYNOS4_GPIO_Y31
+#define CONFIG_SOFT_SPI_GPIO_MOSI EXYNOS4_GPIO_Y33
+#define CONFIG_SOFT_SPI_GPIO_MISO EXYNOS4_GPIO_Y30
+#define CONFIG_SOFT_SPI_GPIO_CS EXYNOS4_GPIO_Y43
 
 #define SPI_DELAY udelay(1)
 #undef SPI_INIT
@@ -228,8 +228,8 @@ int universal_spi_read(void);
 #define KEY_PWR_INTERRUPT_REG          MAX8998_REG_IRQ1
 #define KEY_PWR_INTERRUPT_MASK         (1 << 7)
 
-#define KEY_VOL_UP_GPIO                        exynos4_gpio_get(2, x2, 0)
-#define KEY_VOL_DOWN_GPIO              exynos4_gpio_get(2, x2, 1)
+#define KEY_VOL_UP_GPIO                        EXYNOS4_GPIO_X20
+#define KEY_VOL_DOWN_GPIO              EXYNOS4_GPIO_X21
 #endif /* __ASSEMBLY__ */
 
 /* LCD console */

diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h
index 1388f49986067785dc5d8517b5254ef39fab34f5..34adfaf60853d8f93789ba31c06338248a856fa1 100644 (file)
--- a/include/configs/smdkv310.h
+++ b/include/configs/smdkv310.h
@@ -12,6 +12,7 @@
 /* High Level Configuration Options */
 #define CONFIG_SAMSUNG                 1       /* in a SAMSUNG core */
 #define CONFIG_S5P                     1       /* S5P Family */
+#define CONFIG_EXYNOS4                         /* EXYNOS4 Family */
 #define CONFIG_EXYNOS4210              1       /* which is a EXYNOS4210 SoC */
 #define CONFIG_SMDKV310                        1       /* working with SMDKV310*/
 

diff --git a/include/configs/trats.h b/include/configs/trats.h
index 815948bbff8b33ce371eecdaacba2f0cd483d880..fc16911686acd4f93892539556da758c29284e6f 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -204,8 +204,8 @@
 #define CONFIG_SYS_I2C_INIT_BOARD
 
 /* I2C FG */
-#define CONFIG_SOFT_I2C_GPIO_SCL exynos4_gpio_get(2, y4, 1)
-#define CONFIG_SOFT_I2C_GPIO_SDA exynos4_gpio_get(2, y4, 0)
+#define CONFIG_SOFT_I2C_GPIO_SCL EXYNOS4_GPIO_Y41
+#define CONFIG_SOFT_I2C_GPIO_SDA EXYNOS4_GPIO_Y40
 
 /* POWER */
 #define CONFIG_POWER
@@ -242,8 +242,8 @@
 #define KEY_PWR_INTERRUPT_REG          MAX8997_REG_INT1
 #define KEY_PWR_INTERRUPT_MASK         (1 << 0)
 
-#define KEY_VOL_UP_GPIO                        exynos4_gpio_get(2, x2, 0)
-#define KEY_VOL_DOWN_GPIO              exynos4_gpio_get(2, x2, 1)
+#define KEY_VOL_UP_GPIO                        EXYNOS4_GPIO_X20
+#define KEY_VOL_DOWN_GPIO              EXYNOS4_GPIO_X21
 #endif /* __ASSEMBLY__ */
 
 /* LCD console */

diff --git a/include/configs/trats2.h b/include/configs/trats2.h
index 30a4b8cd8dad5ea605b9aa866a9dce60c73c599e..3d5f21dde07ce7557331046931d0007c9b969154 100644 (file)
--- a/include/configs/trats2.h
+++ b/include/configs/trats2.h
@@ -222,8 +222,8 @@ int get_soft_i2c_sda_pin(void);
 #define KEY_PWR_INTERRUPT_REG          MAX77686_REG_PMIC_INT1
 #define KEY_PWR_INTERRUPT_MASK         (1 << 1)
 
-#define KEY_VOL_UP_GPIO                        exynos4x12_gpio_get(2, x2, 2)
-#define KEY_VOL_DOWN_GPIO              exynos4x12_gpio_get(2, x3, 3)
+#define KEY_VOL_UP_GPIO                        EXYNOS4X12_GPIO_X22
+#define KEY_VOL_DOWN_GPIO              EXYNOS4X12_GPIO_X33
 #endif /* __ASSEMBLY__ */
 
 /* LCD console */