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 'docs-next' of git://git.lwn.net/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2410
/
mach-qt2410.c
diff --git
a/arch/arm/mach-s3c2410/mach-qt2410.c
b/arch/arm/mach-s3c2410/mach-qt2410.c
index
92a4ec3
..
d0e87b6
100644
(file)
--- a/
arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/
arch/arm/mach-s3c2410/mach-qt2410.c
@@
-58,6
+58,7
@@
#include <plat/iic.h>
#include <plat/common-smdk.h>
#include <plat/iic.h>
#include <plat/common-smdk.h>
+#include <plat/gpio-cfg.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/pm.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/pm.h>
@@
-219,10
+220,10
@@
static void spi_gpio_cs(struct s3c2410_spigpio_info *spi, int cs)
{
switch (cs) {
case BITBANG_CS_ACTIVE:
{
switch (cs) {
case BITBANG_CS_ACTIVE:
-
s3c2410_gpio_setpin
(S3C2410_GPB(5), 0);
+
gpio_set_value
(S3C2410_GPB(5), 0);
break;
case BITBANG_CS_INACTIVE:
break;
case BITBANG_CS_INACTIVE:
-
s3c2410_gpio_setpin
(S3C2410_GPB(5), 1);
+
gpio_set_value
(S3C2410_GPB(5), 1);
break;
}
}
break;
}
}
@@
-347,13
+348,14
@@
static void __init qt2410_machine_init(void)
}
s3c24xx_fb_set_platdata(&qt2410_fb_info);
}
s3c24xx_fb_set_platdata(&qt2410_fb_info);
- s3c
2410
_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPIO_OUTPUT);
+ s3c_gpio_cfgpin(S3C2410_GPB(0), S3C2410_GPIO_OUTPUT);
s3c2410_gpio_setpin(S3C2410_GPB(0), 1);
s3c24xx_udc_set_platdata(&qt2410_udc_cfg);
s3c_i2c0_set_platdata(NULL);
s3c2410_gpio_setpin(S3C2410_GPB(0), 1);
s3c24xx_udc_set_platdata(&qt2410_udc_cfg);
s3c_i2c0_set_platdata(NULL);
- s3c2410_gpio_cfgpin(S3C2410_GPB(5), S3C2410_GPIO_OUTPUT);
+ WARN_ON(gpio_request(S3C2410_GPB(5), "spi cs"));
+ gpio_direction_output(S3C2410_GPB(5), 1);
platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));
s3c_pm_init();
platform_add_devices(qt2410_devices, ARRAY_SIZE(qt2410_devices));
s3c_pm_init();