git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-s5p6442
/
dev-spi.c
diff --git
a/arch/arm/mach-s5p6442/dev-spi.c
b/arch/arm/mach-s5p6442/dev-spi.c
index
e894651
..
cce8c24
100644
(file)
--- a/
arch/arm/mach-s5p6442/dev-spi.c
+++ b/
arch/arm/mach-s5p6442/dev-spi.c
@@
-38,11
+38,9
@@
static int s5p6442_spi_cfg_gpio(struct platform_device *pdev)
switch (pdev->id) {
case 0:
s3c_gpio_cfgpin(S5P6442_GPB(0), S3C_GPIO_SFN(2));
switch (pdev->id) {
case 0:
s3c_gpio_cfgpin(S5P6442_GPB(0), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPB(2), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPB(3), S3C_GPIO_SFN(2));
s3c_gpio_setpull(S5P6442_GPB(0), S3C_GPIO_PULL_UP);
s3c_gpio_setpull(S5P6442_GPB(0), S3C_GPIO_PULL_UP);
- s3c_gpio_
setpull(S5P6442_GPB(2), S3C_GPIO_PULL_UP);
-
s3c_gpio_setpull(S5P6442_GPB(3
), S3C_GPIO_PULL_UP);
+ s3c_gpio_
cfgall_range(S5P6442_GPB(2), 2,
+
S3C_GPIO_SFN(2
), S3C_GPIO_PULL_UP);
break;
default:
break;
default: