aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-08-10 18:02:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 08:59:10 -0700
commit50a5503a9208420e6c59d24504a5e9913d603cf7 (patch)
tree3d1e5c3cc1ab5f1a499695803163204483b382a7 /arch/arm/plat-samsung/include/plat/regs-fb-v4.h
parents3c-fb: only init window colour key controls for windows with blending (diff)
downloadlinux-dev-50a5503a9208420e6c59d24504a5e9913d603cf7.tar.xz
linux-dev-50a5503a9208420e6c59d24504a5e9913d603cf7.zip
s3c-fb: initial move to unifying the header files
Remove the various header files that configure this driver and use the platform device name to select the correct configuration at probe time. Currently this does not remove the header files, only updates the driver and the relevant platform files. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Pawel Osciak <p.osciak@samsung.com> Cc: InKi Dae <inki.dae@samsung.com> Cc: KyungMin Park <kyungmin.park.samsung.com> Cc: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/regs-fb-v4.h')
-rw-r--r--arch/arm/plat-samsung/include/plat/regs-fb-v4.h36
1 files changed, 0 insertions, 36 deletions
diff --git a/arch/arm/plat-samsung/include/plat/regs-fb-v4.h b/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
index 0f43599248ad..0477e8aaf3dd 100644
--- a/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+++ b/arch/arm/plat-samsung/include/plat/regs-fb-v4.h
@@ -148,42 +148,6 @@
* compiled.
*/
-/* return true if window _win has OSD register D */
-#define s3c_fb_has_osd_d(_win) ((_win) != 4 && (_win) != 0)
-
-static inline unsigned int s3c_fb_win_pal_size(unsigned int win)
-{
- if (win < 2)
- return 256;
- if (win < 4)
- return 16;
- if (win == 4)
- return 4;
-
- BUG(); /* shouldn't get here */
-}
-
-static inline int s3c_fb_validate_win_bpp(unsigned int win, unsigned int bpp)
-{
- /* all windows can do 1/2 bpp */
-
- if ((bpp == 25 || bpp == 19) && win == 0)
- return 0; /* win 0 does not have 19 or 25bpp modes */
-
- if (bpp == 4 && win == 4)
- return 0;
-
- if (bpp == 8 && (win >= 3))
- return 0; /* win 3/4 cannot do 8bpp in any mode */
-
- return 1;
-}
-
-static inline int s3c_fb_pal_is16(unsigned int window)
-{
- return window > 1;
-}
-
struct s3c_fb_palette {
struct fb_bitfield r;
struct fb_bitfield g;