Commit a7aac9d5 authored by Kukjin Kim's avatar Kukjin Kim

ARM: S5PV210: 2nd Change to using s3c_gpio_cfgrange_nopull()

This patch changes code setting special-function and no pull-up
to use the s3c_gpio_cfgrange_nopull() wrapper.
NOTE: This is for missed things from the previous patch.
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 20dbc43d
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr) static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
{ {
s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE); s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(2));
for (; nr > 0; nr--, base++) for (; nr > 0; nr--, base++)
s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4); s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr) static void s5pv210_ide_cfg_gpios(unsigned int base, unsigned int nr)
{ {
s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(4), S3C_GPIO_PULL_NONE); s3c_gpio_cfgrange_nopull(base, nr, S3C_GPIO_SFN(4));
for (; nr > 0; nr--, base++) for (; nr > 0; nr--, base++)
s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4); s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
......
...@@ -17,10 +17,8 @@ ...@@ -17,10 +17,8 @@
void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
{ {
/* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */ /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */
s3c_gpio_cfgall_range(S5PV210_GPH3(0), rows, s3c_gpio_cfgrange_nopull(S5PV210_GPH3(0), rows, S3C_GPIO_SFN(3));
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
/* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */ /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */
s3c_gpio_cfgall_range(S5PV210_GPH2(0), cols, s3c_gpio_cfgrange_nopull(S5PV210_GPH2(0), cols, S3C_GPIO_SFN(3));
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
} }
...@@ -28,8 +28,7 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width) ...@@ -28,8 +28,7 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
/* Set all the necessary GPG0/GPG1 pins to special-function 2 */ /* Set all the necessary GPG0/GPG1 pins to special-function 2 */
s3c_gpio_cfgall_range(S5PV210_GPG0(0), 2, s3c_gpio_cfgrange_nopull(S5PV210_GPG0(0), 2, S3C_GPIO_SFN(2));
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
switch (width) { switch (width) {
case 8: case 8:
...@@ -93,12 +92,10 @@ void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width) ...@@ -93,12 +92,10 @@ void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data; struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
/* Set all the necessary GPG3[0:1] pins to special-function 2 */ /* Set all the necessary GPG3[0:1] pins to special-function 2 */
s3c_gpio_cfgall_range(S5PV210_GPG3(0), 2, s3c_gpio_cfgrange_nopull(S5PV210_GPG3(0), 2, S3C_GPIO_SFN(2));
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
/* Data pin GPG3[3:6] to special-function 2 */ /* Data pin GPG3[3:6] to special-function 2 */
s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4, s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(2));
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) { if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP); s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment