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 'depends/rmk/gpio' into next/devel
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
gplugd.c
diff --git
a/arch/arm/mach-mmp/gplugd.c
b/arch/arm/mach-mmp/gplugd.c
index
ef738de
..
32776f3
100644
(file)
--- a/
arch/arm/mach-mmp/gplugd.c
+++ b/
arch/arm/mach-mmp/gplugd.c
@@
-16,16
+16,18
@@
#include <mach/pxa168.h>
#include <mach/mfp-pxa168.h>
#include <mach/pxa168.h>
#include <mach/mfp-pxa168.h>
-#include <mach/mfp-gplugd.h>
#include "common.h"
static unsigned long gplugd_pin_config[] __initdata = {
/* UART3 */
#include "common.h"
static unsigned long gplugd_pin_config[] __initdata = {
/* UART3 */
- GPIO8_UART3_SOUT,
- GPIO9_UART3_SIN,
- GPI1O_UART3_CTS,
- GPI11_UART3_RTS,
+ GPIO8_UART3_TXD,
+ GPIO9_UART3_RXD,
+ GPIO1O_UART3_CTS,
+ GPIO11_UART3_RTS,
+
+ /* USB OTG PEN */
+ GPIO18_GPIO,
/* MMC2 */
GPIO28_MMC2_CMD,
/* MMC2 */
GPIO28_MMC2_CMD,
@@
-109,6
+111,12
@@
static unsigned long gplugd_pin_config[] __initdata = {
GPIO105_CI2C_SDA,
GPIO106_CI2C_SCL,
GPIO105_CI2C_SDA,
GPIO106_CI2C_SCL,
+ /* SPI NOR Flash on SSP2 */
+ GPIO107_SSP2_RXD,
+ GPIO108_SSP2_TXD,
+ GPIO110_GPIO, /* SPI_CSn */
+ GPIO111_SSP2_CLK,
+
/* Select JTAG */
GPIO109_GPIO,
/* Select JTAG */
GPIO109_GPIO,
@@
-154,7
+162,7
@@
static void __init select_disp_freq(void)
"frequency\n");
} else {
gpio_direction_output(35, 1);
"frequency\n");
} else {
gpio_direction_output(35, 1);
- gpio_free(
104
);
+ gpio_free(
35
);
}
if (unlikely(gpio_request(85, "DISP_FREQ_SEL_2"))) {
}
if (unlikely(gpio_request(85, "DISP_FREQ_SEL_2"))) {
@@
-162,7
+170,7
@@
static void __init select_disp_freq(void)
"frequency\n");
} else {
gpio_direction_output(85, 0);
"frequency\n");
} else {
gpio_direction_output(85, 0);
- gpio_free(
104
);
+ gpio_free(
85
);
}
}
}
}