Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 91231
b: refs/heads/master
c: c0a596d
h: refs/heads/master
i:
  91229: 9355069
  91227: 950479a
  91223: 53f2447
  91215: c5745b0
  91199: 8e6c4e5
v: v3
  • Loading branch information
eric miao authored and Russell King committed Apr 19, 2008
1 parent b022788 commit ea23f1d
Show file tree
Hide file tree
Showing 6 changed files with 92 additions and 69 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9b02b2df0099c083ea40ba8c7068e3dcbe381302
refs/heads/master: c0a596d6a138ea281bed4ff3018c07c45dd245a2
93 changes: 74 additions & 19 deletions trunk/arch/arm/mach-pxa/mfp-pxa2xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,17 @@

#define PWER_WE35 (1 << 24)

static struct {
struct gpio_desc {
unsigned valid : 1;
unsigned can_wakeup : 1;
unsigned keypad_gpio : 1;
unsigned int mask; /* bit mask in PWER or PKWR */
unsigned long config;
} gpio_desc[MFP_PIN_GPIO127 + 1];
};

static struct gpio_desc gpio_desc[MFP_PIN_GPIO127 + 1];

static inline int __mfp_config_gpio(unsigned gpio, unsigned long c)
static int __mfp_config_gpio(unsigned gpio, unsigned long c)
{
unsigned long gafr, mask = GPIO_bit(gpio);
int fn;
Expand Down Expand Up @@ -70,26 +72,19 @@ static inline int __mfp_config_gpio(unsigned gpio, unsigned long c)
return -EINVAL;
}

/* wakeup enabling */
if ((c & MFP_LPM_WAKEUP_ENABLE) == 0)
return 0;

if (!gpio_desc[gpio].can_wakeup || c & MFP_DIR_OUT) {
/* give early warning if MFP_LPM_CAN_WAKEUP is set on the
* configurations of those pins not able to wakeup
*/
if ((c & MFP_LPM_CAN_WAKEUP) && !gpio_desc[gpio].can_wakeup) {
pr_warning("%s: GPIO%d unable to wakeup\n",
__func__, gpio);
return -EINVAL;
}

if (gpio_desc[gpio].keypad_gpio)
PKWR |= gpio_desc[gpio].mask;
else {
PWER |= gpio_desc[gpio].mask;

if (c & MFP_LPM_EDGE_RISE)
PRER |= gpio_desc[gpio].mask;

if (c & MFP_LPM_EDGE_FALL)
PFER |= gpio_desc[gpio].mask;
if ((c & MFP_LPM_CAN_WAKEUP) && (c & MFP_DIR_OUT)) {
pr_warning("%s: output GPIO%d unable to wakeup\n",
__func__, gpio);
return -EINVAL;
}

return 0;
Expand Down Expand Up @@ -120,6 +115,45 @@ void pxa2xx_mfp_config(unsigned long *mfp_cfgs, int num)
}
}

int gpio_set_wake(unsigned int gpio, unsigned int on)
{
struct gpio_desc *d;
unsigned long c;

if (gpio > mfp_to_gpio(MFP_PIN_GPIO127))
return -EINVAL;

d = &gpio_desc[gpio];
c = d->config;

if (!d->valid)
return -EINVAL;

if (d->keypad_gpio)
return -EINVAL;

if (d->can_wakeup && (c & MFP_LPM_CAN_WAKEUP)) {
if (on) {
PWER |= d->mask;

if (c & MFP_LPM_EDGE_RISE)
PRER |= d->mask;
else
PRER &= ~d->mask;

if (c & MFP_LPM_EDGE_FALL)
PFER |= d->mask;
else
PFER &= ~d->mask;
} else {
PWER &= ~d->mask;
PRER &= ~d->mask;
PFER &= ~d->mask;
}
}
return 0;
}

