diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 20:38:49 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-03-21 20:38:49 +0400 |
| commit | a4ba740d4179f95aa6c95ce7c935d3bf451c6381 (patch) | |
| tree | ea7322920030c516a4757a8f4d22eda2ddf6fc75 /include | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
| parent | 6a15075eced2d780fa6c5d83682410f47f2e800b (diff) | |
| download | linux-a4ba740d4179f95aa6c95ce7c935d3bf451c6381.tar.xz | |
Merge tag 'mxs-fixes-3.9-3' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes
From Shawn Guo <shawn.guo@linaro.org>:
The mxs fixes for 3.9, take 3:
- Fix the shifted framebuffer with X11 system
* tag 'mxs-fixes-3.9-3' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: video: mxs: Fix mxsfb misconfiguring VDCTRL0
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mxsfb.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/mxsfb.h b/include/linux/mxsfb.h index f14943d55315..f80af8674342 100644 --- a/include/linux/mxsfb.h +++ b/include/linux/mxsfb.h @@ -24,8 +24,8 @@ #define STMLCDIF_18BIT 2 /** pixel data bus to the display is of 18 bit width */ #define STMLCDIF_24BIT 3 /** pixel data bus to the display is of 24 bit width */ -#define FB_SYNC_DATA_ENABLE_HIGH_ACT (1 << 6) -#define FB_SYNC_DOTCLK_FAILING_ACT (1 << 7) /* failing/negtive edge sampling */ +#define MXSFB_SYNC_DATA_ENABLE_HIGH_ACT (1 << 6) +#define MXSFB_SYNC_DOTCLK_FAILING_ACT (1 << 7) /* failing/negtive edge sampling */ struct mxsfb_platform_data { struct fb_videomode *mode_list; @@ -44,6 +44,9 @@ struct mxsfb_platform_data { * allocated. If specified,fb_size must also be specified. * fb_phys must be unused by Linux. */ + u32 sync; /* sync mask, contains MXSFB specifics not + * carried in fb_info->var.sync + */ }; #endif /* __LINUX_MXSFB_H */ |