diff options
| author | Justin Waters <justin.waters@timesys.com> | 2013-03-29 13:08:55 -0400 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2013-03-29 13:08:55 -0400 |
| commit | 21ceb093d796e94500502eee94a8cd5fcc76f619 (patch) | |
| tree | 8f3255c05b10b382a361e1eca47794b3485c2572 /arch/arm/plat-mxc/include | |
| parent | f962cbcefdfad22ffff41e19ad4c5ff58815c05c (diff) | |
| parent | fcbe1245c34fa407ff20d6afd2f975e8f961a17b (diff) | |
Merge branch '3.0-pcm052' of ssh://github.com/tsfs/Vybrid-Linux into 3.0-pcm0523.0-pcm052-ts2.1
Diffstat (limited to 'arch/arm/plat-mxc/include')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mvf.h | 6 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mvf.h | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h index eb093e2c0f7f..bde7e316433a 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h @@ -258,9 +258,9 @@ typedef enum iomux_config { #define MVF600_PAD40_PTB18_EXT_AUDIO_MCLK \ IOMUX_PAD(0x00A0, 0x00A0, 2, 0x02ec, 2, \ MVF600_SAI_PAD_CTRL | PAD_CTL_IBE_ENABLE) -#define MVF600_PAD33_PTB11__CKO2 \ - IOMUX_PAD(0x0084, 0x0084, 6, 0x24038, 0x040D, \ - MVF600_SAI_PAD_CTRL | PAD_CTL_IBE_ENABLE) +#define MVF600_PAD33_PTB11__CKO2 \ + IOMUX_PAD(0x0084, 0x0084, 6, 0x0000, 0, \ + MVF600_SAI_PAD_CTRL | PAD_CTL_OBE_ENABLE) /*DCU0*/ #define MVF600_PAD25_PTB3_LCD_ENABLE \ diff --git a/arch/arm/plat-mxc/include/mach/mvf.h b/arch/arm/plat-mxc/include/mach/mvf.h index 4a47636fa741..fb0e5eb69704 100644 --- a/arch/arm/plat-mxc/include/mach/mvf.h +++ b/arch/arm/plat-mxc/include/mach/mvf.h @@ -124,6 +124,7 @@ #define MVF_DMA0TCD_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00019000) #define MVF_SEMA4_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x0001D000) #define MVF_FLEXBUS_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x0001E000) +#define MVF_I2S0_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00020000) #define MVF_FLEXCAN0_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00021000) #define MVF_DMAMUX0_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00024000) #define MVF_DMAMUX1_BASE_ADDR (MVF_AIPS0_BASE_ADDR + 0x00025000) |