diff options
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/iomux-mvf.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mvf.h | 18 |
1 files changed, 16 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 500f78b0d0be..4022ee0469bc 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h @@ -50,6 +50,9 @@ typedef enum iomux_config { #define MVF600_I2C_PAD_CTRL (PAD_CTL_DSE_37ohm | PAD_CTL_ODE | \ PAD_CTL_SPEED_HIGH) +#define MVF600_CAN_PAD_CTRL (PAD_CTL_SPEED_HIGH | PAD_CTL_DSE_20ohm | \ + PAD_CTL_PUS_22K_UP) + #define MVF600_SAI_PAD_CTRL (PAD_CTL_DSE_50ohm | PAD_CTL_HYS | \ PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP) @@ -118,6 +121,15 @@ typedef enum iomux_config { IOMUX_PAD(0x0094, 0x0094, 2, 0x0340, 1, \ MVF600_I2C_PAD_CTRL | PAD_CTL_OBE_IBE_ENABLE) +/*CAN0 (alternative to I2C0)*/ +#define MVF600_PAD36_PTB14__CAN0_RX \ + IOMUX_PAD(0x0090, 0x0090, 1, 0x0000, 0, \ + MVF600_CAN_PAD_CTRL | PAD_CTL_IBE_ENABLE) +#define MVF600_PAD37_PTB15__CAN0_TX \ + IOMUX_PAD(0x0094, 0x0094, 1, 0x0000, 0, \ + MVF600_CAN_PAD_CTRL | PAD_CTL_OBE_ENABLE) + + /*SW1*/ #define MVF600_PAD38_PTB16_USER_BTN1 \ IOMUX_PAD(0x0098, 0x0098, 0, 0x0000, 0, \ @@ -125,9 +137,11 @@ typedef enum iomux_config { /*CAN1*/ #define MVF600_PAD38_PTB16__CAN1_RX \ - IOMUX_PAD(0x0098, 0x0098, 1, 0x0000, 0, 0) + IOMUX_PAD(0x0098, 0x0098, 1, 0x0000, 0, \ + MVF600_CAN_PAD_CTRL | PAD_CTL_IBE_ENABLE) #define MVF600_PAD39_PTB17__CAN1_TX \ - IOMUX_PAD(0x009C, 0x009C, 1, 0x0000, 0, 0) + IOMUX_PAD(0x009C, 0x009C, 1, 0x0000, 0, \ + MVF600_CAN_PAD_CTRL | PAD_CTL_OBE_ENABLE) /*DSPI0*/ #define MVF600_PAD41_PTB19__DSPI0_PCS0 \ |