Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 294331
b: refs/heads/master
c: 8f5e35a
h: refs/heads/master
i:
  294329: 5eed9ab
  294327: bd82097
v: v3
  • Loading branch information
Tomi Valkeinen committed Feb 23, 2012
1 parent f543783 commit 78869bc
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 82d5b3e2319c9d1ea46c95b1e8b0db66d6f05a84
refs/heads/master: 8f5e35a7942afe70eb0ba0d8193801b7989ae03a
25 changes: 25 additions & 0 deletions trunk/drivers/video/omap/omapfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,31 @@

struct omapfb_device;

#ifdef CONFIG_ARCH_OMAP1
#define OMAPFB_PLANE_NUM 1
#else
#define OMAPFB_PLANE_NUM 3
#endif

struct omapfb_mem_region {
u32 paddr;
void __iomem *vaddr;
unsigned long size;
u8 type; /* OMAPFB_PLANE_MEM_* */
enum omapfb_color_format format;/* OMAPFB_COLOR_* */
unsigned format_used:1; /* Must be set when format is set.
* Needed b/c of the badly chosen 0
* base for OMAPFB_COLOR_* values
*/
unsigned alloc:1; /* allocated by the driver */
unsigned map:1; /* kernel mapped by the driver */
};

struct omapfb_mem_desc {
int region_cnt;
struct omapfb_mem_region region[OMAPFB_PLANE_NUM];
};

struct lcd_panel {
const char *name;
int config; /* TFT/STN, signal inversion */
Expand Down
25 changes: 0 additions & 25 deletions trunk/include/linux/omapfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -222,31 +222,6 @@ struct omapfb_display_info {

#include <plat/board.h>

#ifdef CONFIG_ARCH_OMAP1
#define OMAPFB_PLANE_NUM 1
#else
#define OMAPFB_PLANE_NUM 3
#endif

struct omapfb_mem_region {
u32 paddr;
void __iomem *vaddr;
unsigned long size;
u8 type; /* OMAPFB_PLANE_MEM_* */
enum omapfb_color_format format;/* OMAPFB_COLOR_* */
unsigned format_used:1; /* Must be set when format is set.
* Needed b/c of the badly chosen 0
* base for OMAPFB_COLOR_* values
*/
unsigned alloc:1; /* allocated by the driver */
unsigned map:1; /* kernel mapped by the driver */
};

struct omapfb_mem_desc {
int region_cnt;
struct omapfb_mem_region region[OMAPFB_PLANE_NUM];
};

struct omapfb_platform_data {
struct omap_lcd_config lcd;
};
Expand Down

0 comments on commit 78869bc

Please sign in to comment.