diff options
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/global_timer.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mvf.h | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/global_timer.c b/arch/arm/plat-mxc/global_timer.c index 607c861d2752..abbccb955af3 100644 --- a/arch/arm/plat-mxc/global_timer.c +++ b/arch/arm/plat-mxc/global_timer.c @@ -18,6 +18,7 @@ #include <linux/cpufreq.h> #include <linux/err.h> #include <linux/seq_file.h> +#include <linux/ftrace.h> #include <asm/sched_clock.h> #include <asm/hardware/gic.h> diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h index 1bbf8158051a..9978dc02f832 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h @@ -118,6 +118,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) @@ -413,6 +418,20 @@ typedef enum iomux_config { #define MVF600_PAD30_PTB8_INT \ IOMUX_PAD(0x0078, 0x0078, 0, 0x032C, 0, MVF600_FTM1_CH_CTRL) +#define MVF600_PAD28_PTB6_UART2_TX \ + IOMUX_PAD(0x0070, 0x0070, 7, 0x038C, 0, \ + MVF600_UART_PAD_CTRL | PAD_CTL_OBE_ENABLE) +#define MVF600_PAD29_PTB7_UART2_RX \ + IOMUX_PAD(0x0074, 0x0074, 7, 0x0388, 0, \ + MVF600_UART_PAD_CTRL | PAD_CTL_IBE_ENABLE) + +#define MVF600_PAD10_PTA20_UART3_TX \ + IOMUX_PAD(0x0028, 0x0028, 6, 0x0394, 0, \ + MVF600_UART_PAD_CTRL | PAD_CTL_OBE_ENABLE) +#define MVF600_PAD11_PTA21_UART3_RX \ + IOMUX_PAD(0x002C, 0x002C, 6, 0x0390, 0, \ + MVF600_UART_PAD_CTRL | PAD_CTL_IBE_ENABLE) + /* FlexTimer channel pin */ #define MVF600_PAD22_PTB0_FTM0CH0 \ IOMUX_PAD(0x0058, 0x0058, 1, 0x0000, 0, MVF600_FTM0_CH_CTRL) |