Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
大约 1 年 前同步成功

通知 158
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 53134a74 编写于 作者: B Ben Dooks 提交者： Kukjin Kim
浏览文件
操作

ARM: S5PV210: Change to using s3c_gpio_cfgall_range() 

Change the code setting a range of GPIO pins' configuration and
pull state to use the recently introduced s3c_gpio_cfgall_range().

Mop up a few missed s3c_gpio_cfgpin_range() changes.
Signed-off-by: NBen Dooks <ben-linux@fluff.org>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
上级 a40af066
隐藏空白更改
内联 并排
Showing with 31 addition and 57 deletion
arch/arm/mach-s5pv210/setup-fb-24bpp.c
浏览文件 @ 53134a74
......@@ -21,33 +21,21 @@
#include <mach/regs-clock.h>
#include <plat/gpio-cfg.h>
void s5pv210_fb_gpio_setup_24bpp(void)
static void s5pv210_fb_cfg_gpios(unsigned int base, unsigned int nr)
{
unsigned int gpio = 0;
for (gpio = S5PV210_GPF0(0); gpio <= S5PV210_GPF0(7); gpio++) {
s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4);
}
s3c_gpio_cfgall_range(base, nr, S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
for (gpio = S5PV210_GPF1(0); gpio <= S5PV210_GPF1(7); gpio++) {
s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4);
}
for (; nr > 0; nr--, base++)
s5p_gpio_set_drvstr(base, S5P_GPIO_DRVSTR_LV4);
}
for (gpio = S5PV210_GPF2(0); gpio <= S5PV210_GPF2(7); gpio++) {
s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4);
}
for (gpio = S5PV210_GPF3(0); gpio <= S5PV210_GPF3(3); gpio++) {
s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4);
}
void s5pv210_fb_gpio_setup_24bpp(void)
{
s5pv210_fb_cfg_gpios(S5PV210_GPF0(0), 8);
s5pv210_fb_cfg_gpios(S5PV210_GPF1(0), 8);
s5pv210_fb_cfg_gpios(S5PV210_GPF2(0), 8);
s5pv210_fb_cfg_gpios(S5PV210_GPF3(0), 4);
/* Set DISPLAY_CONTROL register for Display path selection.
*
......
arch/arm/mach-s5pv210/setup-sdhci-gpio.c
浏览文件 @ 53134a74
......@@ -26,24 +26,20 @@
void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
{
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
unsigned int gpio;
/* Set all the necessary GPG0/GPG1 pins to special-function 2 */
s3c_gpio_cfgpin_range(S5PV210_GPG0(0), 2, S3C_GPIO_SFN(2));
for (gpio = S5PV210_GPG0(0); gpio < S5PV210_GPG0(2); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG0(0), 2,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
switch (width) {
case 8:
/* GPG1[3:6] special-funtion 3 */
s3c_gpio_cfgpin_range(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3));
for (gpio = S5PV210_GPG1(3); gpio <= S5PV210_GPG1(6); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
case 4:
/* GPG0[3:6] special-funtion 2 */
s3c_gpio_cfgpin_range(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2));
for (gpio = S5PV210_GPG0(3); gpio <= S5PV210_GPG0(6); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG0(3), 4,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
default:
break;
}
......@@ -57,17 +53,14 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
{
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
unsigned int gpio;
/* Set all the necessary GPG1[0:1] pins to special-function 2 */
s3c_gpio_cfgpin_range(S5PV210_GPG1(0), 2, S3C_GPIO_SFN(2));
for (gpio = S5PV210_GPG1(0); gpio < S5PV210_GPG1(2); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG1(0), 2,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
/* Data pin GPG1[3:6] to special-function 2 */
s3c_gpio_cfgpin_range(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(2));
for (gpio = S5PV210_GPG1(3); gpio <= S5PV210_GPG1(6); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
......@@ -78,24 +71,20 @@ void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
{
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
unsigned int gpio;
/* Set all the necessary GPG2[0:1] pins to special-function 2 */
s3c_gpio_cfgpin_range(S5PV210_GPG2(0), 2, S3C_GPIO_SFN(2));
for (gpio = S5PV210_GPG2(0); gpio < S5PV210_GPG2(2); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG2(0), 2,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
switch (width) {
case 8:
/* Data pin GPG3[3:6] to special-function 3 */
s3c_gpio_cfgpin_range(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(3));
for (gpio = S5PV210_GPG3(3); gpio <= S5PV210_GPG3(6); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4,
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
case 4:
/* Data pin GPG2[3:6] to special-function 2 */
s3c_gpio_cfgpin_range(S5PV210_GPG2(3), 4, S3C_GPIO_SFN(2));
for (gpio = S5PV210_GPG2(3); gpio <= S5PV210_GPG2(6); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG2(3), 4,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
default:
break;
}
......@@ -109,17 +98,14 @@ void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
void s5pv210_setup_sdhci3_cfg_gpio(struct platform_device *dev, int width)
{
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
unsigned int gpio;
/* Set all the necessary GPG3[0:1] pins to special-function 2 */
s3c_gpio_cfgpin_range(S5PV210_GPG3(0), 2, S3C_GPIO_SFN(2));
for (gpio = S5PV210_GPG3(0); gpio < S5PV210_GPG3(2); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG3(0), 2,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
/* Data pin GPG3[3:6] to special-function 2 */
s3c_gpio_cfgpin_range(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(2));
for (gpio = S5PV210_GPG3(3); gpio <= S5PV210_GPG3(6); gpio++)
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
s3c_gpio_setpull(S5PV210_GPG3(2), S3C_GPIO_PULL_UP);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或