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 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
poodle.c
diff --git
a/arch/arm/mach-pxa/poodle.c
b/arch/arm/mach-pxa/poodle.c
index
dd54496
..
39612cf
100644
(file)
--- a/
arch/arm/mach-pxa/poodle.c
+++ b/
arch/arm/mach-pxa/poodle.c
@@
-32,6
+32,8
@@
#include <asm/mach/irq.h>
#include <asm/arch/pxa-regs.h>
#include <asm/mach/irq.h>
#include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-regs.h>
+#include <asm/arch/pxa2xx-gpio.h>
#include <asm/arch/mmc.h>
#include <asm/arch/udc.h>
#include <asm/arch/irda.h>
#include <asm/arch/mmc.h>
#include <asm/arch/udc.h>
#include <asm/arch/irda.h>
@@
-164,7
+166,7
@@
static struct resource poodlets_resources[] = {
},
};
},
};
-static unsigned long poodle_get_hsync_
len
(void)
+static unsigned long poodle_get_hsync_
invperiod
(void)
{
return 0;
}
{
return 0;
}
@@
-174,9
+176,9
@@
static void poodle_null_hsync(void)
}
static struct corgits_machinfo poodle_ts_machinfo = {
}
static struct corgits_machinfo poodle_ts_machinfo = {
- .get_hsync_
len = poodle_get_hsync_len
,
- .put_hsync = poodle_null_hsync,
- .wait_hsync = poodle_null_hsync,
+ .get_hsync_
invperiod = poodle_get_hsync_invperiod
,
+ .put_hsync
= poodle_null_hsync,
+ .wait_hsync
= poodle_null_hsync,
};
static struct platform_device poodle_ts_device = {
};
static struct platform_device poodle_ts_device = {
@@
-265,6
+267,7
@@
static void poodle_irda_transceiver_mode(struct device *dev, int mode)
} else {
GPCR(POODLE_GPIO_IR_ON) = GPIO_bit(POODLE_GPIO_IR_ON);
}
} else {
GPCR(POODLE_GPIO_IR_ON) = GPIO_bit(POODLE_GPIO_IR_ON);
}
+ pxa2xx_transceiver_mode(dev, mode);
}
static struct pxaficp_platform_data poodle_ficp_platform_data = {
}
static struct pxaficp_platform_data poodle_ficp_platform_data = {
@@
-325,13
+328,11
@@
static struct platform_device *devices[] __initdata = {
static void poodle_poweroff(void)
{
static void poodle_poweroff(void)
{
- RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
arm_machine_restart('h');
}
static void poodle_restart(char mode)
{
arm_machine_restart('h');
}
static void poodle_restart(char mode)
{
- RCSR = RCSR_HWR | RCSR_WDR | RCSR_SMR | RCSR_GPR;
arm_machine_restart('h');
}
arm_machine_restart('h');
}