#ifdef CONFIG_PXA25x
static int __init pxa25x_mfp_init(void)
{
Expand All @@ -141,11 +175,32 @@ postcore_initcall(pxa25x_mfp_init);
#endif /* CONFIG_PXA25x */

#ifdef CONFIG_PXA27x
static int pxa27x_pkwr_gpio[] __initdata = {
static int pxa27x_pkwr_gpio[] = {
13, 16, 17, 34, 36, 37, 38, 39, 90, 91, 93, 94,
95, 96, 97, 98, 99, 100, 101, 102
};

int keypad_set_wake(unsigned int on)
{
unsigned int i, gpio, mask = 0;

if (!on) {
PKWR = 0;
return 0;
}

for (i = 0; i < ARRAY_SIZE(pxa27x_pkwr_gpio); i++) {

gpio = pxa27x_pkwr_gpio[i];

if (gpio_desc[gpio].config & MFP_LPM_CAN_WAKEUP)
mask |= gpio_desc[gpio].mask;
}

PKWR = mask;
return 0;
}

static int __init pxa27x_mfp_init(void)
{
int i, gpio;
Expand Down
23 changes: 5 additions & 18 deletions trunk/arch/arm/mach-pxa/pxa25x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <asm/hardware.h>
#include <asm/arch/irqs.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/mfp-pxa25x.h>
#include <asm/arch/pm.h>
#include <asm/arch/dma.h>

Expand Down Expand Up @@ -230,24 +231,10 @@ static inline void pxa25x_init_pm(void) {}
static int pxa25x_set_wake(unsigned int irq, unsigned int on)
{
int gpio = IRQ_TO_GPIO(irq);
uint32_t gpio_bit, mask = 0;

if (gpio >= 0 && gpio <= 15) {
gpio_bit = GPIO_bit(gpio);
mask = gpio_bit;
if (on) {
if (GRER(gpio) | gpio_bit)
PRER |= gpio_bit;
else
PRER &= ~gpio_bit;

if (GFER(gpio) | gpio_bit)
PFER |= gpio_bit;
else
PFER &= ~gpio_bit;
}
goto set_pwer;
}
uint32_t mask = 0;

if (gpio >= 0 && gpio < 85)
return gpio_set_wake(gpio, on);

if (irq == IRQ_RTCAlrm) {
mask = PWER_RTC;
Expand Down
31 changes: 5 additions & 26 deletions trunk/arch/arm/mach-pxa/pxa27x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <asm/arch/irqs.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxa2xx-regs.h>
#include <asm/arch/mfp-pxa27x.h>
#include <asm/arch/ohci.h>
#include <asm/arch/pm.h>
#include <asm/arch/dma.h>
Expand Down Expand Up @@ -286,37 +287,16 @@ static inline void pxa27x_init_pm(void) {}
/* PXA27x: Various gpios can issue wakeup events. This logic only
* handles the simple cases, not the WEMUX2 and WEMUX3 options
*/
#define PXA27x_GPIO_NOWAKE_MASK \
((1 << 8) | (1 << 7) | (1 << 6) | (1 << 5) | (1 << 2))
#define WAKEMASK(gpio) \
(((gpio) <= 15) \
? ((1 << (gpio)) & ~PXA27x_GPIO_NOWAKE_MASK) \
: ((gpio == 35) ? (1 << 24) : 0))

static int pxa27x_set_wake(unsigned int irq, unsigned int on)
{
int gpio = IRQ_TO_GPIO(irq);
uint32_t mask;

if ((gpio >= 0 && gpio <= 15) || (gpio == 35)) {
if (WAKEMASK(gpio) == 0)
return -EINVAL;

mask = WAKEMASK(gpio);

if (on) {
if (GRER(gpio) | GPIO_bit(gpio))
PRER |= mask;
else
PRER &= ~mask;
if (gpio >= 0 && gpio < 128)
return gpio_set_wake(gpio, on);

if (GFER(gpio) | GPIO_bit(gpio))
PFER |= mask;
else
PFER &= ~mask;
}
goto set_pwer;
}
if (irq == IRQ_KEYPAD)
return keypad_set_wake(on);

switch (irq) {
case IRQ_RTCAlrm:
Expand All @@ -329,7 +309,6 @@ static int pxa27x_set_wake(unsigned int irq, unsigned int on)
return -EINVAL;
}

set_pwer:
if (on)
PWER |= mask;
else
Expand Down
1 change: 1 addition & 0 deletions trunk/include/asm-arm/arch-pxa/mfp-pxa27x.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,4 +428,5 @@
#define GPIO112_nMSINS MFP_CFG_IN(GPIO112, AF2)
#define GPIO32_MSSCLK MFP_CFG_OUT(GPIO32, AF1, DRIVE_LOW)

extern int keypad_set_wake(unsigned int on);
#endif /* __ASM_ARCH_MFP_PXA27X_H */
11 changes: 6 additions & 5 deletions trunk/include/asm-arm/arch-pxa/mfp-pxa2xx.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@
#define MFP_DIR_MASK (0x1 << 23)
#define MFP_DIR(x) (((x) >> 23) & 0x1)

#define MFP_LPM_WAKEUP_ENABLE (0x1 << 24)
#define WAKEUP_ON_EDGE_RISE (MFP_LPM_WAKEUP_ENABLE | MFP_LPM_EDGE_RISE)
#define WAKEUP_ON_EDGE_FALL (MFP_LPM_WAKEUP_ENABLE | MFP_LPM_EDGE_FALL)
#define WAKEUP_ON_EDGE_BOTH (MFP_LPM_WAKEUP_ENABLE | MFP_LPM_EDGE_BOTH)
#define MFP_LPM_CAN_WAKEUP (0x1 << 24)
#define WAKEUP_ON_EDGE_RISE (MFP_LPM_CAN_WAKEUP | MFP_LPM_EDGE_RISE)
#define WAKEUP_ON_EDGE_FALL (MFP_LPM_CAN_WAKEUP | MFP_LPM_EDGE_FALL)
#define WAKEUP_ON_EDGE_BOTH (MFP_LPM_CAN_WAKEUP | MFP_LPM_EDGE_BOTH)

/* specifically for enabling wakeup on keypad GPIOs */
#define WAKEUP_ON_LEVEL_HIGH (MFP_LPM_WAKEUP_ENABLE)
#define WAKEUP_ON_LEVEL_HIGH (MFP_LPM_CAN_WAKEUP)

#define MFP_CFG_IN(pin, af) \
((MFP_CFG_DEFAULT & ~(MFP_AF_MASK | MFP_DIR_MASK)) |\
Expand Down Expand Up @@ -128,4 +128,5 @@
#define GPIO84_GPIO MFP_CFG_IN(GPIO84, AF0)

extern void pxa2xx_mfp_config(unsigned long *mfp_cfgs, int num);
extern int gpio_set_wake(unsigned int gpio, unsigned int on);
#endif /* __ASM_ARCH_MFP_PXA2XX_H */

0 comments on commit ea23f1d

Please sign in to comment.