diff options
Diffstat (limited to 'arch/arm/plat-mxc')
| -rw-r--r-- | arch/arm/plat-mxc/devices/platform-mvf-dcu.c | 4 | ||||
| -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 |
3 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/devices/platform-mvf-dcu.c b/arch/arm/plat-mxc/devices/platform-mvf-dcu.c index 0fe5099eca34..15f6f0dbe24e 100644 --- a/arch/arm/plat-mxc/devices/platform-mvf-dcu.c +++ b/arch/arm/plat-mxc/devices/platform-mvf-dcu.c @@ -28,10 +28,10 @@ int __init mvf_dcu_init(int id) ret = gpio_request_one(DCU_LCD_ENABLE_PIN, GPIOF_OUT_INIT_LOW, "DCU"); if (ret) - printk(KERN_ERR "DCU: failed to request GPIO 30\n"); + printk(KERN_ERR "DCU: failed to request GPIO 25\n"); msleep(2); - gpio_set_value(DCU_LCD_ENABLE_PIN, 1); + gpio_set_value(DCU_LCD_ENABLE_PIN, 0); writel(0x20000000, MVF_IO_ADDRESS(MVF_TCON0_BASE_ADDR)); return ret; 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); |