MX51 LCD Support
Subsystems (3)
This patchset adds support for LCD to the MX51 Soc using the IPUv3 graphic processor. This is a porting to U-Boot of the Linux driver developed and delivered by Freescale.
PATCH 1/4 Add linux framebuffer header
The patch adds the linux framebuffer header file. As several drivers are ported from Linux, it is easier to reuse the same structures already present in the kernel.
--- include/linux/fb.h | 616 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 616 insertions(+), 0 deletions(-) create mode 100644 include/linux/fb.h
include/linux/fb.h new file +616 -0
@@ -0,0 +1,616 @@ +#ifndef _LINUX_FB_H +#define _LINUX_FB_H + +#include <linux/types.h> + +/* Definitions of frame buffers */ + +#define FB_MAX 32/* sufficient for now */ + +#define FB_TYPE_PACKED_PIXELS 0/* Packed Pixels */ + +#define FB_VISUAL_MONO01 0/* Monochr. 1=Black 0=White */ +#define FB_VISUAL_MONO10 1/* Monochr. 1=White 0=Black */ +#define FB_VISUAL_TRUECOLOR 2/* True color */ +#define FB_VISUAL_PSEUDOCOLOR 3/* Pseudo color (like atari) */ +#define FB_VISUAL_DIRECTCOLOR 4/* Direct color */ +#define FB_VISUAL_STATIC_PSEUDOCOLOR 5/* Pseudo color readonly */ + +#define FB_ACCEL_NONE 0/* no hardware accelerator */ + +struct fb_fix_screeninfo { +char id[16 ];/* identification string eg "TT Builtin" */ +unsigned long smem_start;/* Start of frame buffer mem */ +/* (physical address) */ +__u32 smem_len;/* Length of frame buffer mem */ +__u32 type;/* see FB_TYPE_* */ +__u32 type_aux;/* Interleave for interleaved Planes */ +__u32 visual;/* see FB_VISUAL_* */ +__u16 xpanstep;/* zero if no hardware panning */ +__u16 ypanstep;/* zero if no hardware panning */ +__u16 ywrapstep;/* zero if no hardware ywrap */ +__u32 line_length;/* length of a line in bytes */ +unsigned long mmio_start;/* Start of Memory Mapped I/O */ +/* (physical address) */ +__u32 mmio_len;/* Length of Memory Mapped I/O */ +__u32 accel;/* Indicate to driver which */ +/* specific chip/card we have */ +__u16 reserved[3 ];/* Reserved for future compatibility */ +}; + +/* +* Interpretation of offset for color fields: All offsets are from the right, +* inside a "pixel" value, which is exactly 'bits_per_pixel' wide (means: you +* can use the offset as right argument to <<). A pixel afterwards is a bit +* stream and is written to video memory as that unmodified. +* +* For pseudocolor: offset and length should be the same for all color +* components. Offset specifies the position of the least significant bit +* of the pallette index in a pixel value. Length indicates the number +* of available palette entries (i.e. # of entries = 1 << length). +*/ +struct fb_bitfield { +__u32 offset;/* beginning of bitfield */ +__u32 length;/* length of bitfield */ +__u32 msb_right; + +}; + +#define FB_NONSTD_HAM 1/* Hold-And-Modify (HAM) */ +#define FB_NONSTD_REV_PIX_IN_B 2/* order of pixels in each byte is reversed */ + +#define FB_ACTIVATE_NOW 0/* set values immediately (or vbl)*/ +#define FB_ACTIVATE_NXTOPEN 1/* activate on next open */ +#define FB_ACTIVATE_TEST 2/* don't set, round up impossible */ +#define FB_ACTIVATE_MASK 15 +/* values */ +#define FB_ACTIVATE_VBL 16/* activate values on next vbl */ +#define FB_CHANGE_CMAP_VBL 32/* change colormap on vbl */ +#define FB_ACTIVATE_ALL 64/* change all VCs on this fb */ +#define FB_ACTIVATE_FORCE 128/* force apply even when no change*/ +#define FB_ACTIVATE_INV_MODE 256/* invalidate videomode */ + +#define FB_SYNC_HOR_HIGH_ACT 1/* horizontal sync high active */ +#define FB_SYNC_VERT_HIGH_ACT 2/* vertical sync high active */ +#define FB_SYNC_EXT 4/* external sync */ +#define FB_SYNC_COMP_HIGH_ACT 8/* composite sync high active */ +#define FB_SYNC_BROADCAST 16/* broadcast video timings */ +/* vtotal = 144d/288n/576i => PAL */ +/* vtotal = 121d/242n/484i => NTSC */ +#define FB_SYNC_ON_GREEN 32/* sync on green */ + +#define FB_VMODE_NONINTERLACED 0/* non interlaced */ +#define FB_VMODE_INTERLACED 1/* interlaced */ +#define FB_VMODE_DOUBLE 2/* double scan */ +#define FB_VMODE_ODD_FLD_FIRST 4/* interlaced: top line first */ +#define FB_VMODE_MASK 255 + +#define FB_VMODE_YWRAP 256/* ywrap instead of panning */ +#define FB_VMODE_SMOOTH_XPAN 512/* smooth xpan possible (internally used) */ +#define FB_VMODE_CONUPDATE 512/* don't update x/yoffset */ + +/* +* Display rotation support +*/ +#define FB_ROTATE_UR 0 +#define FB_ROTATE_CW 1 +#define FB_ROTATE_UD 2 +#define FB_ROTATE_CCW 3 + +#define PICOS2KHZ (a) (1000000000UL/(a)) +#define KHZ2PICOS (a) (1000000000UL/(a)) + +struct fb_var_screeninfo { +__u32 xres;/* visible resolution */ +__u32 yres; +__u32 xres_virtual;/* virtual resolution */ +__u32 yres_virtual; +__u32 xoffset;/* offset from virtual to visible */ +__u32 yoffset;/* resolution */ + +__u32 bits_per_pixel;/* guess what */ +__u32 grayscale;/* != 0 Graylevels instead of colors */ + +struct fb_bitfield red;/* bitfield in fb mem if true color, */ +struct fb_bitfield green;/* else only length is significant */ +struct fb_bitfield blue; +struct fb_bitfield transp;/* transparency */ + +__u32 nonstd;/* != 0 Non standard pixel format */ + +__u32 activate;/* see FB_ACTIVATE_* */ + +__u32 height;/* height of picture in mm */ +__u32 width;/* width of picture in mm */ + +__u32 accel_flags;/* (OBSOLETE) see fb_info.flags */ + +/* Timing: All values in pixclocks, except pixclock (of course) */ +__u32 pixclock;/* pixel clock in ps (pico seconds) */ +__u32 left_margin;/* time from sync to picture */ +__u32 right_margin;/* time from picture to sync */ +__u32 upper_margin;/* time from sync to picture */ +__u32 lower_margin; +__u32 hsync_len;/* length of horizontal sync */ +__u32 vsync_len;/* length of vertical sync */ +__u32 sync;/* see FB_SYNC_* */ +__u32 vmode;/* see FB_VMODE_* */ +__u32 rotate;/* angle we rotate counter clockwise */ +__u32 reserved[5 ];/* Reserved for future compatibility */ +}; + +struct fb_cmap { +__u32 start;/* First entry */ +__u32 len;/* Number of entries */ +__u16 *red;/* Red values */ +__u16 *green; +__u16 *blue; +__u16 *transp;/* transparency, can be NULL */ +}; + +struct fb_con2fbmap { +__u32 console; +__u32 framebuffer; +}; + +/* VESA Blanking Levels */ +#define VESA_NO_BLANKING 0 +#define VESA_VSYNC_SUSPEND 1 +#define VESA_HSYNC_SUSPEND 2 +#define VESA_POWERDOWN 3 + + +enum { +/* screen: unblanked, hsync: on, vsync: on */ +FB_BLANK_UNBLANK =VESA_NO_BLANKING , + +/* screen: blanked, hsync: on, vsync: on */ +FB_BLANK_NORMAL =VESA_NO_BLANKING +1 , + +/* screen: blanked, hsync: on, vsync: off */ +FB_BLANK_VSYNC_SUSPEND =VESA_VSYNC_SUSPEND +1 , + +/* screen: blanked, hsync: off, vsync: on */ +FB_BLANK_HSYNC_SUSPEND =VESA_HSYNC_SUSPEND +1 , + +/* screen: blanked, hsync: off, vsync: off */ +FB_BLANK_POWERDOWN =VESA_POWERDOWN +1 +}; + +#define FB_VBLANK_VBLANKING 0x001/* currently in a vertical blank */ +#define FB_VBLANK_HBLANKING 0x002/* currently in a horizontal blank */ +#define FB_VBLANK_HAVE_VBLANK 0x004/* vertical blanks can be detected */ +#define FB_VBLANK_HAVE_HBLANK 0x008/* horizontal blanks can be detected */ +#define FB_VBLANK_HAVE_COUNT 0x010/* global retrace counter is available */ +#define FB_VBLANK_HAVE_VCOUNT 0x020/* the vcount field is valid */ +#define FB_VBLANK_HAVE_HCOUNT 0x040/* the hcount field is valid */ +#define FB_VBLANK_VSYNCING 0x080/* currently in a vsync */ +#define FB_VBLANK_HAVE_VSYNC 0x100/* verical syncs can be detected */ + +struct fb_vblank { +__u32 flags;/* FB_VBLANK flags */ +__u32 count;/* counter of retraces since boot */ +__u32 vcount;/* current scanline position */ +__u32 hcount;/* current scandot position */ +__u32 reserved[4 ];/* reserved for future compatibility */ +}; + +/* Internal HW accel */ +#define ROP_COPY 0 +#define ROP_XOR 1 + +struct fb_copyarea { +__u32 dx; +__u32 dy; +__u32 width; +__u32 height; +__u32 sx; +__u32 sy; +}; + +struct fb_fillrect { +__u32 dx;/* screen-relative */ +__u32 dy; +__u32 width; +__u32 height; +__u32 color; +__u32 rop; +}; + +struct fb_image { +__u32 dx;/* Where to place image */ +__u32 dy; +__u32 width;/* Size of image */ +__u32 height; +__u32 fg_color;/* Only used when a mono bitmap */ +__u32 bg_color; +__u8 depth;/* Depth of the image */ +const char *data;/* Pointer to image data */ +struct fb_cmap cmap;/* color map info */ +}; + +/* +* hardware cursor control +*/ + +#define FB_CUR_SETIMAGE 0x01 +#define FB_CUR_SETPOS 0x02 +#define FB_CUR_SETHOT 0x04 +#define FB_CUR_SETCMAP 0x08 +#define FB_CUR_SETSHAPE 0x10 +#define FB_CUR_SETSIZE 0x20 +#define FB_CUR_SETALL 0xFF + +struct fbcurpos { +__u16 x, y; +}; + +struct fb_cursor { +__u16 set;/* what to set */ +__u16 enable;/* cursor on/off */ +__u16 rop;/* bitop operation */ +const char *mask;/* cursor mask bits */ +struct fbcurpos hot;/* cursor hot spot */ +struct fb_image image;/* Cursor image */ +}; + +#ifdef CONFIG_FB_BACKLIGHT +/* Settings for the generic backlight code */ +#define FB_BACKLIGHT_LEVELS 128 +#define FB_BACKLIGHT_MAX 0xFF +#endif + +#ifdef __KERNEL__ + +struct vm_area_struct ; +struct fb_info ; +struct device ; +struct file ; + +/* Definitions below are used in the parsed monitor specs */ +#define FB_DPMS_ACTIVE_OFF 1 +#define FB_DPMS_SUSPEND 2 +#define FB_DPMS_STANDBY 4 + +#define FB_DISP_DDI 1 +#define FB_DISP_ANA_700_300 2 +#define FB_DISP_ANA_714_286 4 +#define FB_DISP_ANA_1000_400 8 +#define FB_DISP_ANA_700_000 16 + +#define FB_DISP_MONO 32 +#define FB_DISP_RGB 64 +#define FB_DISP_MULTI 128 +#define FB_DISP_UNKNOWN 256 + +#define FB_SIGNAL_NONE 0 +#define FB_SIGNAL_BLANK_BLANK 1 +#define FB_SIGNAL_SEPARATE 2 +#define FB_SIGNAL_COMPOSITE 4 +#define FB_SIGNAL_SYNC_ON_GREEN 8 +#define FB_SIGNAL_SERRATION_ON 16 + +#define FB_MISC_PRIM_COLOR 1 +#define FB_MISC_1ST_DETAIL 2/* First Detailed Timing is preferred */ +struct fb_chroma { +__u32 redx;/* in fraction of 1024 */ +__u32 greenx; +__u32 bluex; +__u32 whitex; +__u32 redy; +__u32 greeny; +__u32 bluey; +__u32 whitey; +}; + +struct fb_monspecs { +struct fb_chroma chroma; +struct fb_videomode *modedb;/* mode database */ +__u8 manufacturer[4 ];/* Manufacturer */ +__u8 monitor[14 ];/* Monitor String */ +__u8 serial_no[14 ];/* Serial Number */ +__u8 ascii[14 ];/* ? */ +__u32 modedb_len;/* mode database length */ +__u32 model;/* Monitor Model */ +__u32 serial;/* Serial Number - Integer */ +__u32 year;/* Year manufactured */ +__u32 week;/* Week Manufactured */ +__u32 hfmin;/* hfreq lower limit (Hz) */ +__u32 hfmax;/* hfreq upper limit (Hz) */ +__u32 dclkmin;/* pixelclock lower limit (Hz) */ +__u32 dclkmax;/* pixelclock upper limit (Hz) */ +__u16 input;/* display type - see FB_DISP_* */ +__u16 dpms;/* DPMS support - see FB_DPMS_ */ +__u16 signal;/* Signal Type - see FB_SIGNAL_* */ +__u16 vfmin;/* vfreq lower limit (Hz) */ +__u16 vfmax;/* vfreq upper limit (Hz) */ +__u16 gamma;/* Gamma - in fractions of 100 */ +__u16 gtf :1 ;/* supports GTF */ +__u16 misc;/* Misc flags - see FB_MISC_* */ +__u8 version;/* EDID version... */ +__u8 revision;/* ...and revision */ +__u8 max_x;/* Maximum horizontal size (cm) */ +__u8 max_y;/* Maximum vertical size (cm) */ +}; + +struct fb_cmap_user { +__u32 start;/* First entry */ +__u32 len;/* Number of entries */ +__u16 *red;/* Red values */ +__u16 *green; +__u16 *blue; +__u16 *transp;/* transparency, can be NULL */ +}; + +struct fb_image_user { +__u32 dx;/* Where to place image */ +__u32 dy; +__u32 width;/* Size of image */ +__u32 height; +__u32 fg_color;/* Only used when a mono bitmap */ +__u32 bg_color; +__u8 depth;/* Depth of the image */ +const char *data;/* Pointer to image data */ +struct fb_cmap_user cmap;/* color map info */ +}; + +struct fb_cursor_user { +__u16 set;/* what to set */ +__u16 enable;/* cursor on/off */ +__u16 rop;/* bitop operation */ +const char *mask;/* cursor mask bits */ +struct fbcurpos hot;/* cursor hot spot */ +struct fb_image_user image;/* Cursor image */ +}; + +/* +* Register/unregister for framebuffer events +*/ + +/* The resolution of the passed in fb_info about to change */ +#define FB_EVENT_MODE_CHANGE 0x01 +/* The display on this fb_info is beeing suspended, no access to the +* framebuffer is allowed any more after that call returns +*/ +#define FB_EVENT_SUSPEND 0x02 +/* The display on this fb_info was resumed, you can restore the display +* if you own it +*/ +#define FB_EVENT_RESUME 0x03 +/* An entry from the modelist was removed */ +#define FB_EVENT_MODE_DELETE 0x04 +/* A driver registered itself */ +#define FB_EVENT_FB_REGISTERED 0x05 +/* A driver unregistered itself */ +#define FB_EVENT_FB_UNREGISTERED 0x06 +/* CONSOLE-SPECIFIC: get console to framebuffer mapping */ +#define FB_EVENT_GET_CONSOLE_MAP 0x07 +/* CONSOLE-SPECIFIC: set console to framebuffer mapping */ +#define FB_EVENT_SET_CONSOLE_MAP 0x08 +/* A hardware display blank change occured */ +#define FB_EVENT_BLANK 0x09 +/* Private modelist is to be replaced */ +#define FB_EVENT_NEW_MODELIST 0x0A +/* The resolution of the passed in fb_info about to change and +all vc's should be changed */ +#define FB_EVENT_MODE_CHANGE_ALL 0x0B +/* A software display blank change occured */ +#define FB_EVENT_CONBLANK 0x0C +/* Get drawing requirements */ +#define FB_EVENT_GET_REQ 0x0D +/* Unbind from the console if possible */ +#define FB_EVENT_FB_UNBIND 0x0E + +struct fb_event { +struct fb_info *info; +void *data; +}; + +struct fb_blit_caps { +u32 x; +u32 y; +u32 len; +u32 flags; +}; + +/* +* Pixmap structure definition +* +* The purpose of this structure is to translate data +* from the hardware independent format of fbdev to what +* format the hardware needs. +*/ + +#define FB_PIXMAP_DEFAULT 1/* used internally by fbcon */ +#define FB_PIXMAP_SYSTEM 2/* memory is in system RAM */ +#define FB_PIXMAP_IO 4/* memory is iomapped */ +#define FB_PIXMAP_SYNC 256/* set if GPU can DMA */ + +struct fb_pixmap { +u8 *addr;/* pointer to memory */ +u32 size;/* size of buffer in bytes */ +u32 offset;/* current offset to buffer */ +u32 buf_align;/* byte alignment of each bitmap */ +u32 scan_align;/* alignment per scanline */ +u32 access_align;/* alignment per read/write (bits) */ +u32 flags;/* see FB_PIXMAP_* */ +u32 blit_x;/* supported bit block dimensions (1-32)*/ +u32 blit_y;/* Format: blit_x = 1 << (width - 1) */ +/* blit_y = 1 << (height - 1) */ +/* if 0, will be set to 0xffffffff (all)*/ +/* access methods */ +void (*writeio)(struct fb_info *info,void *dst,void *src,unsigned int size); +void (*readio) (struct fb_info *info,void *dst,void *src,unsigned int size); +}; + +#ifdef CONFIG_FB_DEFERRED_IO +struct fb_deferred_io { +/* delay between mkwrite and deferred handler */ +unsigned long delay; +struct mutex lock;/* mutex that protects the page list */ +struct list_head pagelist;/* list of touched pages */ +/* callback */ +void (*deferred_io)(struct fb_info *info,struct list_head *pagelist); +}; +#endif + +/* FBINFO_* = fb_info.flags bit flags */ +#define FBINFO_MODULE 0x0001/* Low-level driver is a module */ +#define FBINFO_HWACCEL_DISABLED 0x0002 +/* When FBINFO_HWACCEL_DISABLED is set: +* Hardware acceleration is turned off. Software implementations +* of required functions (copyarea(), fillrect(), and imageblit()) +* takes over; acceleration engine should be in a quiescent state */ + +/* hints */ +#define FBINFO_PARTIAL_PAN_OK 0x0040/* otw use pan only for double-buffering */ +#define FBINFO_READS_FAST 0x0080/* soft-copy faster than rendering */ + +/* +* A driver may set this flag to indicate that it does want a set_par to be +* called every time when fbcon_switch is executed. The advantage is that with +* this flag set you can really be sure that set_par is always called before +* any of the functions dependant on the correct hardware state or altering +* that state, even if you are using some broken X releases. The disadvantage +* is that it introduces unwanted delays to every console switch if set_par +* is slow. It is a good idea to try this flag in the drivers initialization +* code whenever there is a bug report related to switching between X and the +* framebuffer console. +*/ +#define FBINFO_MISC_ALWAYS_SETPAR 0x40000 + +/* +* Host and GPU endianness differ. +*/ +#define FBINFO_FOREIGN_ENDIAN 0x100000 +/* +* Big endian math. This is the same flags as above, but with different +* meaning, it is set by the fb subsystem depending FOREIGN_ENDIAN flag +* and host endianness. Drivers should not use this flag. +*/ +#define FBINFO_BE_MATH 0x100000 + +struct fb_info { +int node; +int flags; +struct fb_var_screeninfo var;/* Current var */ +struct fb_fix_screeninfo fix;/* Current fix */ +struct fb_monspecs monspecs;/* Current Monitor specs */ +struct fb_pixmap pixmap;/* Image hardware mapper */ +struct fb_pixmap sprite;/* Cursor hardware mapper */ +struct fb_cmap cmap;/* Current cmap */ +struct list_head modelist;/* mode list */ +struct fb_videomode *mode;/* current mode */ + +char *screen_base;/* Virtual address */ +unsigned long screen_size;/* Amount of ioremapped VRAM or 0 */ +void *pseudo_palette;/* Fake palette of 16 colors */ +#define FBINFO_STATE_RUNNING 0 +#define FBINFO_STATE_SUSPENDED 1 +u32 state;/* Hardware state i.e suspend */ +void *fbcon_par;/* fbcon use-only private area */ +/* From here on everything is device dependent */ +void *par; +}; + +#define FBINFO_DEFAULT 0 + +#define FBINFO_FLAG_MODULE FBINFO_MODULE +#define FBINFO_FLAG_DEFAULT FBINFO_DEFAULT + +// This will go away +#if defined(__sparc__) + +/* We map all of our framebuffers such that big-endian accesses +* are what we want, so the following is sufficient. +*/ + +// This will go away +#define fb_readb sbus_readb +#define fb_readw sbus_readw +#define fb_readl sbus_readl +#define fb_readq sbus_readq +#define fb_writeb sbus_writeb +#define fb_writew sbus_writew +#define fb_writel sbus_writel +#define fb_writeq sbus_writeq +#define fb_memset sbus_memset_io + +#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) || defined(__bfin__) + +#define fb_readb __raw_readb +#define fb_readw __raw_readw +#define fb_readl __raw_readl +#define fb_readq __raw_readq +#define fb_writeb __raw_writeb +#define fb_writew __raw_writew +#define fb_writel __raw_writel +#define fb_writeq __raw_writeq +#define fb_memset memset_io + +#else + +#define fb_readb (addr) (*(volatile u8 *) (addr)) +#define fb_readw (addr) (*(volatile u16 *) (addr)) +#define fb_readl (addr) (*(volatile u32 *) (addr)) +#define fb_readq (addr) (*(volatile u64 *) (addr)) +#define fb_writeb (b,addr) (*(volatile u8 *) (addr) = (b)) +#define fb_writew (b,addr) (*(volatile u16 *) (addr) = (b)) +#define fb_writel (b,addr) (*(volatile u32 *) (addr) = (b)) +#define fb_writeq (b,addr) (*(volatile u64 *) (addr) = (b)) +#define fb_memset memset + +#endif + +#define FB_LEFT_POS (p, bpp) (fb_be_math(p) ? (32 - (bpp)) : 0) +#define FB_SHIFT_HIGH (p, val, bits) (fb_be_math(p) ? (val) >> (bits) : \ + (val) << (bits)) +#define FB_SHIFT_LOW (p, val, bits) (fb_be_math(p) ? (val) << (bits) : \ + (val) >> (bits)) +/* drivers/video/fbmon.c */ +#define FB_MAXTIMINGS 0 +#define FB_VSYNCTIMINGS 1 +#define FB_HSYNCTIMINGS 2 +#define FB_DCLKTIMINGS 3 +#define FB_IGNOREMON 0x100 + +#define FB_MODE_IS_UNKNOWN 0 +#define FB_MODE_IS_DETAILED 1 +#define FB_MODE_IS_STANDARD 2 +#define FB_MODE_IS_VESA 4 +#define FB_MODE_IS_CALCULATED 8 +#define FB_MODE_IS_FIRST 16 +#define FB_MODE_IS_FROM_VAR 32 + + +/* drivers/video/fbcmap.c */ + +extern int fb_alloc_cmap (struct fb_cmap *cmap,int len,int transp); +extern void fb_dealloc_cmap (struct fb_cmap *cmap); +extern int fb_copy_cmap (const struct fb_cmap *from,struct fb_cmap *to); +extern int fb_cmap_to_user (const struct fb_cmap *from,struct fb_cmap_user *to); +extern int fb_set_cmap (struct fb_cmap *cmap,struct fb_info *fb_info); +extern int fb_set_user_cmap (struct fb_cmap_user *cmap,struct fb_info *fb_info); +extern const struct fb_cmap *fb_default_cmap (int len); +extern void fb_invert_cmaps (void ); + +struct fb_videomode { +const char *name;/* optional */ +u32 refresh;/* optional */ +u32 xres; +u32 yres; +u32 pixclock; +u32 left_margin; +u32 right_margin; +u32 upper_margin; +u32 lower_margin; +u32 hsync_len; +u32 vsync_len; +u32 sync; +u32 vmode; +u32 flag; +}; + +#endif /* __KERNEL__ */ + +#endif /* _LINUX_FB_H */
Signature · 1 line
1.6.3.3
PATCH 2/4 MX51: Add IPU driver for video support
The patch is a porting of the IPU Linux driver developed by Freescale to have framebuffer functionalities in u-boot.
Most features are dropped from the original driver and only LCD support is the goal of this porting.
--- arch/arm/include/asm/arch-mx51/crm_regs.h | 11 + drivers/video/ipu.h | 316 +++++++ drivers/video/ipu_common.c | 1181 +++++++++++++++++++++++++ drivers/video/ipu_disp.c | 1357 +++++++++++++++++++++++++++++ drivers/video/ipu_regs.h | 418 +++++++++ 5 files changed, 3283 insertions(+), 0 deletions(-) create mode 100644 drivers/video/ipu.h create mode 100644 drivers/video/ipu_common.c create mode 100644 drivers/video/ipu_disp.c create mode 100644 drivers/video/ipu_regs.h
arch/arm/include/asm/arch-mx51/crm_regs.h +11 -0
@@ -189,4 +189,15 @@ struct mxc_ccm_reg {#define MXC_CCM_CSCDR1_UART_CLK_PODF_OFFSET 0#define MXC_CCM_CSCDR1_UART_CLK_PODF_MASK 0x7 +/* Define the bits in register CCDR */ +#define MXC_CCM_CCDR_IPU_HS_MASK (0x1 << 17) + +/* Define the bits in register CCGRx */ +#define MXC_CCM_CCGR_CG_MASK 0x3 + +#define MXC_CCM_CCGR5_CG5_OFFSET 10 + +/* Define the bits in register CLPCR */ +#define MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS (0x1 << 18) +#endif /* __ARCH_ARM_MACH_MX51_CRM_REGS_H__ */
drivers/video/ipu.h new file +316 -0
316 lines not on this page · raw message
drivers/video/ipu_common.c new file +1181 -0
1,181 lines not on this page · raw message
drivers/video/ipu_disp.c new file +1357 -0
1,357 lines not on this page · raw message
drivers/video/ipu_regs.h new file +418 -0
131 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.6.3.3
Part of the diff is not shown here. View the raw message.
PATCH 3/4 MX51: Add video support
Add framebuffer driver for the MX51 processor
working on the IPUv3 internal graphic processor.
--- drivers/video/Makefile | 1 + drivers/video/mxc_ipuv3_fb.c | 661 ++++++++++++++++++++++++++++++++++++++++++ drivers/video/mxcfb.h | 78 +++++ 3 files changed, 740 insertions(+), 0 deletions(-) create mode 100644 drivers/video/mxc_ipuv3_fb.c create mode 100644 drivers/video/mxcfb.h
drivers/video/Makefile +1 -0
@@ -34,6 +34,7 @@ COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o COBJS-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.o +COBJS-$(CONFIG_VIDEO_MX5) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o COBJS-$(CONFIG_SED156X) += sed156x.o COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
drivers/video/mxc_ipuv3_fb.c new file +661 -0
661 lines not on this page · raw message
drivers/video/mxcfb.h new file +78 -0
78 lines not on this page · raw message
Signature · 1 line
1.6.3.3
PATCH 4/4 MX51: Add video support to vision2 board
The patch adds support for LCD to the vision board.
--- board/ttcontrol/vision2/vision2.c | 69 +++++++++++++++++++++++++++++++++++++ include/configs/vision2.h | 15 ++++++++ 2 files changed, 84 insertions(+), 0 deletions(-)
board/ttcontrol/vision2/vision2.c +69 -0
@@ -37,14 +37,34 @@#include <fsl_esdhc.h> #include <fsl_pmic.h> #include <mc13892.h> +#include <linux/fb.h> DECLARE_GLOBAL_DATA_PTR ;static u32 system_rev; +extern int mx51_fb_init (struct fb_videomode *mode); +#ifdef CONFIG_HW_WATCHDOG #include <watchdog.h> +static struct fb_videomode nec_nl6448bc26_09c = { +"NEC_NL6448BC26-09C" , +60 ,/* Refresh */ +640 ,/* xres */ +480 ,/* yres */ +37650 ,/* pixclock = 26.56Mhz */ +48 ,/* left margin */ +16 ,/* right margin */ +31 ,/* upper margin */ +12 ,/* lower margin */ +96 ,/* hsync-len */ +2 ,/* vsync-len */ +0 ,/* sync */ +FB_VMODE_NONINTERLACED ,/* vmode */ +0 ,/* flag */ +}; +void hw_watchdog_reset (void ) {int val;
@@ -423,6 +443,9 @@ static void setup_gpios(void)mxc_request_iomux (MX51_PIN_CSPI1_RDY ,IOMUX_CONFIG_ALT3 );mxc_iomux_set_pad (MX51_PIN_CSPI1_RDY ,0x82 ); +/* PWM Output GPIO1_2 */ +mxc_request_iomux (MX51_PIN_GPIO1_2 ,IOMUX_CONFIG_ALT1 ); +/* * Set GPIO1_4 to high and output; it is used to reset * the system on reboot
@@ -630,6 +653,34 @@ int board_early_init_f(void)return 0 ; } +static void backlight (int on) +{ +if (on) { +mxc_gpio_set (65 ,1 ); +udelay (10000 ); +mxc_gpio_set (68 ,1 ); + }else { +mxc_gpio_set (65 ,0 ); +mxc_gpio_set (68 ,0 ); + } +} + +void lcd_enable (void ) +{ +int ret; + +mxc_request_iomux (MX51_PIN_DI1_PIN2 ,IOMUX_CONFIG_ALT0 ); +mxc_request_iomux (MX51_PIN_DI1_PIN3 ,IOMUX_CONFIG_ALT0 ); + +mxc_gpio_set (2 ,1 ); +mxc_request_iomux (MX51_PIN_GPIO1_2 ,IOMUX_CONFIG_ALT0 ); + + ret =mx51_fb_init (&nec_nl6448bc26_09c); +if (ret) { +puts ("LCD cannot be configured\n" ); + } +} +int board_init (void ) {#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC
@@ -709,3 +760,21 @@ int checkboard(void)return 0 ; } +int do_vision_lcd (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +{ +int on; + +if (argc <2 ) +return cmd_usage (cmdtp); + + on = (strcmp (argv[1 ],"on" ) ==0 ); +backlight (on); + +return 0 ; +} + +U_BOOT_CMD ( + lcdbl,CONFIG_SYS_MAXARGS ,1 , do_vision_lcd, +"Vision2 Backlight" , +"lcdbl [on|off]\n" +);
include/configs/vision2.h +15 -0
@@ -212,6 +212,21 @@#define CONFIG_SYS_CLKTL_CBCDR 0x19239100/* +* Framebuffer and LCD +*/ +#define CONFIG_PREBOOT +#define CONFIG_LCD +#define CONFIG_VIDEO_MX5 +#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define LCD_BPP LCD_COLOR16 +#define CONFIG_SPLASH_SCREEN +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP +#define CMD_DISPLAY + +/* * NAND FLASH driver setup */ #define CONFIG_CMD_NAND
Signature · 1 line
1.6.3.3
PATCH 4/4 MX51: Add video support to vision2 board
Dear Stefano Babic,
Quoted 1 line · In message <[email protected]> you wrote:
The patch adds support for LCD to the vision board.
...
Quoted 1 line
+#define
CONFIG_PREBOOT
Normally one defines a default command here ?
include/configs/vision2.h line 227
Quoted 2 lines
include/configs/vision2.h +2
-0+#define CONFIG_BMP_16BPP +#define CMD_DISPLAY
CONFIG_CMD_DISPLAY ???
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de There is a biblical analogy I'd like to draw here. Casts are to C++ Programmers what the apple was to Eve. - Scott Douglas Meyers
PATCH 4/4 MX51: Add video support to vision2 board
Am 12.10.2010 13:37, schrieb Wolfgang Denk:
Quoted 9 lines
Dear Stefano Babic,
Quoted 1 line · In message <[email protected]> you wrote:
The patch adds support for LCD to the vision board.
...
Quoted 1 line
+#define
CONFIG_PREBOOTNormally one defines a default command here ?
Probably I misunderstand its usage, but my intention is to enable the PREBOOT feature, but let the user to decide with the "preboot" variable if it is required or not. In my case for this board, I use it to load an image from a NAND device, as "splashimage" can be used only with an address.
In common/main.c:
#ifdef CONFIG_PREBOOT
if ((p = getenv ("preboot")) != NULL) {So I need to set this config even without a value if I would like to use it later setting the "preboot" variable.
Quoted 5 lines
include/configs/vision2.h line 227
Quoted 3 lines
include/configs/vision2.h +2
-0+#define CONFIG_BMP_16BPP +#define CMD_DISPLAY
CONFIG_CMD_DISPLAY???
This is wrong ! Thanks, I forget to remove it.
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH 4/4 MX51: Add video support to vision2 board
Dear stefano babic,
Quoted 7 lines · In message <[email protected]> you wrote:
Quoted 2 lines
Normally one defines a default command here ?
Probably I misunderstand its usage, but my intention is to enable the PREBOOT feature, but let the user to decide with the "preboot" variable if it is required or not. In my case for this board, I use it to load an image from a NAND device, as "splashimage" can be used only with an address.
No, you did not misinderstand. Everything is fine if this was your intention. I just wantred to make that sure, as most people define some default command here.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de We fight only when there is no other choice. We prefer the ways of peaceful contact. -- Kirk, "Spectre of the Gun", stardate 4385.3
PATCH v2 4/4 MX51: Add video support to vision2 board
In reply to Stefano BabicThe patch adds support for LCD to the vision board.
---
Changes since V1:
- Remove wrong CONFIG_CMD_DISPLAY
board/ttcontrol/vision2/vision2.c | 69 +++++++++++++++++++++++++++++++++++++ include/configs/vision2.h | 14 +++++++ 2 files changed, 83 insertions(+), 0 deletions(-)
board/ttcontrol/vision2/vision2.c +69 -0
@@ -37,14 +37,34 @@#include <fsl_esdhc.h> #include <fsl_pmic.h> #include <mc13892.h> +#include <linux/fb.h> DECLARE_GLOBAL_DATA_PTR ;static u32 system_rev; +extern int mx51_fb_init (struct fb_videomode *mode); +#ifdef CONFIG_HW_WATCHDOG #include <watchdog.h> +static struct fb_videomode nec_nl6448bc26_09c = { +"NEC_NL6448BC26-09C" , +60 ,/* Refresh */ +640 ,/* xres */ +480 ,/* yres */ +37650 ,/* pixclock = 26.56Mhz */ +48 ,/* left margin */ +16 ,/* right margin */ +31 ,/* upper margin */ +12 ,/* lower margin */ +96 ,/* hsync-len */ +2 ,/* vsync-len */ +0 ,/* sync */ +FB_VMODE_NONINTERLACED ,/* vmode */ +0 ,/* flag */ +}; +void hw_watchdog_reset (void ) {int val;
@@ -423,6 +443,9 @@ static void setup_gpios(void)mxc_request_iomux (MX51_PIN_CSPI1_RDY ,IOMUX_CONFIG_ALT3 );mxc_iomux_set_pad (MX51_PIN_CSPI1_RDY ,0x82 ); +/* PWM Output GPIO1_2 */ +mxc_request_iomux (MX51_PIN_GPIO1_2 ,IOMUX_CONFIG_ALT1 ); +/* * Set GPIO1_4 to high and output; it is used to reset * the system on reboot
@@ -630,6 +653,34 @@ int board_early_init_f(void)return 0 ; } +static void backlight (int on) +{ +if (on) { +mxc_gpio_set (65 ,1 ); +udelay (10000 ); +mxc_gpio_set (68 ,1 ); + }else { +mxc_gpio_set (65 ,0 ); +mxc_gpio_set (68 ,0 ); + } +} + +void lcd_enable (void ) +{ +int ret; + +mxc_request_iomux (MX51_PIN_DI1_PIN2 ,IOMUX_CONFIG_ALT0 ); +mxc_request_iomux (MX51_PIN_DI1_PIN3 ,IOMUX_CONFIG_ALT0 ); + +mxc_gpio_set (2 ,1 ); +mxc_request_iomux (MX51_PIN_GPIO1_2 ,IOMUX_CONFIG_ALT0 ); + + ret =mx51_fb_init (&nec_nl6448bc26_09c); +if (ret) { +puts ("LCD cannot be configured\n" ); + } +} +int board_init (void ) {#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC
@@ -709,3 +760,21 @@ int checkboard(void)return 0 ; } +int do_vision_lcd (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +{ +int on; + +if (argc <2 ) +return cmd_usage (cmdtp); + + on = (strcmp (argv[1 ],"on" ) ==0 ); +backlight (on); + +return 0 ; +} + +U_BOOT_CMD ( + lcdbl,CONFIG_SYS_MAXARGS ,1 , do_vision_lcd, +"Vision2 Backlight" , +"lcdbl [on|off]\n" +);
include/configs/vision2.h +14 -0
@@ -212,6 +212,20 @@#define CONFIG_SYS_CLKTL_CBCDR 0x19239100/* +* Framebuffer and LCD +*/ +#define CONFIG_PREBOOT +#define CONFIG_LCD +#define CONFIG_VIDEO_MX5 +#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define LCD_BPP LCD_COLOR16 +#define CONFIG_SPLASH_SCREEN +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP + +/* * NAND FLASH driver setup */ #define CONFIG_CMD_NAND
Signature · 1 line
1.7.0.4
PATCH v2 4/4 MX51: Add video support to vision2 board
Quoted 10 lines · On Wed, 13 Oct 2010 12:17:48 +0200 Stefano Babic <[email protected]> wrote:
The patch adds support for LCD to the vision board.
Signed-off-by Stefano Babic <[email protected]>---
Changes since V1:
- Remove wrongCONFIG_CMD_DISPLAYboard/ttcontrol/vision2/vision2.c | 69 +++++++++++++++++++++++++++++++++++++ include/configs/vision2.h | 14 +++++++ 2 files changed, 83 insertions(+), 0 deletions(-)
This one is dropped since it is replaced by rebased patch.
Best regards,
Anatolij
PATCH 3/4 MX51: Add video support
In reply to Stefano BabicDear Stefano Babic,
Quoted 2 lines · In message <[email protected]> you wrote:
Add framebuffer driver for the MX51 processor
working on the IPUv3 internal graphic processor.
Please add reference to original sources.
Quoted 5 lines
+/*
+ * Allocates the DRAM memory for the frame buffer. This buffer is remapped
+ * into a non-cached, non-buffered, memory region to allow palette and pixel
+ * writes to occur without flushing the cache. Once this area is remapped,
+ * all virtual memory access to the video memory should occur at the new region.
Is this comment still valid for the U-Boot port?
Does it work with both "dcache on" and "dcache off" settings?
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de It is dangerous to be right on a subject on which the established authorities are wrong. -- Voltaire
PATCH 3/4 MX51: Add video support
Quoted 7 lines · Wolfgang Denk
Dear Stefano Babic,
Quoted 2 lines · In message <[email protected]> you wrote:
Add framebuffer driver for the MX51 processor
working on the IPUv3 internal graphic processor.Please add reference to original sources.
Ok
Quoted 9 lines
Quoted 7 lines
+/*
+ * Allocates the DRAM memory for the frame buffer. This buffer is remapped
+ * into a non-cached, non-buffered, memory region to allow palette and pixel
+ * writes to occur without flushing the cache. Once this area is remapped,
+ * all virtual memory access to the video memory should occur at the new region.Is this comment still valid for the U-Boot port?
No, it is not. The comment makes no sense for u-boot. There is no allocation and malloc is not called, as the memory for the framebuffer is taken from the lcd_base variable.
Quoted 2 lines
Does it work with both "dcache on" and "dcache off" settings?
Well, as there is not yet support for L2-Cache on the MX51, we can say yes ;-). However, this range of memory is used directly from the IPU processor and not by the CPU, as well as in Linux without calling any function to invalidate the cache. But I agree, it should be tested again when support for L2-cache will be integrated.
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH 3/4 MX51: Add video support
Dear stefano babic,
Quoted 8 lines · In message <[email protected]> you wrote:
Quoted 2 lines
Does it work with both "dcache on" and "dcache off" settings?
Well, as there is not yet support for L2-Cache on the MX51, we can say yes ;-). However, this range of memory is used directly from the IPU processor and not by the CPU, as well as in Linux without calling any function to invalidate the cache. But I agree, it should be tested again when support for L2-cache will be integrated.
What about L1 cache? Have Heiko's chache patches been adapted for MX5 yet?
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de When the bosses talk about improving productivity, they are never talking about themselves.
PATCH 3/4 MX51: Add video support
Quoted 6 lines · Wolfgang Denk
Dear stefano babic,
Quoted 3 lines · In message <[email protected]> you wrote:
Quoted 2 lines
Does it work with both "dcache on" and "dcache off" settings?
Quoted 8 lines
Quoted 5 lines
Well, as there is not yet support for L2-Cache on the MX51, we can say yes ;-). However, this range of memory is used directly from the IPU processor and not by the CPU, as well as in Linux without calling any function to invalidate the cache. But I agree, it should be tested again when support for L2-cache will be integrated.
What about L1 cache? Have Heiko's chache patches been adapted for MX5 yet?
No, they are not - however, probably the cache functions in arch/arm/cpu/omap3 can be reused for the i.MX51, too.
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 3/4 MX51: Add video support
In reply to Stefano BabicAdd framebuffer driver for the MX51 processor working on the IPUv3 internal graphic processor. The port is based on the driver found in the kernel delivered by Freescale as part of i.MX BSP:
[kernel 2.6.31 commit cc4fe714041805997b601fe8e5dd585d8a99297f]
---
Changes since V1:
- added precise reference to the kernel version used for porting in the commit message
- correct multiline comments
- drop wrong comments (useful only in the kernel, not in u-boot)
drivers/video/Makefile | 1 + drivers/video/mxc_ipuv3_fb.c | 644 ++++++++++++++++++++++++++++++++++++++++++ drivers/video/mxcfb.h | 87 ++++++ 3 files changed, 732 insertions(+), 0 deletions(-) create mode 100644 drivers/video/mxc_ipuv3_fb.c create mode 100644 drivers/video/mxcfb.h
drivers/video/Makefile +1 -0
@@ -34,6 +34,7 @@ COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o videomodes.o COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o videomodes.o COBJS-$(CONFIG_VIDEO_MB86R0xGDC) += mb86r0xgdc.o videomodes.o COBJS-$(CONFIG_VIDEO_MX3) += mx3fb.o +COBJS-$(CONFIG_VIDEO_MX5) += mxc_ipuv3_fb.o ipu_common.o ipu_disp.o COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o COBJS-$(CONFIG_SED156X) += sed156x.o COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
drivers/video/mxc_ipuv3_fb.c new file +644 -0
644 lines not on this page · raw message
drivers/video/mxcfb.h new file +87 -0
87 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH v2 3/4 MX51: Add video support
Quoted 15 lines · On Wed, 13 Oct 2010 12:17:14 +0200 Stefano Babic <[email protected]> wrote:
Add framebuffer driver for the MX51 processor working on the IPUv3 internal graphic processor. The port is based on the driver found in the kernel delivered by Freescale as part of i.MX BSP:
[kernel 2.6.31 commit
cc4fe714041805997b601fe8e5dd585d8a99297f]Signed-off-by Stefano Babic <[email protected]>---
Changes since V1:
- added precise reference to the kernel version used for porting in the commit message
- correct multiline comments
- drop wrong comments (useful only in the kernel, not in u-boot)
Quoted 6 lines
drivers/video/Makefile | 1 + drivers/video/mxc_ipuv3_fb.c | 644 ++++++++++++++++++++++++++++++++++++++++++ drivers/video/mxcfb.h | 87 ++++++ 3 files changed, 732 insertions(+), 0 deletions(-) create mode 100644 drivers/video/mxc_ipuv3_fb.c create mode 100644 drivers/video/mxcfb.h
Applied to u-boot-video/master after some style fixes and dead code removal. Thanks!
Best regards,
Anatolij
PATCH 2/4 MX51: Add IPU driver for video support
In reply to Stefano BabicDear Stefano Babic,
Quoted 5 lines · In message <[email protected]> you wrote:
The patch is a porting of the IPU Linux driver developed by Freescale to have framebuffer functionalities in u-boot.
Most features are dropped from the original driver and only LCD support is the goal of this porting.
I don't know how close this is to the original Linux driver; eventually you should add a more precise reference to the original version in the commit message here, too.
Quoted 3 lines
drivers/video/ipu.h new file +0
-0@@ -0,0 +1,316 @@
...
drivers/video/ipu.h line 37
Quoted 3 lines
drivers/video/ipu.h new file +3
-0+typedef unsigned char bool ; +#define true 1 +#define false 0
An, no. Can we please drop that.
Quoted 27 lines
drivers/video/ipu.h new file +27
-0+#define IDMA_CHAN_INVALID 0xFF +#define HIGH_RESOLUTION_WIDTH 1024 + +struct clk { +const char *name; +int id; +/* Source clock this clk depends on */ +struct clk *parent; +/* Secondary clock to enable/disable with this clock */ +struct clk *secondary; +/* Current clock rate */ +unsigned long rate; +/* Reference count of clock enable/disable */ +__s8 usecount; +/* Register bit position for clock's enable/disable control. */ +u8 enable_shift; +/* Register address for clock's enable/disable control. */ +void *enable_reg; +u32 flags; +/* Function ptr to recalculate the clock's rate based on parent +clock's rate */ +void (*recalc) (struct clk *); +/* Function ptr to set the clock to a new rate. The rate must match a +supported rate returned from round_rate. Leave blank if clock is not +programmable */ +int (*set_rate) (struct clk *,unsigned long ); +/* Function ptr to round the requested clock rate to the nearest
drivers/video/ipu.h line 75
Quoted 10 lines
drivers/video/ipu.h new file +10
-0+supported rate that is less than or equal to the requested rate. */ +unsigned long (*round_rate) (struct clk *,unsigned long ); +/* Function ptr to enable the clock. Leave blank if clock can not +be gated. */ +int (*enable) (struct clk *); +/* Function ptr to disable the clock. Leave blank if clock can not +be gated. */ +void (*disable) (struct clk *); +/* Function ptr to set the parent clock of the clock. */ +int (*set_parent) (struct clk *,struct clk *);
Incorrect multi-line comment style. Please fix globally. [or is the whole file a verbatim copy of the Linux file?]
drivers/video/ipu.h line 124
Quoted 3 lines
drivers/video/ipu.h new file +3
-0+/* @} */ +/* @name YUV Planar Formats */ +/* @{ */
Oops. What's that?
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de I distrust all systematisers, and avoid them. The will to a system shows a lack of honesty. - Friedrich Wilhelm Nietzsche _G?tzen-D?mmerung [The Twilight of the Idols]_ ``Maxims and Missiles'' no. 26
PATCH 2/4 MX51: Add IPU driver for video support
Quoted 9 lines · Wolfgang Denk
Dear Stefano Babic,
Quoted 5 lines · In message <[email protected]> you wrote:
The patch is a porting of the IPU Linux driver developed by Freescale to have framebuffer functionalities in u-boot.
Most features are dropped from the original driver and only LCD support is the goal of this porting.
Quoted 3 lines
I don't know how close this is to the original Linux driver; eventually you should add a more precise reference to the original version in the commit message here, too.
The original driver is part of the Freescale's kernel for i.MX, based on the vanilla kernel 2.6.31. However, the code was not sent to LKML and it is not part of the kernel mainline.
For this reason and because I dropped a lot of parts that I thought not useful in u-boot, this porting is not so close to the original one. I have already tried to fix all code styling issues, but it seems I missed a lot of them and I have to check them again. And of course, I will add the reference to the original code, too.
Quoted 10 lines
Quoted 4 lines
drivers/video/ipu.h new file +0
-0@@ -0,0 +1,316 @@...
drivers/video/ipu.h line 37
Quoted 3 lines
drivers/video/ipu.h new file +3
-0+typedef unsigned char bool ; +#define true 1 +#define false 0An, no. Can we please drop that.
Yes, this was already in my list to drop. I missed it ;-)
Quoted 3 lines
Incorrect multi-line comment style. Please fix globally. [or is the whole file a verbatim copy of the Linux file?]
No, I will fix them.
Quoted 7 lines
drivers/video/ipu.h line 124
Quoted 5 lines
drivers/video/ipu.h new file +3
-0+/* @} */ +/* @name YUV Planar Formats */ +/* @{ */ Oops. What's that?
A comment in the original code that I cannot understand and I have to drop ;-)
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 2/4 MX51: Add IPU driver for video support
In reply to Stefano BabicThe patch is a porting of the IPU Linux driver developed by Freescale to have framebuffer functionalities in u-boot. The port is based on kernel 2.6.31 commit cc4fe714041805997b601fe8e5dd585d8a99297f, as delivered by Freescale [i.MX BSP].
Most features are dropped from the original driver and only LCD support is the goal of this porting.
---
Changes since V1:
- added precise reference to the kernel version used for porting in the commit message
- correct multiline comments
- drop dummy true/false booleans
arch/arm/include/asm/arch-mx51/crm_regs.h | 11 + drivers/video/ipu.h | 321 +++++++ drivers/video/ipu_common.c | 1183 +++++++++++++++++++++++++ drivers/video/ipu_disp.c | 1359 +++++++++++++++++++++++++++++ drivers/video/ipu_regs.h | 418 +++++++++ 5 files changed, 3292 insertions(+), 0 deletions(-) create mode 100644 drivers/video/ipu.h create mode 100644 drivers/video/ipu_common.c create mode 100644 drivers/video/ipu_disp.c create mode 100644 drivers/video/ipu_regs.h
arch/arm/include/asm/arch-mx51/crm_regs.h +11 -0
@@ -189,4 +189,15 @@ struct mxc_ccm_reg {#define MXC_CCM_CSCDR1_UART_CLK_PODF_OFFSET 0#define MXC_CCM_CSCDR1_UART_CLK_PODF_MASK 0x7 +/* Define the bits in register CCDR */ +#define MXC_CCM_CCDR_IPU_HS_MASK (0x1 << 17) + +/* Define the bits in register CCGRx */ +#define MXC_CCM_CCGR_CG_MASK 0x3 + +#define MXC_CCM_CCGR5_CG5_OFFSET 10 + +/* Define the bits in register CLPCR */ +#define MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS (0x1 << 18) +#endif /* __ARCH_ARM_MACH_MX51_CRM_REGS_H__ */
drivers/video/ipu.h new file +321 -0
321 lines not on this page · raw message
drivers/video/ipu_common.c new file +1183 -0
1,183 lines not on this page · raw message
drivers/video/ipu_disp.c new file +1359 -0
1,359 lines not on this page · raw message
drivers/video/ipu_regs.h new file +418 -0
122 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.7.0.4
Part of the diff is not shown here. View the raw message.
PATCH v2 2/4 MX51: Add IPU driver for video support
Hello Stefano,
Quoted 9 lines · On Wed, 13 Oct 2010 12:16:35 +0200 Stefano Babic <[email protected]> wrote:
The patch is a porting of the IPU Linux driver developed by Freescale to have framebuffer functionalities in u-boot. The port is based on kernel 2.6.31 commit
cc4fe714041805997b601fe8e5dd585d8a99297f, as delivered by Freescale [i.MX BSP].
Most features are dropped from the original driver and only LCD support is the goal of this porting.Signed-off-by Stefano Babic <[email protected]>
What tree is this patch based on? It doesn't apply on current u-boot.git/master:
$ git am ~/u-boot-patch-queue/\[PATCH\ V2\ 2_4\]\ MX51\:\ Add\ IPU\ driver\ for\ video\ support Applying: MX51: Add IPU driver for video support error: arch/arm/include/asm/arch-mx51/crm_regs.h: does not exist in index Patch failed at 0001 MX51: Add IPU driver for video support When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".
Best regards,
Anatolij
PATCH v2 2/4 MX51: Add IPU driver for video support
Quoted 2 lines · Anatolij Gustschin
Hello Stefano,
Hi Anatolij,
Quoted 5 lines
On Wed, 13 Oct 2010 12:16:35 +0200
Stefano Babic <[email protected]> wrote:What tree is this patch based on? It doesn't apply on current u-boot.git/master:
The patch is based on the u-boot tree at the time I sent to ML, in any case on the actual release 2e6e1772c0e34871769be4aef79748fe3e47d953 - in the meantime, several MX patches went to mainline.
The patchset does not apply because the mx51 directories are renamed to MX5, as it is expected to get more patches for other processors of the same family.
Should I rebase them and post again ?
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 2/4 MX51: Add IPU driver for video support
Hi Stefano,
On Thu, 21 Oct 2010 00:10:56 +0200
Stefano Babic <[email protected]> wrote:
...
Quoted 7 lines
Quoted 2 lines
What tree is this patch based on? It doesn't apply on current u-boot.git/master:
The patch is based on the u-boot tree at the time I sent to ML, in any case on the actual release
2e6e1772c0e34871769be4aef79748fe3e47d953- in the meantime, several MX patches went to mainline.
Quoted 5 lines
The patchset does not apply because the mx51 directories are renamed to MX5, as it is expected to get more patches for other processors of the same family.
Should I rebase them and post again ?
I'll fix this patch and you don't need to resend it. But could you please rebase [PATCH 4/4] MX51: Add video support to vision2 board and post it again?
Thanks,
Anatolij
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
PATCH v2 2/4 MX51: Add IPU driver for video support
In reply to Stefano BabicQuoted 16 lines · On Wed, 13 Oct 2010 12:16:35 +0200 Stefano Babic <[email protected]> wrote:
The patch is a porting of the IPU Linux driver developed by Freescale to have framebuffer functionalities in u-boot. The port is based on kernel 2.6.31 commit
cc4fe714041805997b601fe8e5dd585d8a99297f, as delivered by Freescale [i.MX BSP].
Most features are dropped from the original driver and only LCD support is the goal of this porting.Signed-off-by Stefano Babic <[email protected]>---
Changes since V1:
- added precise reference to the kernel version used for porting in the commit message
- correct multiline comments
- drop dummy true/false booleans
Quoted 10 lines
arch/arm/include/asm/arch-mx51/crm_regs.h | 11 + drivers/video/ipu.h | 321 +++++++ drivers/video/ipu_common.c | 1183 +++++++++++++++++++++++++ drivers/video/ipu_disp.c | 1359 +++++++++++++++++++++++++++++ drivers/video/ipu_regs.h | 418 +++++++++ 5 files changed, 3292 insertions(+), 0 deletions(-) create mode 100644 drivers/video/ipu.h create mode 100644 drivers/video/ipu_common.c create mode 100644 drivers/video/ipu_disp.c create mode 100644 drivers/video/ipu_regs.h
Applied to u-boot-video/master after fixing arch-mx51 to arch-mx5. Thanks!
Best regards,
Anatolij
PATCH 1/4 Add linux framebuffer header
In reply to Stefano BabicDear Stefano Babic,
Quoted 9 lines · In message <[email protected]> you wrote:
The patch adds the linux framebuffer header file. As several drivers are ported from Linux, it is easier to reuse the same structures already present in the kernel.
Signed-off-by Stefano Babic <[email protected]>--- include/linux/fb.h | 616 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 616 insertions(+), 0 deletions(-) create mode 100644 include/linux/fb.h
Please include an indication where exactly the code is coming from, as described in the Linux kernel's "SubmittingPatches" document:
| Special note to back-porters: It seems to be a common and useful practise | to insert an indication of the origin of a patch at the top of the commit | message (just after the subject line) to facilitate tracking. For instance, | here's what we see in 2.6-stable : | | Date: Tue May 13 19:10:30 2008 +0000 | | SCSI: libiscsi regression in 2.6.25: fix nop timer handling | | commit 4cf1043593db6a337f10e006c23c69e5fc93e722 upstream | | And here's what appears in 2.4 : | | Date: Tue May 13 22:12:27 2008 +0200 | | wireless, airo: waitbusy() won't delay | | [backport of 2.6 commit b7acbdfbd1f277c1eb23f344f899cfa4cd0bf36a] | | Whatever the format, this information provides a valuable help to people | tracking your trees, and to people trying to trouble-shoot bugs in your | tree.
So please include at least the name of the file in the Linux tree and the exact kenrel version used as a reference in the commit message.
Thanks.
Best regards,
Wolfgang Denk
Signature · 5 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de "Just think, with VLSI we can have 100 ENIACS on a chip!" - Alan Perlis
PATCH v2 1/4 Add linux framebuffer header include/linux/fb.h
In reply to Stefano Babic[port of linux 2.6.34 commit 6a9ee8af344e3bd7dbd61e67037096cdf7f83289]
---
Changes since V1:
- added precise reference to the kernel version used for porting in the commit message
include/linux/fb.h | 616 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 616 insertions(+), 0 deletions(-) create mode 100644 include/linux/fb.h
include/linux/fb.h new file +616 -0
@@ -0,0 +1,616 @@ +#ifndef _LINUX_FB_H +#define _LINUX_FB_H + +#include <linux/types.h> + +/* Definitions of frame buffers */ + +#define FB_MAX 32/* sufficient for now */ + +#define FB_TYPE_PACKED_PIXELS 0/* Packed Pixels */ + +#define FB_VISUAL_MONO01 0/* Monochr. 1=Black 0=White */ +#define FB_VISUAL_MONO10 1/* Monochr. 1=White 0=Black */ +#define FB_VISUAL_TRUECOLOR 2/* True color */ +#define FB_VISUAL_PSEUDOCOLOR 3/* Pseudo color (like atari) */ +#define FB_VISUAL_DIRECTCOLOR 4/* Direct color */ +#define FB_VISUAL_STATIC_PSEUDOCOLOR 5/* Pseudo color readonly */ + +#define FB_ACCEL_NONE 0/* no hardware accelerator */ + +struct fb_fix_screeninfo { +char id[16 ];/* identification string eg "TT Builtin" */ +unsigned long smem_start;/* Start of frame buffer mem */ +/* (physical address) */ +__u32 smem_len;/* Length of frame buffer mem */ +__u32 type;/* see FB_TYPE_* */ +__u32 type_aux;/* Interleave for interleaved Planes */ +__u32 visual;/* see FB_VISUAL_* */ +__u16 xpanstep;/* zero if no hardware panning */ +__u16 ypanstep;/* zero if no hardware panning */ +__u16 ywrapstep;/* zero if no hardware ywrap */ +__u32 line_length;/* length of a line in bytes */ +unsigned long mmio_start;/* Start of Memory Mapped I/O */ +/* (physical address) */ +__u32 mmio_len;/* Length of Memory Mapped I/O */ +__u32 accel;/* Indicate to driver which */ +/* specific chip/card we have */ +__u16 reserved[3 ];/* Reserved for future compatibility */ +}; + +/* +* Interpretation of offset for color fields: All offsets are from the right, +* inside a "pixel" value, which is exactly 'bits_per_pixel' wide (means: you +* can use the offset as right argument to <<). A pixel afterwards is a bit +* stream and is written to video memory as that unmodified. +* +* For pseudocolor: offset and length should be the same for all color +* components. Offset specifies the position of the least significant bit +* of the pallette index in a pixel value. Length indicates the number +* of available palette entries (i.e. # of entries = 1 << length). +*/ +struct fb_bitfield { +__u32 offset;/* beginning of bitfield */ +__u32 length;/* length of bitfield */ +__u32 msb_right; + +}; + +#define FB_NONSTD_HAM 1/* Hold-And-Modify (HAM) */ +#define FB_NONSTD_REV_PIX_IN_B 2/* order of pixels in each byte is reversed */ + +#define FB_ACTIVATE_NOW 0/* set values immediately (or vbl)*/ +#define FB_ACTIVATE_NXTOPEN 1/* activate on next open */ +#define FB_ACTIVATE_TEST 2/* don't set, round up impossible */ +#define FB_ACTIVATE_MASK 15 +/* values */ +#define FB_ACTIVATE_VBL 16/* activate values on next vbl */ +#define FB_CHANGE_CMAP_VBL 32/* change colormap on vbl */ +#define FB_ACTIVATE_ALL 64/* change all VCs on this fb */ +#define FB_ACTIVATE_FORCE 128/* force apply even when no change*/ +#define FB_ACTIVATE_INV_MODE 256/* invalidate videomode */ + +#define FB_SYNC_HOR_HIGH_ACT 1/* horizontal sync high active */ +#define FB_SYNC_VERT_HIGH_ACT 2/* vertical sync high active */ +#define FB_SYNC_EXT 4/* external sync */ +#define FB_SYNC_COMP_HIGH_ACT 8/* composite sync high active */ +#define FB_SYNC_BROADCAST 16/* broadcast video timings */ +/* vtotal = 144d/288n/576i => PAL */ +/* vtotal = 121d/242n/484i => NTSC */ +#define FB_SYNC_ON_GREEN 32/* sync on green */ + +#define FB_VMODE_NONINTERLACED 0/* non interlaced */ +#define FB_VMODE_INTERLACED 1/* interlaced */ +#define FB_VMODE_DOUBLE 2/* double scan */ +#define FB_VMODE_ODD_FLD_FIRST 4/* interlaced: top line first */ +#define FB_VMODE_MASK 255 + +#define FB_VMODE_YWRAP 256/* ywrap instead of panning */ +#define FB_VMODE_SMOOTH_XPAN 512/* smooth xpan possible (internally used) */ +#define FB_VMODE_CONUPDATE 512/* don't update x/yoffset */ + +/* +* Display rotation support +*/ +#define FB_ROTATE_UR 0 +#define FB_ROTATE_CW 1 +#define FB_ROTATE_UD 2 +#define FB_ROTATE_CCW 3 + +#define PICOS2KHZ (a) (1000000000UL/(a)) +#define KHZ2PICOS (a) (1000000000UL/(a)) + +struct fb_var_screeninfo { +__u32 xres;/* visible resolution */ +__u32 yres; +__u32 xres_virtual;/* virtual resolution */ +__u32 yres_virtual; +__u32 xoffset;/* offset from virtual to visible */ +__u32 yoffset;/* resolution */ + +__u32 bits_per_pixel;/* guess what */ +__u32 grayscale;/* != 0 Graylevels instead of colors */ + +struct fb_bitfield red;/* bitfield in fb mem if true color, */ +struct fb_bitfield green;/* else only length is significant */ +struct fb_bitfield blue; +struct fb_bitfield transp;/* transparency */ + +__u32 nonstd;/* != 0 Non standard pixel format */ + +__u32 activate;/* see FB_ACTIVATE_* */ + +__u32 height;/* height of picture in mm */ +__u32 width;/* width of picture in mm */ + +__u32 accel_flags;/* (OBSOLETE) see fb_info.flags */ + +/* Timing: All values in pixclocks, except pixclock (of course) */ +__u32 pixclock;/* pixel clock in ps (pico seconds) */ +__u32 left_margin;/* time from sync to picture */ +__u32 right_margin;/* time from picture to sync */ +__u32 upper_margin;/* time from sync to picture */ +__u32 lower_margin; +__u32 hsync_len;/* length of horizontal sync */ +__u32 vsync_len;/* length of vertical sync */ +__u32 sync;/* see FB_SYNC_* */ +__u32 vmode;/* see FB_VMODE_* */ +__u32 rotate;/* angle we rotate counter clockwise */ +__u32 reserved[5 ];/* Reserved for future compatibility */ +}; + +struct fb_cmap { +__u32 start;/* First entry */ +__u32 len;/* Number of entries */ +__u16 *red;/* Red values */ +__u16 *green; +__u16 *blue; +__u16 *transp;/* transparency, can be NULL */ +}; + +struct fb_con2fbmap { +__u32 console; +__u32 framebuffer; +}; + +/* VESA Blanking Levels */ +#define VESA_NO_BLANKING 0 +#define VESA_VSYNC_SUSPEND 1 +#define VESA_HSYNC_SUSPEND 2 +#define VESA_POWERDOWN 3 + + +enum { +/* screen: unblanked, hsync: on, vsync: on */ +FB_BLANK_UNBLANK =VESA_NO_BLANKING , + +/* screen: blanked, hsync: on, vsync: on */ +FB_BLANK_NORMAL =VESA_NO_BLANKING +1 , + +/* screen: blanked, hsync: on, vsync: off */ +FB_BLANK_VSYNC_SUSPEND =VESA_VSYNC_SUSPEND +1 , + +/* screen: blanked, hsync: off, vsync: on */ +FB_BLANK_HSYNC_SUSPEND =VESA_HSYNC_SUSPEND +1 , + +/* screen: blanked, hsync: off, vsync: off */ +FB_BLANK_POWERDOWN =VESA_POWERDOWN +1 +}; + +#define FB_VBLANK_VBLANKING 0x001/* currently in a vertical blank */ +#define FB_VBLANK_HBLANKING 0x002/* currently in a horizontal blank */ +#define FB_VBLANK_HAVE_VBLANK 0x004/* vertical blanks can be detected */ +#define FB_VBLANK_HAVE_HBLANK 0x008/* horizontal blanks can be detected */ +#define FB_VBLANK_HAVE_COUNT 0x010/* global retrace counter is available */ +#define FB_VBLANK_HAVE_VCOUNT 0x020/* the vcount field is valid */ +#define FB_VBLANK_HAVE_HCOUNT 0x040/* the hcount field is valid */ +#define FB_VBLANK_VSYNCING 0x080/* currently in a vsync */ +#define FB_VBLANK_HAVE_VSYNC 0x100/* verical syncs can be detected */ + +struct fb_vblank { +__u32 flags;/* FB_VBLANK flags */ +__u32 count;/* counter of retraces since boot */ +__u32 vcount;/* current scanline position */ +__u32 hcount;/* current scandot position */ +__u32 reserved[4 ];/* reserved for future compatibility */ +}; + +/* Internal HW accel */ +#define ROP_COPY 0 +#define ROP_XOR 1 + +struct fb_copyarea { +__u32 dx; +__u32 dy; +__u32 width; +__u32 height; +__u32 sx; +__u32 sy; +}; + +struct fb_fillrect { +__u32 dx;/* screen-relative */ +__u32 dy; +__u32 width; +__u32 height; +__u32 color; +__u32 rop; +}; + +struct fb_image { +__u32 dx;/* Where to place image */ +__u32 dy; +__u32 width;/* Size of image */ +__u32 height; +__u32 fg_color;/* Only used when a mono bitmap */ +__u32 bg_color; +__u8 depth;/* Depth of the image */ +const char *data;/* Pointer to image data */ +struct fb_cmap cmap;/* color map info */ +}; + +/* +* hardware cursor control +*/ + +#define FB_CUR_SETIMAGE 0x01 +#define FB_CUR_SETPOS 0x02 +#define FB_CUR_SETHOT 0x04 +#define FB_CUR_SETCMAP 0x08 +#define FB_CUR_SETSHAPE 0x10 +#define FB_CUR_SETSIZE 0x20 +#define FB_CUR_SETALL 0xFF + +struct fbcurpos { +__u16 x, y; +}; + +struct fb_cursor { +__u16 set;/* what to set */ +__u16 enable;/* cursor on/off */ +__u16 rop;/* bitop operation */ +const char *mask;/* cursor mask bits */ +struct fbcurpos hot;/* cursor hot spot */ +struct fb_image image;/* Cursor image */ +}; + +#ifdef CONFIG_FB_BACKLIGHT +/* Settings for the generic backlight code */ +#define FB_BACKLIGHT_LEVELS 128 +#define FB_BACKLIGHT_MAX 0xFF +#endif + +#ifdef __KERNEL__ + +struct vm_area_struct ; +struct fb_info ; +struct device ; +struct file ; + +/* Definitions below are used in the parsed monitor specs */ +#define FB_DPMS_ACTIVE_OFF 1 +#define FB_DPMS_SUSPEND 2 +#define FB_DPMS_STANDBY 4 + +#define FB_DISP_DDI 1 +#define FB_DISP_ANA_700_300 2 +#define FB_DISP_ANA_714_286 4 +#define FB_DISP_ANA_1000_400 8 +#define FB_DISP_ANA_700_000 16 + +#define FB_DISP_MONO 32 +#define FB_DISP_RGB 64 +#define FB_DISP_MULTI 128 +#define FB_DISP_UNKNOWN 256 + +#define FB_SIGNAL_NONE 0 +#define FB_SIGNAL_BLANK_BLANK 1 +#define FB_SIGNAL_SEPARATE 2 +#define FB_SIGNAL_COMPOSITE 4 +#define FB_SIGNAL_SYNC_ON_GREEN 8 +#define FB_SIGNAL_SERRATION_ON 16 + +#define FB_MISC_PRIM_COLOR 1 +#define FB_MISC_1ST_DETAIL 2/* First Detailed Timing is preferred */ +struct fb_chroma { +__u32 redx;/* in fraction of 1024 */ +__u32 greenx; +__u32 bluex; +__u32 whitex; +__u32 redy; +__u32 greeny; +__u32 bluey; +__u32 whitey; +}; + +struct fb_monspecs { +struct fb_chroma chroma; +struct fb_videomode *modedb;/* mode database */ +__u8 manufacturer[4 ];/* Manufacturer */ +__u8 monitor[14 ];/* Monitor String */ +__u8 serial_no[14 ];/* Serial Number */ +__u8 ascii[14 ];/* ? */ +__u32 modedb_len;/* mode database length */ +__u32 model;/* Monitor Model */ +__u32 serial;/* Serial Number - Integer */ +__u32 year;/* Year manufactured */ +__u32 week;/* Week Manufactured */ +__u32 hfmin;/* hfreq lower limit (Hz) */ +__u32 hfmax;/* hfreq upper limit (Hz) */ +__u32 dclkmin;/* pixelclock lower limit (Hz) */ +__u32 dclkmax;/* pixelclock upper limit (Hz) */ +__u16 input;/* display type - see FB_DISP_* */ +__u16 dpms;/* DPMS support - see FB_DPMS_ */ +__u16 signal;/* Signal Type - see FB_SIGNAL_* */ +__u16 vfmin;/* vfreq lower limit (Hz) */ +__u16 vfmax;/* vfreq upper limit (Hz) */ +__u16 gamma;/* Gamma - in fractions of 100 */ +__u16 gtf :1 ;/* supports GTF */ +__u16 misc;/* Misc flags - see FB_MISC_* */ +__u8 version;/* EDID version... */ +__u8 revision;/* ...and revision */ +__u8 max_x;/* Maximum horizontal size (cm) */ +__u8 max_y;/* Maximum vertical size (cm) */ +}; + +struct fb_cmap_user { +__u32 start;/* First entry */ +__u32 len;/* Number of entries */ +__u16 *red;/* Red values */ +__u16 *green; +__u16 *blue; +__u16 *transp;/* transparency, can be NULL */ +}; + +struct fb_image_user { +__u32 dx;/* Where to place image */ +__u32 dy; +__u32 width;/* Size of image */ +__u32 height; +__u32 fg_color;/* Only used when a mono bitmap */ +__u32 bg_color; +__u8 depth;/* Depth of the image */ +const char *data;/* Pointer to image data */ +struct fb_cmap_user cmap;/* color map info */ +}; + +struct fb_cursor_user { +__u16 set;/* what to set */ +__u16 enable;/* cursor on/off */ +__u16 rop;/* bitop operation */ +const char *mask;/* cursor mask bits */ +struct fbcurpos hot;/* cursor hot spot */ +struct fb_image_user image;/* Cursor image */ +}; + +/* +* Register/unregister for framebuffer events +*/ + +/* The resolution of the passed in fb_info about to change */ +#define FB_EVENT_MODE_CHANGE 0x01 +/* The display on this fb_info is beeing suspended, no access to the +* framebuffer is allowed any more after that call returns +*/ +#define FB_EVENT_SUSPEND 0x02 +/* The display on this fb_info was resumed, you can restore the display +* if you own it +*/ +#define FB_EVENT_RESUME 0x03 +/* An entry from the modelist was removed */ +#define FB_EVENT_MODE_DELETE 0x04 +/* A driver registered itself */ +#define FB_EVENT_FB_REGISTERED 0x05 +/* A driver unregistered itself */ +#define FB_EVENT_FB_UNREGISTERED 0x06 +/* CONSOLE-SPECIFIC: get console to framebuffer mapping */ +#define FB_EVENT_GET_CONSOLE_MAP 0x07 +/* CONSOLE-SPECIFIC: set console to framebuffer mapping */ +#define FB_EVENT_SET_CONSOLE_MAP 0x08 +/* A hardware display blank change occured */ +#define FB_EVENT_BLANK 0x09 +/* Private modelist is to be replaced */ +#define FB_EVENT_NEW_MODELIST 0x0A +/* The resolution of the passed in fb_info about to change and +all vc's should be changed */ +#define FB_EVENT_MODE_CHANGE_ALL 0x0B +/* A software display blank change occured */ +#define FB_EVENT_CONBLANK 0x0C +/* Get drawing requirements */ +#define FB_EVENT_GET_REQ 0x0D +/* Unbind from the console if possible */ +#define FB_EVENT_FB_UNBIND 0x0E + +struct fb_event { +struct fb_info *info; +void *data; +}; + +struct fb_blit_caps { +u32 x; +u32 y; +u32 len; +u32 flags; +}; + +/* +* Pixmap structure definition +* +* The purpose of this structure is to translate data +* from the hardware independent format of fbdev to what +* format the hardware needs. +*/ + +#define FB_PIXMAP_DEFAULT 1/* used internally by fbcon */ +#define FB_PIXMAP_SYSTEM 2/* memory is in system RAM */ +#define FB_PIXMAP_IO 4/* memory is iomapped */ +#define FB_PIXMAP_SYNC 256/* set if GPU can DMA */ + +struct fb_pixmap { +u8 *addr;/* pointer to memory */ +u32 size;/* size of buffer in bytes */ +u32 offset;/* current offset to buffer */ +u32 buf_align;/* byte alignment of each bitmap */ +u32 scan_align;/* alignment per scanline */ +u32 access_align;/* alignment per read/write (bits) */ +u32 flags;/* see FB_PIXMAP_* */ +u32 blit_x;/* supported bit block dimensions (1-32)*/ +u32 blit_y;/* Format: blit_x = 1 << (width - 1) */ +/* blit_y = 1 << (height - 1) */ +/* if 0, will be set to 0xffffffff (all)*/ +/* access methods */ +void (*writeio)(struct fb_info *info,void *dst,void *src,unsigned int size); +void (*readio) (struct fb_info *info,void *dst,void *src,unsigned int size); +}; + +#ifdef CONFIG_FB_DEFERRED_IO +struct fb_deferred_io { +/* delay between mkwrite and deferred handler */ +unsigned long delay; +struct mutex lock;/* mutex that protects the page list */ +struct list_head pagelist;/* list of touched pages */ +/* callback */ +void (*deferred_io)(struct fb_info *info,struct list_head *pagelist); +}; +#endif + +/* FBINFO_* = fb_info.flags bit flags */ +#define FBINFO_MODULE 0x0001/* Low-level driver is a module */ +#define FBINFO_HWACCEL_DISABLED 0x0002 +/* When FBINFO_HWACCEL_DISABLED is set: +* Hardware acceleration is turned off. Software implementations +* of required functions (copyarea(), fillrect(), and imageblit()) +* takes over; acceleration engine should be in a quiescent state */ + +/* hints */ +#define FBINFO_PARTIAL_PAN_OK 0x0040/* otw use pan only for double-buffering */ +#define FBINFO_READS_FAST 0x0080/* soft-copy faster than rendering */ + +/* +* A driver may set this flag to indicate that it does want a set_par to be +* called every time when fbcon_switch is executed. The advantage is that with +* this flag set you can really be sure that set_par is always called before +* any of the functions dependant on the correct hardware state or altering +* that state, even if you are using some broken X releases. The disadvantage +* is that it introduces unwanted delays to every console switch if set_par +* is slow. It is a good idea to try this flag in the drivers initialization +* code whenever there is a bug report related to switching between X and the +* framebuffer console. +*/ +#define FBINFO_MISC_ALWAYS_SETPAR 0x40000 + +/* +* Host and GPU endianness differ. +*/ +#define FBINFO_FOREIGN_ENDIAN 0x100000 +/* +* Big endian math. This is the same flags as above, but with different +* meaning, it is set by the fb subsystem depending FOREIGN_ENDIAN flag +* and host endianness. Drivers should not use this flag. +*/ +#define FBINFO_BE_MATH 0x100000 + +struct fb_info { +int node; +int flags; +struct fb_var_screeninfo var;/* Current var */ +struct fb_fix_screeninfo fix;/* Current fix */ +struct fb_monspecs monspecs;/* Current Monitor specs */ +struct fb_pixmap pixmap;/* Image hardware mapper */ +struct fb_pixmap sprite;/* Cursor hardware mapper */ +struct fb_cmap cmap;/* Current cmap */ +struct list_head modelist;/* mode list */ +struct fb_videomode *mode;/* current mode */ + +char *screen_base;/* Virtual address */ +unsigned long screen_size;/* Amount of ioremapped VRAM or 0 */ +void *pseudo_palette;/* Fake palette of 16 colors */ +#define FBINFO_STATE_RUNNING 0 +#define FBINFO_STATE_SUSPENDED 1 +u32 state;/* Hardware state i.e suspend */ +void *fbcon_par;/* fbcon use-only private area */ +/* From here on everything is device dependent */ +void *par; +}; + +#define FBINFO_DEFAULT 0 + +#define FBINFO_FLAG_MODULE FBINFO_MODULE +#define FBINFO_FLAG_DEFAULT FBINFO_DEFAULT + +// This will go away +#if defined(__sparc__) + +/* We map all of our framebuffers such that big-endian accesses +* are what we want, so the following is sufficient. +*/ + +// This will go away +#define fb_readb sbus_readb +#define fb_readw sbus_readw +#define fb_readl sbus_readl +#define fb_readq sbus_readq +#define fb_writeb sbus_writeb +#define fb_writew sbus_writew +#define fb_writel sbus_writel +#define fb_writeq sbus_writeq +#define fb_memset sbus_memset_io + +#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) || defined(__bfin__) + +#define fb_readb __raw_readb +#define fb_readw __raw_readw +#define fb_readl __raw_readl +#define fb_readq __raw_readq +#define fb_writeb __raw_writeb +#define fb_writew __raw_writew +#define fb_writel __raw_writel +#define fb_writeq __raw_writeq +#define fb_memset memset_io + +#else + +#define fb_readb (addr) (*(volatile u8 *) (addr)) +#define fb_readw (addr) (*(volatile u16 *) (addr)) +#define fb_readl (addr) (*(volatile u32 *) (addr)) +#define fb_readq (addr) (*(volatile u64 *) (addr)) +#define fb_writeb (b,addr) (*(volatile u8 *) (addr) = (b)) +#define fb_writew (b,addr) (*(volatile u16 *) (addr) = (b)) +#define fb_writel (b,addr) (*(volatile u32 *) (addr) = (b)) +#define fb_writeq (b,addr) (*(volatile u64 *) (addr) = (b)) +#define fb_memset memset + +#endif + +#define FB_LEFT_POS (p, bpp) (fb_be_math(p) ? (32 - (bpp)) : 0) +#define FB_SHIFT_HIGH (p, val, bits) (fb_be_math(p) ? (val) >> (bits) : \ + (val) << (bits)) +#define FB_SHIFT_LOW (p, val, bits) (fb_be_math(p) ? (val) << (bits) : \ + (val) >> (bits)) +/* drivers/video/fbmon.c */ +#define FB_MAXTIMINGS 0 +#define FB_VSYNCTIMINGS 1 +#define FB_HSYNCTIMINGS 2 +#define FB_DCLKTIMINGS 3 +#define FB_IGNOREMON 0x100 + +#define FB_MODE_IS_UNKNOWN 0 +#define FB_MODE_IS_DETAILED 1 +#define FB_MODE_IS_STANDARD 2 +#define FB_MODE_IS_VESA 4 +#define FB_MODE_IS_CALCULATED 8 +#define FB_MODE_IS_FIRST 16 +#define FB_MODE_IS_FROM_VAR 32 + + +/* drivers/video/fbcmap.c */ + +extern int fb_alloc_cmap (struct fb_cmap *cmap,int len,int transp); +extern void fb_dealloc_cmap (struct fb_cmap *cmap); +extern int fb_copy_cmap (const struct fb_cmap *from,struct fb_cmap *to); +extern int fb_cmap_to_user (const struct fb_cmap *from,struct fb_cmap_user *to); +extern int fb_set_cmap (struct fb_cmap *cmap,struct fb_info *fb_info); +extern int fb_set_user_cmap (struct fb_cmap_user *cmap,struct fb_info *fb_info); +extern const struct fb_cmap *fb_default_cmap (int len); +extern void fb_invert_cmaps (void ); + +struct fb_videomode { +const char *name;/* optional */ +u32 refresh;/* optional */ +u32 xres; +u32 yres; +u32 pixclock; +u32 left_margin; +u32 right_margin; +u32 upper_margin; +u32 lower_margin; +u32 hsync_len; +u32 vsync_len; +u32 sync; +u32 vmode; +u32 flag; +}; + +#endif /* __KERNEL__ */ + +#endif /* _LINUX_FB_H */
Signature · 1 line
1.7.0.4
PATCH v2 1/4 Add linux framebuffer header include/linux/fb.h
Quoted 11 lines · On Wed, 13 Oct 2010 12:14:29 +0200 Stefano Babic <[email protected]> wrote:
[port of linux 2.6.34 commit
6a9ee8af344e3bd7dbd61e67037096cdf7f83289]Signed-off-by Stefano Babic <[email protected]>---
Changes since V1:
- added precise reference to the kernel version used for porting in the commit messageinclude/linux/fb.h | 616 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 616 insertions(+), 0 deletions(-) create mode 100644 include/linux/fb.h
Applied to u-boot-video/master. Fixed some trailing whitespace errors while applying. Thanks!
Best regards,
Anatolij
PATCH v2 1/4 Add linux framebuffer header include/linux/fb.h
In reply to Stefano BabicQuoted 7 lines · Stefano Babic
[port of linux 2.6.34 commit
6a9ee8af344e3bd7dbd61e67037096cdf7f83289]Signed-off-by Stefano Babic <[email protected]>---
Changes since V1:
?- added precise reference to the kernel version used for porting ? in the commit message
Why are we adding this header file?
Signature · 2 lines
Timur Tabi Linux kernel developer at Freescale
PATCH v2 1/4 Add linux framebuffer header include/linux/fb.h
Quoted 10 lines · Timur Tabi
Quoted 7 lines · Stefano Babic
[port of linux 2.6.34 commit
6a9ee8af344e3bd7dbd61e67037096cdf7f83289]Signed-off-by Stefano Babic <[email protected]>---
Changes since V1:
- added precise reference to the kernel version used for porting in the commit messageWhy are we adding this header file?
Hi Timur,
the main reason is to simplify the porting of Linux framebuffer's drivers and to not reinvent new structures to set up the LCD parameters, as well as avoiding to hard-coding their values as some drivers currently do (I can point to the mx3fb.c driver for MX31).
IMHO using the fb.h makes a reference to a documented (in linux) header file, that it is easier to understand for someone adding a new custom board.
I have checked now and I see that some other drivers are requiring these kind of stuctures: the fsl_diu.c for mpc512x has a custom header file ("board/freescale/common/fsl_diu_fb.h"), where a couple of these structures are defined from Linux and that are part of fb.h. Really there is nothing in this header that is suitable only for Freescale's board, but it points to the fact that a general header is required.
Then, as it is supposed other drivers can have the same requirements, why do not take the header directly from Linux instead of redefining the same structures again ?
Stefano
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de =====================================================================
PATCH v2 1/4 Add linux framebuffer header include/linux/fb.h
Quoted 6 lines · Stefano Babic
I have checked now and I see that some other drivers are requiring these kind of stuctures: the
fsl_diu.cfor mpc512x has a custom header file ("board/freescale/common/fsl_diu_fb.h"), where a couple of these structures are defined from Linux and that are part offb.h. Really there is nothing in this header that is suitable only for Freescale's board, but it points to the fact that a general header is required.
So would you expect fsl_diu.c to be modified to use the new header files?
Signature · 2 lines
Timur Tabi Linux kernel developer
PATCH v2 1/4 Add linux framebuffer header include/linux/fb.h
Dear Timur Tabi,
Quoted 9 lines · In message <[email protected]> you wrote:
Quoted 6 lines · Stefano Babic
I have checked now and I see that some other drivers are requiring these kind of stuctures: the
fsl_diu.cfor mpc512x has a custom header file ("board/freescale/common/fsl_diu_fb.h"), where a couple of these structures are defined from Linux and that are part offb.h. Really there is nothing in this header that is suitable only for Freescale's board, but it points to the fact that a general header is required.So would you expect
fsl_diu.cto be modified to use the new header files?
Yes, please.
Best regards,
Wolfgang Denk
Signature · 7 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Carelessly planned projects take three times longer to complete than expected. Carefully planned projects take four times longer to complete than expected, mostly because the planners expect their planning to reduce the time it takes.
PATCH v2 4/4 MX51: Add video support to vision2 board
In reply to Stefano BabicThe patch adds support for LCD to the vision board.
--- board/ttcontrol/vision2/vision2.c | 69 +++++++++++++++++++++++++++++++++++++ include/configs/vision2.h | 14 +++++++ 2 files changed, 83 insertions(+), 0 deletions(-)
board/ttcontrol/vision2/vision2.c +69 -0
@@ -37,14 +37,34 @@#include <fsl_esdhc.h> #include <fsl_pmic.h> #include <mc13892.h> +#include <linux/fb.h> DECLARE_GLOBAL_DATA_PTR ;static u32 system_rev; +extern int mx51_fb_init (struct fb_videomode *mode); +#ifdef CONFIG_HW_WATCHDOG #include <watchdog.h> +static struct fb_videomode nec_nl6448bc26_09c = { +"NEC_NL6448BC26-09C" , +60 ,/* Refresh */ +640 ,/* xres */ +480 ,/* yres */ +37650 ,/* pixclock = 26.56Mhz */ +48 ,/* left margin */ +16 ,/* right margin */ +31 ,/* upper margin */ +12 ,/* lower margin */ +96 ,/* hsync-len */ +2 ,/* vsync-len */ +0 ,/* sync */ +FB_VMODE_NONINTERLACED ,/* vmode */ +0 ,/* flag */ +}; +void hw_watchdog_reset (void ) {int val;
@@ -423,6 +443,9 @@ static void setup_gpios(void)mxc_request_iomux (MX51_PIN_CSPI1_RDY ,IOMUX_CONFIG_ALT3 );mxc_iomux_set_pad (MX51_PIN_CSPI1_RDY ,0x82 ); +/* PWM Output GPIO1_2 */ +mxc_request_iomux (MX51_PIN_GPIO1_2 ,IOMUX_CONFIG_ALT1 ); +/* * Set GPIO1_4 to high and output; it is used to reset * the system on reboot
@@ -630,6 +653,34 @@ int board_early_init_f(void)return 0 ; } +static void backlight (int on) +{ +if (on) { +mxc_gpio_set (65 ,1 ); +udelay (10000 ); +mxc_gpio_set (68 ,1 ); + }else { +mxc_gpio_set (65 ,0 ); +mxc_gpio_set (68 ,0 ); + } +} + +void lcd_enable (void ) +{ +int ret; + +mxc_request_iomux (MX51_PIN_DI1_PIN2 ,IOMUX_CONFIG_ALT0 ); +mxc_request_iomux (MX51_PIN_DI1_PIN3 ,IOMUX_CONFIG_ALT0 ); + +mxc_gpio_set (2 ,1 ); +mxc_request_iomux (MX51_PIN_GPIO1_2 ,IOMUX_CONFIG_ALT0 ); + + ret =mx51_fb_init (&nec_nl6448bc26_09c); +if (ret) { +puts ("LCD cannot be configured\n" ); + } +} +int board_init (void ) {#ifdef CONFIG_SYS_ARM_WITHOUT_RELOC
@@ -709,3 +760,21 @@ int checkboard(void)return 0 ; } +int do_vision_lcd (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) +{ +int on; + +if (argc <2 ) +return cmd_usage (cmdtp); + + on = (strcmp (argv[1 ],"on" ) ==0 ); +backlight (on); + +return 0 ; +} + +U_BOOT_CMD ( + lcdbl,CONFIG_SYS_MAXARGS ,1 , do_vision_lcd, +"Vision2 Backlight" , +"lcdbl [on|off]\n" +);
include/configs/vision2.h +14 -0
@@ -211,4 +211,18 @@#define CONFIG_SYS_NO_FLASH +/* +* Framebuffer and LCD +*/ +#define CONFIG_PREBOOT +#define CONFIG_LCD +#define CONFIG_VIDEO_MX5 +#define CONFIG_SYS_CONSOLE_ENV_OVERWRITE +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define LCD_BPP LCD_COLOR16 +#define CONFIG_SPLASH_SCREEN +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP +#endif /* __CONFIG_H */
Signature · 1 line
1.7.1
PATCH v2 4/4 MX51: Add video support to vision2 board
Hi Stefano,
Quoted 7 lines · On Thu, 21 Oct 2010 10:34:39 +0200 Stefano Babic <[email protected]> wrote:
The patch adds support for LCD to the vision board.
Signed-off-by Stefano Babic <[email protected]>--- board/ttcontrol/vision2/vision2.c | 69 +++++++++++++++++++++++++++++++++++++ include/configs/vision2.h | 14 +++++++ 2 files changed, 83 insertions(+), 0 deletions(-)
Applied to u-boot-video/master after some style fixes. Thanks for rebasing!
Best regards,
Anatolij