* [PATCHv3 1/2] ARM: imx: Add gpio-keys to mx51 babbage board
@ 2010-10-19 18:39 Dinh.Nguyen at freescale.com
2010-10-19 18:39 ` [PATCHv3 2/2] ARM: imx: Add wake functionality to GPIO Dinh.Nguyen at freescale.com
2010-10-20 8:55 ` [PATCHv3 1/2] ARM: imx: Add gpio-keys to mx51 babbage board Uwe Kleine-König
0 siblings, 2 replies; 4+ messages in thread
From: Dinh.Nguyen at freescale.com @ 2010-10-19 18:39 UTC (permalink / raw)
To: linux-arm-kernel
From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Add functionality for the power button on MX51 Babbage board.
This patch is based on Sascha Hauer's imx/linux-2.6 for-rmk tree.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
---
arch/arm/configs/mx51_defconfig | 1 +
arch/arm/mach-mx5/board-mx51_babbage.c | 35 +++++++++++++++++++++++++++
arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2 +-
3 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig
index 163cfee..5c7a872 100644
--- a/arch/arm/configs/mx51_defconfig
+++ b/arch/arm/configs/mx51_defconfig
@@ -82,6 +82,7 @@ CONFIG_FEC=y
CONFIG_INPUT_FF_MEMLESS=m
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
CONFIG_INPUT_EVBUG=m
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
index 23ee4a4..20e9d13 100644
--- a/arch/arm/mach-mx5/board-mx51_babbage.c
+++ b/arch/arm/mach-mx5/board-mx51_babbage.c
@@ -18,6 +18,8 @@
#include <linux/io.h>
#include <linux/fsl_devices.h>
#include <linux/fec.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
#include <mach/common.h>
#include <mach/hardware.h>
@@ -37,6 +39,7 @@
#define BABBAGE_USBH1_STP (0*32 + 27) /* GPIO_1_27 */
#define BABBAGE_PHY_RESET (1*32 + 5) /* GPIO_2_5 */
#define BABBAGE_FEC_PHY_RESET (1*32 + 14) /* GPIO_2_14 */
+#define BABBAGE_POWER_KEY (1*32 + 21) /* GPIO_2_21 */
/* USB_CTRL_1 */
#define MX51_USB_CTRL_1_OFFSET 0x10
@@ -46,6 +49,34 @@
#define MX51_USB_PLL_DIV_19_2_MHZ 0x01
#define MX51_USB_PLL_DIV_24_MHZ 0x02
+static struct gpio_keys_button babbage_buttons[] = {
+ {
+ .gpio = BABBAGE_POWER_KEY,
+ .code = BTN_0,
+ .desc = "PWR",
+ .active_low = 1,
+ .wakeup = 1,
+ },
+};
+
+static struct gpio_keys_platform_data babbage_button_data = {
+ .buttons = babbage_buttons,
+ .nbuttons = ARRAY_SIZE(babbage_buttons),
+};
+
+static struct platform_device babbage_button_device = {
+ .name = "gpio-keys",
+ .id = -1,
+ .num_resources = 0,
+ .dev = {
+ .platform_data = &babbage_button_data,
+ }
+};
+
+static struct platform_device *platform_devices[] __initdata = {
+ &babbage_button_device,
+};
+
static struct pad_desc mx51babbage_pads[] = {
/* UART1 */
MX51_PAD_UART1_RXD__UART1_RXD,
@@ -112,6 +143,9 @@ static struct pad_desc mx51babbage_pads[] = {
/* FEC PHY reset line */
MX51_PAD_EIM_A20__GPIO_2_14,
+
+ /* Power Key */
+ MX51_PAD_EIM_A27__GPIO_2_21,
};
/* Serial ports */
@@ -285,6 +319,7 @@ static void __init mxc_board_init(void)
mxc_iomux_v3_setup_multiple_pads(mx51babbage_pads,
ARRAY_SIZE(mx51babbage_pads));
mxc_init_imx_uart();
+ platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
babbage_fec_reset();
imx51_add_fec(NULL);
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx51.h b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
index e46b1c2..2699262 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mx51.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
@@ -114,7 +114,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] 4+ messages in thread
* [PATCHv3 2/2] ARM: imx: Add wake functionality to GPIO
2010-10-19 18:39 [PATCHv3 1/2] ARM: imx: Add gpio-keys to mx51 babbage board Dinh.Nguyen at freescale.com
@ 2010-10-19 18:39 ` Dinh.Nguyen at freescale.com
2010-10-19 18:59 ` Uwe Kleine-König
2010-10-20 8:55 ` [PATCHv3 1/2] ARM: imx: Add gpio-keys to mx51 babbage board Uwe Kleine-König
1 sibling, 1 reply; 4+ messages in thread
From: Dinh.Nguyen at freescale.com @ 2010-10-19 18:39 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.
This patch is based on Sascha Hauer's imx/linux-2.6 for-rmk tree.
Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
---
arch/arm/plat-mxc/gpio.c | 34 +++++++++++++++++++++++++++++++++
arch/arm/plat-mxc/include/mach/gpio.h | 1 +
2 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
index 9d38da0..e52c658 100644
--- a/arch/arm/plat-mxc/gpio.c
+++ b/arch/arm/plat-mxc/gpio.c
@@ -20,6 +20,7 @@
*/
#include <linux/init.h>
+#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/gpio.h>
@@ -201,11 +202,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..133150e 100644
--- a/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@ -39,6 +39,7 @@ struct mxc_gpio_port {
struct gpio_chip chip;
u32 both_edges;
spinlock_t lock;
+ u32 suspend_wakeup;
};
int mxc_gpio_init(struct mxc_gpio_port*, int);
--
1.6.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCHv3 2/2] ARM: imx: Add wake functionality to GPIO
2010-10-19 18:39 ` [PATCHv3 2/2] ARM: imx: Add wake functionality to GPIO Dinh.Nguyen at freescale.com
@ 2010-10-19 18:59 ` Uwe Kleine-König
0 siblings, 0 replies; 4+ messages in thread
From: Uwe Kleine-König @ 2010-10-19 18:59 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 19, 2010 at 01:39:52PM -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.
>
> This patch is based on Sascha Hauer's imx/linux-2.6 for-rmk tree.
>
> Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> ---
> arch/arm/plat-mxc/gpio.c | 34 +++++++++++++++++++++++++++++++++
> arch/arm/plat-mxc/include/mach/gpio.h | 1 +
> 2 files changed, 35 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-mxc/gpio.c b/arch/arm/plat-mxc/gpio.c
> index 9d38da0..e52c658 100644
> --- a/arch/arm/plat-mxc/gpio.c
> +++ b/arch/arm/plat-mxc/gpio.c
> @@ -20,6 +20,7 @@
> */
>
> #include <linux/init.h>
> +#include <linux/interrupt.h>
> #include <linux/io.h>
> #include <linux/irq.h>
> #include <linux/gpio.h>
> @@ -201,11 +202,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..133150e 100644
> --- a/arch/arm/plat-mxc/include/mach/gpio.h
> +++ b/arch/arm/plat-mxc/include/mach/gpio.h
> @@ -39,6 +39,7 @@ struct mxc_gpio_port {
> struct gpio_chip chip;
> u32 both_edges;
> spinlock_t lock;
> + u32 suspend_wakeup;
This seems to be a write-only variable. What is the intended purpose?
Is this really enough to let the system wake from suspend?
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCHv3 1/2] ARM: imx: Add gpio-keys to mx51 babbage board
2010-10-19 18:39 [PATCHv3 1/2] ARM: imx: Add gpio-keys to mx51 babbage board Dinh.Nguyen at freescale.com
2010-10-19 18:39 ` [PATCHv3 2/2] ARM: imx: Add wake functionality to GPIO Dinh.Nguyen at freescale.com
@ 2010-10-20 8:55 ` Uwe Kleine-König
1 sibling, 0 replies; 4+ messages in thread
From: Uwe Kleine-König @ 2010-10-20 8:55 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 19, 2010 at 01:39:51PM -0500, Dinh.Nguyen at freescale.com wrote:
> From: Dinh Nguyen <Dinh.Nguyen@freescale.com>
>
> Add functionality for the power button on MX51 Babbage board.
>
> This patch is based on Sascha Hauer's imx/linux-2.6 for-rmk tree.
>
> Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> ---
> arch/arm/configs/mx51_defconfig | 1 +
> arch/arm/mach-mx5/board-mx51_babbage.c | 35 +++++++++++++++++++++++++++
> arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2 +-
> 3 files changed, 37 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/configs/mx51_defconfig b/arch/arm/configs/mx51_defconfig
> index 163cfee..5c7a872 100644
> --- a/arch/arm/configs/mx51_defconfig
> +++ b/arch/arm/configs/mx51_defconfig
> @@ -82,6 +82,7 @@ CONFIG_FEC=y
> CONFIG_INPUT_FF_MEMLESS=m
> # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
> CONFIG_INPUT_EVDEV=y
> +CONFIG_KEYBOARD_GPIO=y
> CONFIG_INPUT_EVBUG=m
> CONFIG_MOUSE_PS2=m
> CONFIG_MOUSE_PS2_ELANTECH=y
> diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c
> index 23ee4a4..20e9d13 100644
> --- a/arch/arm/mach-mx5/board-mx51_babbage.c
> +++ b/arch/arm/mach-mx5/board-mx51_babbage.c
> @@ -18,6 +18,8 @@
> #include <linux/io.h>
> #include <linux/fsl_devices.h>
> #include <linux/fec.h>
> +#include <linux/gpio_keys.h>
> +#include <linux/input.h>
>
> #include <mach/common.h>
> #include <mach/hardware.h>
> @@ -37,6 +39,7 @@
> #define BABBAGE_USBH1_STP (0*32 + 27) /* GPIO_1_27 */
> #define BABBAGE_PHY_RESET (1*32 + 5) /* GPIO_2_5 */
> #define BABBAGE_FEC_PHY_RESET (1*32 + 14) /* GPIO_2_14 */
> +#define BABBAGE_POWER_KEY (1*32 + 21) /* GPIO_2_21 */
>
> /* USB_CTRL_1 */
> #define MX51_USB_CTRL_1_OFFSET 0x10
> @@ -46,6 +49,34 @@
> #define MX51_USB_PLL_DIV_19_2_MHZ 0x01
> #define MX51_USB_PLL_DIV_24_MHZ 0x02
>
> +static struct gpio_keys_button babbage_buttons[] = {
> + {
> + .gpio = BABBAGE_POWER_KEY,
> + .code = BTN_0,
> + .desc = "PWR",
> + .active_low = 1,
> + .wakeup = 1,
> + },
> +};
> +
> +static struct gpio_keys_platform_data babbage_button_data = {
> + .buttons = babbage_buttons,
> + .nbuttons = ARRAY_SIZE(babbage_buttons),
> +};
> +
> +static struct platform_device babbage_button_device = {
> + .name = "gpio-keys",
> + .id = -1,
> + .num_resources = 0,
> + .dev = {
> + .platform_data = &babbage_button_data,
> + }
> +};
> +
> +static struct platform_device *platform_devices[] __initdata = {
> + &babbage_button_device,
> +};
> +
> static struct pad_desc mx51babbage_pads[] = {
> /* UART1 */
> MX51_PAD_UART1_RXD__UART1_RXD,
> @@ -112,6 +143,9 @@ static struct pad_desc mx51babbage_pads[] = {
>
> /* FEC PHY reset line */
> MX51_PAD_EIM_A20__GPIO_2_14,
> +
> + /* Power Key */
> + MX51_PAD_EIM_A27__GPIO_2_21,
> };
>
> /* Serial ports */
> @@ -285,6 +319,7 @@ static void __init mxc_board_init(void)
> mxc_iomux_v3_setup_multiple_pads(mx51babbage_pads,
> ARRAY_SIZE(mx51babbage_pads));
> mxc_init_imx_uart();
> + platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
would you mind to rework that to a function ? la imx_add_fec?
> babbage_fec_reset();
> imx51_add_fec(NULL);
>
> diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx51.h b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
> index e46b1c2..2699262 100644
> --- a/arch/arm/plat-mxc/include/mach/iomux-mx51.h
> +++ b/arch/arm/plat-mxc/include/mach/iomux-mx51.h
> @@ -114,7 +114,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)
MX51_I2C_PAD_CTRL looks wrong here. IIRC I already asked about this.
> #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
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-10-20 8:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-19 18:39 [PATCHv3 1/2] ARM: imx: Add gpio-keys to mx51 babbage board Dinh.Nguyen at freescale.com
2010-10-19 18:39 ` [PATCHv3 2/2] ARM: imx: Add wake functionality to GPIO Dinh.Nguyen at freescale.com
2010-10-19 18:59 ` Uwe Kleine-König
2010-10-20 8:55 ` [PATCHv3 1/2] ARM: imx: Add gpio-keys to mx51 babbage board Uwe Kleine-König
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).