diff options
| author | Russell Robinson Jr <rrobinson@phytec.com> | 2012-12-17 11:38:33 -0800 |
|---|---|---|
| committer | Russell Robinson Jr <rrobinson@phytec.com> | 2012-12-19 15:22:47 -0800 |
| commit | 15f55e0b22f8953b56fb5d6bdf8b770228f2f449 (patch) | |
| tree | a7ac5cc13b1827d0be55f189947597a4fa3570fd /arch/arm/plat-mxc/include | |
| parent | 2d2f46802d5da6cee95d00ac8d3650aa55534a91 (diff) | |
pcm052: enable EEPROM driver in config, fix TSC IRQsPD13.0.0alpha3.0-pcm052-ts1
Signed-off-by: Russell Robinson Jr <rrobinson@phytec.com>
Diffstat (limited to 'arch/arm/plat-mxc/include')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mvf.h | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/irqs.h | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h index fbc0571f8b9f..a838e0bbead9 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h @@ -356,8 +356,8 @@ typedef enum iomux_config { /* Touch Screen */ #define MVF600_PAD32_PTB10_TS_IRQ \ - IOMUX_PAD(0x0080, 0x0080, 0, 0x0000, 0, \ - MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE) + IOMUX_PAD(0x0080, 0x0080, 0, 0x0000, 0, \ + PAD_CTL_SPEED_MED | PAD_CTL_IBE_ENABLE) /*QSPI*/ #define MVF600_PAD79_PTD0_QSPI0_A_SCK \ diff --git a/arch/arm/plat-mxc/include/mach/irqs.h b/arch/arm/plat-mxc/include/mach/irqs.h index 9fce85784a32..4edd8d91c57d 100644 --- a/arch/arm/plat-mxc/include/mach/irqs.h +++ b/arch/arm/plat-mxc/include/mach/irqs.h @@ -74,7 +74,14 @@ #define MX5_IPU_IRQS 0 #endif +#ifdef CONFIG_MACH_PCM052 +#define STMPE_IRQ_BASE (MXC_IPU_IRQ_START) +#define STMPE_MAX_GPIOS 24 +#define STMPE_IRQ_END (STMPE_IRQ_BASE + STMPE_MAX_GPIOS) +#define NR_IRQS (STMPE_IRQ_END) +#else #define NR_IRQS (MXC_IPU_IRQ_START + MX3_IPU_IRQS + MX5_IPU_IRQS) +#endif extern int imx_irq_set_priority(unsigned char irq, unsigned char prio); |