* [PATCH 1/2] ARM: imx: Add wake functionality to GPIO
@ 2010-10-15 20:18 Dinh.Nguyen at freescale.com
2010-10-15 20:18 ` [PATCH 2/2] ARM: imx: Add POWER_KEY to mx51 babbage board Dinh.Nguyen at freescale.com
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Dinh.Nguyen at freescale.com @ 2010-10-15 20:18 UTC (permalink / raw)
To: linux-arm-kernel
From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Add function definition for irq_chip.set_wake to enable GPIO to
wake-up the system.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
---
arch/arm/plat-mxc/gpio.c | 35 +++++++++++++++++++++++++++++++++
arch/arm/plat-mxc/include/mach/gpio.h | 3 ++
2 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
index 57ec4a8..7647ba3 100644
--- a/arch/arm/plat-mxc/gpio.c
+++ b/arch/arm/plat-mxc/gpio.c
@@ -20,9 +20,11 @@
*/
#include <linux/init.h>
+#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/gpio.h>
+#include <mach/gpio.h>
#include <mach/hardware.h>
#include <asm-generic/bug.h>
@@ -201,11 +203,44 @@ static void mx2_gpio_irq_handler(u32 irq, struct irq_desc *desc)
}
}
+/*
+ * Set interrupt number "irq" in the GPIO as a wake-up source.
+ * While system is running, all registered GPIO interrupts need to have
+ * wake-up enabled. When system is suspended, only selected GPIO interrupts
+ * need to have wake-up enabled.
+ * @param irq interrupt source number
+ * @param enable enable as wake-up if equal to non-zero
+ * @return This function returns 0 on success.
+ */
+static int gpio_set_wake_irq(u32 irq, u32 enable)
+{
+ u32 gpio = irq_to_gpio(irq);
+ u32 gpio_idx = gpio & 0x1F;
+ struct mxc_gpio_port *port = &mxc_gpio_ports[gpio / 32];
+
+ if (enable) {
+ port->suspend_wakeup |= (1 << gpio_idx);
+ if (port->irq_high && (gpio_idx >= 16))
+ enable_irq_wake(port->irq_high);
+ else
+ enable_irq_wake(port->irq);
+ } else {
+ port->suspend_wakeup &= ~(1 << gpio_idx);
+ if (port->irq_high && (gpio_idx >= 16))
+ disable_irq_wake(port->irq_high);
+ else
+ disable_irq_wake(port->irq);
+ }
+
+ return 0;
+}
+
static struct irq_chip gpio_irq_chip = {
.ack = gpio_ack_irq,
.mask = gpio_mask_irq,
.unmask = gpio_unmask_irq,
.set_type = gpio_set_irq_type,
+ .set_wake = gpio_set_wake_irq,
};
static void _set_gpio_direction(struct gpio_chip *chip, unsigned offset,
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h
index af33b74..dba3768 100644
--- a/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@ -39,6 +39,9 @@ struct mxc_gpio_port {
struct gpio_chip chip;
u32 both_edges;
spinlock_t lock;
+ u32 suspend_wakeup;
+ u32 saved_wakeup;
+
};
int mxc_gpio_init(struct mxc_gpio_port*, int);
--
1.6.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: imx: Add POWER_KEY to mx51 babbage board
2010-10-15 20:18 [PATCH 1/2] ARM: imx: Add wake functionality to GPIO Dinh.Nguyen at freescale.com
@ 2010-10-15 20:18 ` Dinh.Nguyen at freescale.com
2010-10-15 21:09 ` Eric Bénard
2010-10-15 20:23 ` [PATCH 1/2] ARM: imx: Add wake functionality to GPIO Russell King - ARM Linux
` (2 subsequent siblings)
3 siblings, 1 reply; 6+ messages in thread
From: Dinh.Nguyen at freescale.com @ 2010-10-15 20:18 UTC (permalink / raw)
To: linux-arm-kernel
From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Add functionality for the power button on MX51 Babbage board.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
---
arch/arm/mach-mx5/board-mx51_babbage.c | 42 +++++++++++++++++++++++++++
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 4 ++-
2 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
index 6e384d9..92f16ca 100644
--- a/arch/arm/mach-mx5/board-mx51_babbage.c
+++ b/arch/arm/mach-mx5/board-mx51_babbage.c
@@ -16,6 +16,8 @@
#include <linux/gpio.h>
#include <linux/delay.h>
#include <linux/io.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/fsl_devices.h>
#include <mach/common.h>
@@ -36,6 +38,7 @@
#define BABBAGE_USB_HUB_RESET (0*32 + 7) /* GPIO_1_7 */
#define BABBAGE_USBH1_STP (0*32 + 27) /* GPIO_1_27 */
#define BABBAGE_PHY_RESET (1*32 +5) /* GPIO_2_5 */
+#define BABBAGE_POWER_KEY (1*32 + 21) /* GPIO_2_21 */
/* USB_CTRL_1 */
#define MX51_USB_CTRL_1_OFFSET 0x10
@@ -93,6 +96,9 @@ static struct pad_desc mx51babbage_pads[] = {
/* USB HUB reset line*/
MX51_PAD_GPIO_1_7__GPIO_1_7,
+
+ /* Power Key */
+ MX51_PAD_EIM_A27__GPIO_2_21,
};
/* Serial ports */
@@ -240,6 +246,42 @@ static int __init babbage_otg_mode(char *options)
}
__setup("otg_mode=", babbage_otg_mode);
+/*!
+ * Power Key interrupt handler.
+ */
+static irqreturn_t power_key_int(int irq, void *dev_id)
+{
+ printk(KERN_INFO "PWR key pressed\n");
+ return 0;
+}
+
+/*!
+ * Power Key initialization.
+ */
+static int __init mxc_init_power_key(void)
+{
+ /* Set power key as wakeup resource */
+ int irq, ret;
+
+ /* power key */
+ ret = gpio_request(BABBAGE_POWER_KEY, "power-key");
+ if (ret) {
+ printk(KERN_ERR"failed to get BABBAGE_POWER_KEY: %d\n", ret);
+ return ret;
+ }
+ gpio_direction_input(BABBAGE_POWER_KEY);
+
+ irq = IOMUX_TO_IRQ(BABBAGE_POWER_KEY);
+ set_irq_type(irq, IRQF_TRIGGER_RISING);
+ ret = request_irq(irq, power_key_int, 0, "power-key", 0);
+ if (ret)
+ pr_info("register on-off key interrupt failed\n");
+ else
+ enable_irq_wake(irq);
+ return ret;
+}
+late_initcall(mxc_init_power_key);
+
/*
* Board specific initialization.
*/
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx51.h b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
index 21bfa46..05f62a4 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx51.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
@@ -31,6 +31,8 @@ typedef enum iomux_config {
IOMUX_CONFIG_SION = 0x1 << 4, /* LOOPBACK:MUX SION bit */
} iomux_pin_cfg_t;
+#define IOMUX_TO_IRQ(pin) (MXC_GPIO_IRQ_START + pin)
+
/* Pad control groupings */
#define MX51_UART1_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PKE | PAD_CTL_PUE | \
PAD_CTL_DSE_HIGH)
@@ -102,7 +104,7 @@ typedef enum iomux_config {
#define MX51_PAD_EIM_A24__GPIO_2_18 IOMUX_PAD(0x450, 0x0bc, 1, 0x0, 0, NO_PAD_CTRL)
#define MX51_PAD_EIM_A25__GPIO_2_19 IOMUX_PAD(0x454, 0x0c0, 1, 0x0, 0, NO_PAD_CTRL)
#define MX51_PAD_EIM_A26__GPIO_2_20 IOMUX_PAD(0x458, 0x0c4, 1, 0x0, 0, NO_PAD_CTRL)
-#define MX51_PAD_EIM_A27__GPIO_2_21 IOMUX_PAD(0x45c, 0x0c8, 1, 0x0, 0, NO_PAD_CTRL)
+#define MX51_PAD_EIM_A27__GPIO_2_21 IOMUX_PAD(0x45c, 0x0c8, 1, 0x0, 0, MX51_I2C_PAD_CTRL)
#define MX51_PAD_EIM_EB0__EIM_EB0 IOMUX_PAD(0x460, 0x0cc, 0, 0x0, 0, NO_PAD_CTRL)
#define MX51_PAD_EIM_EB1__EIM_EB1 IOMUX_PAD(0x464, 0x0d0, 0, 0x0, 0, NO_PAD_CTRL)
#define MX51_PAD_EIM_EB2__GPIO_2_22 IOMUX_PAD(0x468, 0x0d4, 1, 0x0, 0, NO_PAD_CTRL)
--
1.6.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: imx: Add wake functionality to GPIO
2010-10-15 20:18 [PATCH 1/2] ARM: imx: Add wake functionality to GPIO Dinh.Nguyen at freescale.com
2010-10-15 20:18 ` [PATCH 2/2] ARM: imx: Add POWER_KEY to mx51 babbage board Dinh.Nguyen at freescale.com
@ 2010-10-15 20:23 ` Russell King - ARM Linux
2010-10-16 18:49 ` Baruch Siach
2010-10-18 7:42 ` Sascha Hauer
3 siblings, 0 replies; 6+ messages in thread
From: Russell King - ARM Linux @ 2010-10-15 20:23 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 15, 2010 at 03:18:27PM -0500, Dinh.Nguyen at freescale.com wrote:
> From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
>
> Add function definition for irq_chip.set_wake to enable GPIO to
> wake-up the system.
>
> Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> ---
> arch/arm/plat-mxc/gpio.c | 35 +++++++++++++++++++++++++++++++++
> arch/arm/plat-mxc/include/mach/gpio.h | 3 ++
> 2 files changed, 38 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
> index 57ec4a8..7647ba3 100644
> --- a/arch/arm/plat-mxc/gpio.c
> +++ b/arch/arm/plat-mxc/gpio.c
> @@ -20,9 +20,11 @@
> */
>
> #include <linux/init.h>
> +#include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/irq.h>
> #include <linux/gpio.h>
> +#include <mach/gpio.h>
Not necessary. linux/gpio.h -> asm/gpio.h -> mach/gpio.h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: imx: Add POWER_KEY to mx51 babbage board
2010-10-15 20:18 ` [PATCH 2/2] ARM: imx: Add POWER_KEY to mx51 babbage board Dinh.Nguyen at freescale.com
@ 2010-10-15 21:09 ` Eric Bénard
0 siblings, 0 replies; 6+ messages in thread
From: Eric Bénard @ 2010-10-15 21:09 UTC (permalink / raw)
To: linux-arm-kernel
Hi Dinh,
Le 15/10/2010 22:18, Dinh.Nguyen at freescale.com a ?crit :
> +/*!
> + * Power Key interrupt handler.
> + */
> +static irqreturn_t power_key_int(int irq, void *dev_id)
> +{
> + printk(KERN_INFO "PWR key pressed\n");
> + return 0;
> +}
> +
> +/*!
> + * Power Key initialization.
> + */
> +static int __init mxc_init_power_key(void)
> +{
> + /* Set power key as wakeup resource */
> + int irq, ret;
> +
> + /* power key */
> + ret = gpio_request(BABBAGE_POWER_KEY, "power-key");
> + if (ret) {
> + printk(KERN_ERR"failed to get BABBAGE_POWER_KEY: %d\n", ret);
> + return ret;
> + }
> + gpio_direction_input(BABBAGE_POWER_KEY);
> +
> + irq = IOMUX_TO_IRQ(BABBAGE_POWER_KEY);
> + set_irq_type(irq, IRQF_TRIGGER_RISING);
> + ret = request_irq(irq, power_key_int, 0, "power-key", 0);
> + if (ret)
> + pr_info("register on-off key interrupt failed\n");
> + else
> + enable_irq_wake(irq);
> + return ret;
> +}
> +late_initcall(mxc_init_power_key);
> +
instead of doing this, you could use the gpio-keys driver which will configure
the IRQ as a wakeup source and also send keys to the input layer.
You can have an example here :
http://git.pengutronix.de/?p=imx/linux-2.6.git;a=blob;f=arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c;h=2b48f5190830c7cbe2f11676a628c55e1531c133;hb=imx-for-2.6.37#l98
Eric
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: imx: Add wake functionality to GPIO
2010-10-15 20:18 [PATCH 1/2] ARM: imx: Add wake functionality to GPIO Dinh.Nguyen at freescale.com
2010-10-15 20:18 ` [PATCH 2/2] ARM: imx: Add POWER_KEY to mx51 babbage board Dinh.Nguyen at freescale.com
2010-10-15 20:23 ` [PATCH 1/2] ARM: imx: Add wake functionality to GPIO Russell King - ARM Linux
@ 2010-10-16 18:49 ` Baruch Siach
2010-10-18 7:42 ` Sascha Hauer
3 siblings, 0 replies; 6+ messages in thread
From: Baruch Siach @ 2010-10-16 18:49 UTC (permalink / raw)
To: linux-arm-kernel
Hi Dinh,
On Fri, Oct 15, 2010 at 03:18:27PM -0500, Dinh.Nguyen at freescale.com wrote:
> From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
>
> Add function definition for irq_chip.set_wake to enable GPIO to
> wake-up the system.
>
> Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> ---
> arch/arm/plat-mxc/gpio.c | 35 +++++++++++++++++++++++++++++++++
> arch/arm/plat-mxc/include/mach/gpio.h | 3 ++
> 2 files changed, 38 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
> index 57ec4a8..7647ba3 100644
> --- a/arch/arm/plat-mxc/gpio.c
> +++ b/arch/arm/plat-mxc/gpio.c
[snip]
> diff --git a/arch/arm/plat-mxc/include/mach/gpio.h
> b/arch/arm/plat-mxc/include/mach/gpio.h
> index af33b74..dba3768 100644
> --- a/arch/arm/plat-mxc/include/mach/gpio.h
> +++ b/arch/arm/plat-mxc/include/mach/gpio.h
> @@ -39,6 +39,9 @@ struct mxc_gpio_port {
> struct gpio_chip chip;
> u32 both_edges;
> spinlock_t lock;
> + u32 suspend_wakeup;
> + u32 saved_wakeup;
> +
Unneeded blank line.
> };
>
> int mxc_gpio_init(struct mxc_gpio_port*, int);
baruch
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: imx: Add wake functionality to GPIO
2010-10-15 20:18 [PATCH 1/2] ARM: imx: Add wake functionality to GPIO Dinh.Nguyen at freescale.com
` (2 preceding siblings ...)
2010-10-16 18:49 ` Baruch Siach
@ 2010-10-18 7:42 ` Sascha Hauer
3 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2010-10-18 7:42 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Oct 15, 2010 at 03:18:27PM -0500, Dinh.Nguyen at freescale.com wrote:
> From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
>
> Add function definition for irq_chip.set_wake to enable GPIO to
> wake-up the system.
>
> Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> ---
> arch/arm/plat-mxc/gpio.c | 35 +++++++++++++++++++++++++++++++++
> arch/arm/plat-mxc/include/mach/gpio.h | 3 ++
> 2 files changed, 38 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
> index 57ec4a8..7647ba3 100644
> --- a/arch/arm/plat-mxc/gpio.c
> +++ b/arch/arm/plat-mxc/gpio.c
> @@ -20,9 +20,11 @@
> */
>
> #include <linux/init.h>
> +#include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/irq.h>
> #include <linux/gpio.h>
> +#include <mach/gpio.h>
> #include <mach/hardware.h>
> #include <asm-generic/bug.h>
>
> @@ -201,11 +203,44 @@ static void mx2_gpio_irq_handler(u32 irq, struct irq_desc *desc)
> }
> }
>
> +/*
> + * Set interrupt number "irq" in the GPIO as a wake-up source.
> + * While system is running, all registered GPIO interrupts need to have
> + * wake-up enabled. When system is suspended, only selected GPIO interrupts
> + * need to have wake-up enabled.
> + * @param irq interrupt source number
> + * @param enable enable as wake-up if equal to non-zero
> + * @return This function returns 0 on success.
> + */
> +static int gpio_set_wake_irq(u32 irq, u32 enable)
> +{
> + u32 gpio = irq_to_gpio(irq);
> + u32 gpio_idx = gpio & 0x1F;
> + struct mxc_gpio_port *port = &mxc_gpio_ports[gpio / 32];
> +
> + if (enable) {
> + port->suspend_wakeup |= (1 << gpio_idx);
> + if (port->irq_high && (gpio_idx >= 16))
> + enable_irq_wake(port->irq_high);
> + else
> + enable_irq_wake(port->irq);
> + } else {
> + port->suspend_wakeup &= ~(1 << gpio_idx);
> + if (port->irq_high && (gpio_idx >= 16))
> + disable_irq_wake(port->irq_high);
> + else
> + disable_irq_wake(port->irq);
> + }
> +
> + return 0;
> +}
> +
> static struct irq_chip gpio_irq_chip = {
> .ack = gpio_ack_irq,
> .mask = gpio_mask_irq,
> .unmask = gpio_unmask_irq,
> .set_type = gpio_set_irq_type,
> + .set_wake = gpio_set_wake_irq,
> };
>
> static void _set_gpio_direction(struct gpio_chip *chip, unsigned offset,
> diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h
> index af33b74..dba3768 100644
> --- a/arch/arm/plat-mxc/include/mach/gpio.h
> +++ b/arch/arm/plat-mxc/include/mach/gpio.h
> @@ -39,6 +39,9 @@ struct mxc_gpio_port {
> struct gpio_chip chip;
> u32 both_edges;
> spinlock_t lock;
> + u32 suspend_wakeup;
This variable seems unused.
> + u32 saved_wakeup;
> +
> };
Please remove that empty line.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-10-18 7:42 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-15 20:18 [PATCH 1/2] ARM: imx: Add wake functionality to GPIO Dinh.Nguyen at freescale.com
2010-10-15 20:18 ` [PATCH 2/2] ARM: imx: Add POWER_KEY to mx51 babbage board Dinh.Nguyen at freescale.com
2010-10-15 21:09 ` Eric Bénard
2010-10-15 20:23 ` [PATCH 1/2] ARM: imx: Add wake functionality to GPIO Russell King - ARM Linux
2010-10-16 18:49 ` Baruch Siach
2010-10-18 7:42 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).