-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'next-s5pc100' into for-next
- Loading branch information
Showing
11 changed files
with
201 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| /* linux/arch/arm/mach-s5pc100/setup-ide.c | ||
| * | ||
| * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| * http://www.samsung.com | ||
| * | ||
| * S5PC100 setup information for IDE | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
|
|
||
| #include <linux/kernel.h> | ||
| #include <linux/gpio.h> | ||
| #include <linux/io.h> | ||
|
|
||
| #include <mach/regs-clock.h> | ||
| #include <plat/gpio-cfg.h> | ||
|
|
||
| void s5pc100_ide_setup_gpio(void) | ||
| { | ||
| u32 reg; | ||
| u32 gpio = 0; | ||
|
|
||
| /* Independent CF interface, CF chip select configuration */ | ||
| reg = readl(S5PC100_MEM_SYS_CFG) & (~0x3f); | ||
| writel(reg | MEM_SYS_CFG_EBI_FIX_PRI_CFCON, S5PC100_MEM_SYS_CFG); | ||
|
|
||
| /* CF_Add[0 - 2], CF_IORDY, CF_INTRQ, CF_DMARQ, CF_DMARST, CF_DMACK */ | ||
| for (gpio = S5PC100_GPJ0(0); gpio <= S5PC100_GPJ0(7); gpio++) { | ||
| s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(4)); | ||
| s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
| s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
| } | ||
|
|
||
| /*CF_Data[0 - 7] */ | ||
| for (gpio = S5PC100_GPJ2(0); gpio <= S5PC100_GPJ2(7); gpio++) { | ||
| s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(4)); | ||
| s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
| s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
| } | ||
|
|
||
| /* CF_Data[8 - 15] */ | ||
| for (gpio = S5PC100_GPJ3(0); gpio <= S5PC100_GPJ3(7); gpio++) { | ||
| s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(4)); | ||
| s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
| s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
| } | ||
|
|
||
| /* CF_CS0, CF_CS1, CF_IORD, CF_IOWR */ | ||
| for (gpio = S5PC100_GPJ4(0); gpio <= S5PC100_GPJ4(3); gpio++) { | ||
| s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(4)); | ||
| s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
| s5p_gpio_set_drvstr(gpio, S5P_GPIO_DRVSTR_LV4); | ||
| } | ||
|
|
||
| /* EBI_OE, EBI_WE */ | ||
| for (gpio = S5PC100_GPK0(6); gpio <= S5PC100_GPK0(7); gpio++) | ||
| s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(0)); | ||
|
|
||
| /* CF_OE, CF_WE */ | ||
| for (gpio = S5PC100_GPK1(6); gpio <= S5PC100_GPK1(7); gpio++) { | ||
| s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
| s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
| } | ||
|
|
||
| /* CF_CD */ | ||
| s3c_gpio_cfgpin(S5PC100_GPK3(5), S3C_GPIO_SFN(2)); | ||
| s3c_gpio_setpull(S5PC100_GPK3(5), S3C_GPIO_PULL_NONE); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* linux/arch/arm/mach-s5pc100/setup-keypad.c | ||
| * | ||
| * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| * http://www.samsung.com/ | ||
| * | ||
| * GPIO configuration for S5PC100 KeyPad device | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
|
|
||
| #include <linux/gpio.h> | ||
| #include <plat/gpio-cfg.h> | ||
|
|
||
| void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) | ||
| { | ||
| unsigned int gpio; | ||
| unsigned int end; | ||
|
|
||
| /* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */ | ||
| end = S5PC100_GPH3(rows); | ||
| for (gpio = S5PC100_GPH3(0); gpio < end; gpio++) { | ||
| s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3)); | ||
| s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
| } | ||
|
|
||
| /* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */ | ||
| end = S5PC100_GPH2(cols); | ||
| for (gpio = S5PC100_GPH2(0); gpio < end; gpio++) { | ||
| s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3)); | ||
| s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters