diff options
| author | Anthony Felice <tony.felice@timesys.com> | 2013-12-16 17:59:25 -0500 |
|---|---|---|
| committer | Anthony Felice <tony.felice@timesys.com> | 2013-12-16 17:59:25 -0500 |
| commit | b4e9d7d49170e3c5f1f46371218159269c98f870 (patch) | |
| tree | 0f2c17e4f9636eee900952a958f0d3711f936ee9 | |
| parent | 24677c775298ad02af7825f2de7cf9adf31f7f8a (diff) | |
Allow SW1 on TWR-VF65GS10 to be a wake-up event for TWR-VF600
| -rw-r--r-- | arch/arm/mach-mvf/board-twr-vf700.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mvf.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-mvf/board-twr-vf700.c b/arch/arm/mach-mvf/board-twr-vf700.c index 5e5fec968711..7291face1c45 100644 --- a/arch/arm/mach-mvf/board-twr-vf700.c +++ b/arch/arm/mach-mvf/board-twr-vf700.c @@ -101,6 +101,8 @@ static iomux_v3_cfg_t mvf600_pads[] = { /*I2C0*/ MVF600_PAD36_PTB14__I2C0_SCL, MVF600_PAD37_PTB15__I2C0_SDA, + + MVF600_PAD38_PTB16_USER_BTN1, #if 0 /*CAN1*/ diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h index b1bbb0955010..64a46075943a 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h @@ -100,6 +100,11 @@ typedef enum iomux_config { IOMUX_PAD(0x0094, 0x0094, 2, 0x0340, 1, \ MVF600_I2C_PAD_CTRL | PAD_CTL_OBE_IBE_ENABLE) +/*SW1*/ +#define MVF600_PAD38_PTB16_USER_BTN1 \ + IOMUX_PAD(0x0098, 0x0098, 0, 0x0000, 0, \ + MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE) + /*CAN1*/ #define MVF600_PAD38_PTB16__CAN1_RX \ IOMUX_PAD(0x0098, 0x0098, 1, 0x0000, 0, 0) |