summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc/include/mach/iomux-mvf.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/iomux-mvf.h')
-rw-r--r--arch/arm/plat-mxc/include/mach/iomux-mvf.h85
1 files changed, 41 insertions, 44 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h
index b9ba094fbd7a..8454a0f20b14 100644
--- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h
@@ -132,16 +132,16 @@ typedef enum iomux_config {
/* DSPI1 */
#define MVF600_PAD84_PTD5__DSPI1_PCS0 \
- IOMUX_PAD(0x0150, 0x0150, 3, 0x0000, 0, \
+ IOMUX_PAD(0x0150, 0x0150, 3, 0x0300, 1, \
MVF600_DSPI_PAD_CTRL | PAD_CTL_OBE_ENABLE)
#define MVF600_PAD85_PTD6__DSPI1_SIN \
- IOMUX_PAD(0x0154, 0x0154, 3, 0x0000, 0, \
+ IOMUX_PAD(0x0154, 0x0154, 3, 0x02FC, 1, \
MVF600_DSPI_PAD_CTRL | PAD_CTL_IBE_ENABLE)
#define MVF600_PAD86_PTD7__DSPI1_SOUT \
IOMUX_PAD(0x0158, 0x0158, 3, 0x0000, 0, \
MVF600_DSPI_PAD_CTRL | PAD_CTL_OBE_ENABLE)
#define MVF600_PAD87_PTD8__DSPI1_SCK \
- IOMUX_PAD(0x015C, 0x015C, 3, 0x0000, 0, \
+ IOMUX_PAD(0x015C, 0x015C, 3, 0x02F8, 1, \
MVF600_DSPI_PAD_CTRL | PAD_CTL_OBE_ENABLE)
/*FEC0*/
@@ -149,7 +149,7 @@ typedef enum iomux_config {
IOMUX_PAD(0x0000, 0x0000, 2, 0x02F0, 0, \
MVF600_ENET_PAD_CTRL | PAD_CTL_IBE_ENABLE)
#define MVF600_PAD0_PTA6__RMII_CLKOUT \
- IOMUX_PAD(0x0000, 0x0000, 1, 0x02F0, 0, \
+ IOMUX_PAD(0x0000, 0x0000, 1, 0x0000, 0, \
MVF600_ENET_PAD_CTRL | PAD_CTL_IBE_ENABLE)
#define MVF600_PAD45_PTC0__RMII0_MDC \
IOMUX_PAD(0x00B4, 0x00B4, 1, 0x0000, 0, \
@@ -255,7 +255,7 @@ typedef enum iomux_config {
/*SAI2*/
#define MVF600_PAD5_PTA12_EXT_AUDIO_MCLK \
- IOMUX_PAD(0x0014, 0x0014, 2, 0x02ec, 2, \
+ IOMUX_PAD(0x0014, 0x0014, 2, 0x02ec, 1, \
MVF600_SAI_PAD_CTRL | PAD_CTL_IBE_ENABLE)
#define MVF600_PAD6_PTA16_SAI2_TX_BCLK \
IOMUX_PAD(0x0018, 0x0018, 5, 0x0370, 0, \
@@ -365,16 +365,16 @@ typedef enum iomux_config {
/* UART2 */
#define MVF600_PAD79_PTD0_UART2_TX \
- IOMUX_PAD(0x013C, 0x013C, 2, 0x0000, 0, \
+ IOMUX_PAD(0x013C, 0x013C, 2, 0x038C, 2, \
MVF600_UART_PAD_CTRL | PAD_CTL_OBE_ENABLE)
#define MVF600_PAD80_PTD1_UART2_RX \
- IOMUX_PAD(0x0140, 0x0140, 2, 0x0000, 0, \
+ IOMUX_PAD(0x0140, 0x0140, 2, 0x0388, 2, \
MVF600_UART_PAD_CTRL | PAD_CTL_IBE_ENABLE)
#define MVF600_PAD81_PTD2_UART2_RTS \
IOMUX_PAD(0x0144, 0x0144, 2, 0x0000, 0, \
MVF600_UART_PAD_CTRL | PAD_CTL_OBE_ENABLE)
#define MVF600_PAD82_PTD3_UART2_CTS \
- IOMUX_PAD(0x0148, 0x0148, 2, 0x0000, 0, \
+ IOMUX_PAD(0x0148, 0x0148, 2, 0x0384, 1, \
MVF600_UART_PAD_CTRL | PAD_CTL_IBE_ENABLE)
/* FlexTimer channel pin */
@@ -397,49 +397,46 @@ typedef enum iomux_config {
IOMUX_PAD(0x007C, 0x007C, 1, 0x0330, 0, MVF600_FTM1_CH_CTRL)
/* Touch Screen */
-#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)
+#define MVF600_PAD4_PTA11 \
+ IOMUX_PAD(0x0010, 0x0010, 0, 0x0, 0, \
+ MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+#define MVF600_PAD5_PTA12 \
+ IOMUX_PAD(0x0014, 0x0014, 0, 0x0, 0, \
+ MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+#define MVF600_PAD6_PTA16_ADC1_SE0 \
+ IOMUX_PAD(0x0018, 0x0018, 3, 0x0, 0, \
+ MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD8_PTA18_ADC0_SE0 \
+ IOMUX_PAD(0x0020, 0x0020, 2, 0x0, 0, \
+ MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD9_PTA19_ADC0_SE1 \
+ IOMUX_PAD(0x0024, 0x0024, 2, 0x0, 0, \
+ MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD12_PTA22 \
+ IOMUX_PAD(0x0030, 0x0030, 0, 0x0, 0, \
+ MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+#define MVF600_PAD13_PTA23 \
+ IOMUX_PAD(0x0034, 0x0034, 0, 0x0, 0, \
+ MVF600_TS_PAD_CTRL | PAD_CTL_OBE_ENABLE)
+#define MVF600_PAD24_PTB2_ADC1_SE2 \
+ IOMUX_PAD(0x0060, 0x0060, 2, 0x0, 0, \
+ MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
/*Touchscreen touch detection*/
-#define MVF600_PAD8_PTA18 \
- IOMUX_PAD(0x0020, 0x0020, 0, 0x0370, 0, \
- MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
-#define MVF600_PAD9_PTA19 \
- IOMUX_PAD(0x0024, 0x0024, 0, 0x0370, 0, \
- MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE)
-
#define MVF600_PAD4_PTA11_WM9715L_PENDOWN \
- IOMUX_PAD(0x0010, 0x0010, 0, 0x0000, 0, \
+ IOMUX_PAD(0x0010, 0x0010, 0, 0x0000, 0, \
+ MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD8_PTA18 \
+ IOMUX_PAD(0x0020, 0x0020, 0, 0x0, 0, \
+ MVF600_TS_PAD_CTRL | PAD_CTL_IBE_ENABLE)
+#define MVF600_PAD9_PTA19 \
+ IOMUX_PAD(0x0024, 0x0024, 0, 0x0, 0, \
MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE)
#define MVF600_PAD21_PTA31_TS_IRQ \
- IOMUX_PAD(0x0054, 0x0054, 0, 0x0000, 0, \
+ IOMUX_PAD(0x0054, 0x0054, 0, 0x0000, 0, \
MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE)
#define MVF600_PAD24_PTB2_WM9715L_GENIRQ \
- IOMUX_PAD(0x0060, 0x0060, 0, 0x0000, 0, \
+ IOMUX_PAD(0x0060, 0x0060, 0, 0x0000, 0, \
MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE)
/*QSPI*/
generated by cgit v1.2.3 (git 2.0.4) at 2024-05-14 23:57:45 +0000