You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
[PATCH] m32r: framebuffer device support
This patch is for supporting Epson s1d13xxx framebuffer device for m32r. # Sorry, a little bigger. The Epson s1d13806 is already supported by 2.6.12 kernel, and its driver is placed as drivers/video/s1d13xxxfb.c. For the m32r, a header file include/asm-m32r/s1d13806.h was prepared for several m32r target platforms. It was originally generated by an Epson tool S1D13806CFG.EXE, and modified manually for the m32r platforms. Signed-off-by: Hayato Fujiwara <fujiwara@linux-m32r.org> Signed-off-by: Hirokazu Takata <takata@linux-m32r.org> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
e34ac862ee
commit
316240f66a
@@ -63,5 +63,10 @@ config LOGO_SUPERH_CLUT224
|
||||
depends on LOGO && SUPERH
|
||||
default y
|
||||
|
||||
config LOGO_M32R_CLUT224
|
||||
bool "224-color M32R Linux logo"
|
||||
depends on LOGO && M32R
|
||||
default y
|
||||
|
||||
endmenu
|
||||
|
||||
|
||||
@@ -12,6 +12,7 @@ obj-$(CONFIG_LOGO_SUN_CLUT224) += logo_sun_clut224.o
|
||||
obj-$(CONFIG_LOGO_SUPERH_MONO) += logo_superh_mono.o
|
||||
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
|
||||
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.o
|
||||
obj-$(CONFIG_LOGO_M32R_CLUT224) += logo_m32r_clut224.o
|
||||
|
||||
# How to generate logo's
|
||||
|
||||
|
||||
@@ -33,6 +33,7 @@ extern const struct linux_logo logo_sun_clut224;
|
||||
extern const struct linux_logo logo_superh_mono;
|
||||
extern const struct linux_logo logo_superh_vga16;
|
||||
extern const struct linux_logo logo_superh_clut224;
|
||||
extern const struct linux_logo logo_m32r_clut224;
|
||||
|
||||
|
||||
const struct linux_logo *fb_find_logo(int depth)
|
||||
@@ -96,6 +97,10 @@ const struct linux_logo *fb_find_logo(int depth)
|
||||
#ifdef CONFIG_LOGO_SUPERH_CLUT224
|
||||
/* SuperH Linux logo */
|
||||
logo = &logo_superh_clut224;
|
||||
#endif
|
||||
#ifdef CONFIG_LOGO_M32R_CLUT224
|
||||
/* M32R Linux logo */
|
||||
logo = &logo_m32r_clut224;
|
||||
#endif
|
||||
}
|
||||
return logo;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -67,12 +67,18 @@ static struct fb_fix_screeninfo __devinitdata s1d13xxxfb_fix = {
|
||||
static inline u8
|
||||
s1d13xxxfb_readreg(struct s1d13xxxfb_par *par, u16 regno)
|
||||
{
|
||||
#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3)
|
||||
regno=((regno & 1) ? (regno & ~1L) : (regno + 1));
|
||||
#endif
|
||||
return readb(par->regs + regno);
|
||||
}
|
||||
|
||||
static inline void
|
||||
s1d13xxxfb_writereg(struct s1d13xxxfb_par *par, u16 regno, u8 value)
|
||||
{
|
||||
#if defined(CONFIG_PLAT_M32700UT) || defined(CONFIG_PLAT_OPSPUT) || defined(CONFIG_PLAT_MAPPI3)
|
||||
regno=((regno & 1) ? (regno & ~1L) : (regno + 1));
|
||||
#endif
|
||||
writeb(value, par->regs + regno);
|
||||
}
|
||||
|
||||
@@ -259,7 +265,11 @@ s1d13xxxfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
|
||||
dbg("s1d13xxxfb_setcolreg: pseudo %d, val %08x\n",
|
||||
regno, pseudo_val);
|
||||
|
||||
#if defined(CONFIG_PLAT_MAPPI)
|
||||
((u32 *)info->pseudo_palette)[regno] = cpu_to_le16(pseudo_val);
|
||||
#else
|
||||
((u32 *)info->pseudo_palette)[regno] = pseudo_val;
|
||||
#endif
|
||||
|
||||
break;
|
||||
case FB_VISUAL_PSEUDOCOLOR:
|
||||
|
||||
Reference in New Issue
Block a user