diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-11-04 17:39:41 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-04 17:39:41 -0700 |
| commit | 2cbb6160b56038aad0ce0b05bed7a75d6f086171 (patch) | |
| tree | 1dc4e18bf1d88315eb8bcf8ef5826dbdddb286e3 /arch/arm/mach-omap2/include | |
| parent | 8f86f36284547fdd873769a5f190549f3ab69cca (diff) | |
| parent | 7e89098cd63a188932043258d54688e965750e2c (diff) | |
| download | talos-op-linux-2cbb6160b56038aad0ce0b05bed7a75d6f086171.tar.gz talos-op-linux-2cbb6160b56038aad0ce0b05bed7a75d6f086171.zip | |
Merge branch 'prcm_scm_misc_fixes_3.2' of git://git.pwsan.com/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-omap2/include')
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h index c88420de1151..1e2d3322f33e 100644 --- a/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h +++ b/arch/arm/mach-omap2/include/mach/ctrl_module_pad_core_44xx.h @@ -941,10 +941,10 @@ #define OMAP4_DSI2_LANEENABLE_MASK (0x7 << 29) #define OMAP4_DSI1_LANEENABLE_SHIFT 24 #define OMAP4_DSI1_LANEENABLE_MASK (0x1f << 24) -#define OMAP4_DSI1_PIPD_SHIFT 19 -#define OMAP4_DSI1_PIPD_MASK (0x1f << 19) -#define OMAP4_DSI2_PIPD_SHIFT 14 -#define OMAP4_DSI2_PIPD_MASK (0x1f << 14) +#define OMAP4_DSI2_PIPD_SHIFT 19 +#define OMAP4_DSI2_PIPD_MASK (0x1f << 19) +#define OMAP4_DSI1_PIPD_SHIFT 14 +#define OMAP4_DSI1_PIPD_MASK (0x1f << 14) /* CONTROL_MCBSPLP */ #define OMAP4_ALBCTRLRX_FSX_SHIFT 31 |
