diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2013-09-18 09:18:45 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2013-09-24 17:33:10 +0200 |
| commit | 276150cb7506b2fada8c249f78b9966cc77b91f2 (patch) | |
| tree | e6746da32e74510c493378d21302e27f59fa7028 /arch | |
| parent | 612aa4fef759ad526ca666af768b175161682866 (diff) | |
colibri_vf50: Added pinmux for touchscreen support on Colibri VF50
Touchscreen will be supported through ADC and some GPIOs. This
change adds proper pinmux, no driver support yet.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvf/board-colibri_vf50.c | 13 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mvf.h | 32 |
2 files changed, 44 insertions, 1 deletions
diff --git a/arch/arm/mach-mvf/board-colibri_vf50.c b/arch/arm/mach-mvf/board-colibri_vf50.c index fe1d7912eea0..6231b36143be 100644 --- a/arch/arm/mach-mvf/board-colibri_vf50.c +++ b/arch/arm/mach-mvf/board-colibri_vf50.c @@ -127,13 +127,24 @@ static iomux_v3_cfg_t mvf600_pads[] = { #endif /* SAI2: AC97 */ +#if 0 // Those pins are disabled on Colibri VP50 since touchscreen uses them... MVF600_PAD6_PTA16_SAI2_TX_BCLK, MVF600_PAD8_PTA18_SAI2_TX_DATA, MVF600_PAD9_PTA19_SAI2_TX_SYNC, MVF600_PAD12_PTA22_SAI2_RX_DATA, MVF600_PAD13_PTA23_SAI2_RX_SYNC, // MVF600_PAD5_PTA12_EXT_AUDIO_MCLK, -//MVF600_PAD24_PTB2 WM9715L GENIRQ +// MVF600_PAD24_PTB2 WM9715L GENIRQ +#endif + /* Touchscreen */ + MVF600_PAD4_PTA11, + MVF600_PAD5_PTA12, + MVF600_PAD6_PTA16_ADC1_SE0, + MVF600_PAD24_PTB2_ADC1_SE2, + MVF600_PAD8_PTA18_ADC0_SE0, + MVF600_PAD9_PTA19_ADC0_SE1, + MVF600_PAD12_PTA22, + MVF600_PAD13_PTA23, /* DCU0: Display */ MVF600_PAD105_PTE0_DCU0_HSYNC, diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h index 71c677ae3595..3d69c7c7ef7b 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h @@ -52,6 +52,8 @@ typedef enum iomux_config { #define MVF600_SAI_PAD_CTRL (PAD_CTL_DSE_50ohm | PAD_CTL_HYS | \ PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP) +#define MVF600_TS_PAD_CTRL (PAD_CTL_DSE_150ohm) + #define MVF600_ESAI_PAD_CTRL (PAD_CTL_DSE_50ohm | PAD_CTL_HYS | \ PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP) @@ -250,6 +252,36 @@ typedef enum iomux_config { IOMUX_PAD(0x00A0, 0x00A0, 2, 0x02ec, 2, \ MVF600_SAI_PAD_CTRL | PAD_CTL_IBE_ENABLE) +/*Touchscreen*/ +#define MVF600_PAD4_PTA11 \ + IOMUX_PAD(0x0010, 0x0010, 0, 0x0370, 0, \ + MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE) +#define MVF600_PAD5_PTA12 \ + IOMUX_PAD(0x0014, 0x0014, 0, 0x0370, 0, \ + MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE) + +#define MVF600_PAD6_PTA16_ADC1_SE0 \ + IOMUX_PAD(0x0018, 0x0018, 3, 0x0370, 0, \ + MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE) +#define MVF600_PAD24_PTB2_ADC1_SE2 \ + IOMUX_PAD(0x0060, 0x0060, 2, 0x0370, 0, \ + MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE) +#define MVF600_PAD8_PTA18_ADC0_SE0 \ + IOMUX_PAD(0x0020, 0x0020, 2, 0x0370, 0, \ + MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE) +#define MVF600_PAD9_PTA19_ADC0_SE1 \ + IOMUX_PAD(0x0024, 0x0024, 2, 0x0370, 0, \ + MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE) + +#define MVF600_PAD12_PTA22 \ + IOMUX_PAD(0x0030, 0x0030, 0, 0x0370, 0, \ + MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE) +#define MVF600_PAD13_PTA23 \ + IOMUX_PAD(0x0034, 0x0034, 0, 0x0370, 0, \ + MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE) + + + /*DCU0*/ #define MVF600_PAD30_PTB8_LCD_ENABLE \ IOMUX_PAD(0x78, 0x78, 0, 0x0000, 0, MVF600_DCU_PAD_CTRL) |