Commit 2c518959 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://gitorious.org/linux-omap-dss2/linux 

* 'for-linus' of git://gitorious.org/linux-omap-dss2/linux:
  OMAP: DSS2: don't power off a panel twice
  OMAP: DSS2: OMAPFB: Allow usage of def_vrfb only for omap2,3
  OMAP: DSS2: OMAPFB: make VRFB depends on OMAP2,3
  OMAP: DSS2: OMAPFB: Allow FB_OMAP2 to build without VRFB
  arm/omap: simplify conditional
  OMAP: DSS2: DSI: Remove extra iounmap in error path
  OMAP: DSS2: Use dss_features framework on DSS2 code
  OMAP: DSS2: Introduce dss_features files
  video/omap: remove mux.h include
  ARM: omap/fb: move get_fbmem_region() to .init.text
  ARM: omap/fb: move omapfb_reserve_sram to .init.text
  ARM: omap/fb: move omap_init_fb to .init.text
  OMAP: DSS2: OMAPFB: swap front and back porches for both hsync and vsync
  OMAP: DSS2: make filter coefficient tables human readable
  OMAP: DSS2: Add SPI dependency to Kconfig of ACX565AKM panel
parents 4f687603 18016e35

arch/arm/plat-omap/fb.c

+7 −7
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static int fbmem_region_reserved(unsigned long start, size_t size) 
 * Get the region_idx`th region from board config/ATAG and convert it to

 * our internal format.

 */

static int get_fbmem_region(int region_idx, struct omapfb_mem_region *rg)

static int __init get_fbmem_region(int region_idx, struct omapfb_mem_region *rg)

{

	const struct omap_fbmem_config	*conf;

	u32				paddr;
@@ -128,7 +128,7 @@ static int set_fbmem_region_type(struct omapfb_mem_region *rg, int mem_type, 
	 * type = 0 && paddr = 0, a default don't care case maps to

	 * the SDRAM type.

	 */

	if (rg->type || (!rg->type && !rg->paddr))

	if (rg->type || !rg->paddr)

		return 0;

	if (ranges_overlap(rg->paddr, rg->size, mem_start, mem_size)) {

		rg->type = mem_type;
@@ -260,7 +260,7 @@ void __init omapfb_reserve_sdram_memblock(void) 
 * this point, since the driver built as a module would have problem with

 * freeing / reallocating the regions.

 */

unsigned long omapfb_reserve_sram(unsigned long sram_pstart,

unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart,

				  unsigned long sram_vstart,

				  unsigned long sram_size,

				  unsigned long pstart_avail,
@@ -334,7 +334,7 @@ void omapfb_set_ctrl_platform_data(void *data) 
	omapfb_config.ctrl_platform_data = data;

}



static inline int omap_init_fb(void)

static int __init omap_init_fb(void)

{

	const struct omap_lcd_config *conf;
@@ -379,7 +379,7 @@ void omapfb_set_platform_data(struct omapfb_platform_data *data) 
	omapfb_config = *data;

}



static inline int omap_init_fb(void)

static int __init omap_init_fb(void)

{

	return platform_device_register(&omap_fb_device);

}
@@ -390,7 +390,7 @@ void omapfb_reserve_sdram_memblock(void) 
{

}



unsigned long omapfb_reserve_sram(unsigned long sram_pstart,

unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart,

				  unsigned long sram_vstart,

				  unsigned long sram_size,

				  unsigned long start_avail,
@@ -409,7 +409,7 @@ void omapfb_reserve_sdram_memblock(void) 
{

}



unsigned long omapfb_reserve_sram(unsigned long sram_pstart,

unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart,

				  unsigned long sram_vstart,

				  unsigned long sram_size,

				  unsigned long start_avail,

arch/arm/plat-omap/include/plat/display.h

+0 −31
Original line number Diff line number Diff line
@@ -81,37 +81,6 @@ enum omap_color_mode { 
	OMAP_DSS_COLOR_ARGB32	= 1 << 11, /* ARGB32 */

	OMAP_DSS_COLOR_RGBA32	= 1 << 12, /* RGBA32 */

	OMAP_DSS_COLOR_RGBX32	= 1 << 13, /* RGBx32 */



	OMAP_DSS_COLOR_GFX_OMAP2 =

		OMAP_DSS_COLOR_CLUT1 | OMAP_DSS_COLOR_CLUT2 |

		OMAP_DSS_COLOR_CLUT4 | OMAP_DSS_COLOR_CLUT8 |

		OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_RGB16 |

		OMAP_DSS_COLOR_RGB24U | OMAP_DSS_COLOR_RGB24P,



	OMAP_DSS_COLOR_VID_OMAP2 =

		OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U |

		OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_YUV2 |

		OMAP_DSS_COLOR_UYVY,



	OMAP_DSS_COLOR_GFX_OMAP3 =

		OMAP_DSS_COLOR_CLUT1 | OMAP_DSS_COLOR_CLUT2 |

		OMAP_DSS_COLOR_CLUT4 | OMAP_DSS_COLOR_CLUT8 |

		OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_ARGB16 |

		OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U |

		OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_ARGB32 |

		OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32,



	OMAP_DSS_COLOR_VID1_OMAP3 =

		OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_RGB16 |

		OMAP_DSS_COLOR_RGB24U | OMAP_DSS_COLOR_RGB24P |

		OMAP_DSS_COLOR_YUV2 | OMAP_DSS_COLOR_UYVY,



	OMAP_DSS_COLOR_VID2_OMAP3 =

		OMAP_DSS_COLOR_RGB12U | OMAP_DSS_COLOR_ARGB16 |

		OMAP_DSS_COLOR_RGB16 | OMAP_DSS_COLOR_RGB24U |

		OMAP_DSS_COLOR_RGB24P | OMAP_DSS_COLOR_YUV2 |

		OMAP_DSS_COLOR_UYVY | OMAP_DSS_COLOR_ARGB32 |

		OMAP_DSS_COLOR_RGBA32 | OMAP_DSS_COLOR_RGBX32,

};



enum omap_lcd_display_type {

arch/arm/plat-omap/include/plat/vrfb.h

+16 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ struct vrfb { 
	bool yuv_mode;

};



#ifdef CONFIG_OMAP2_VRFB

extern int omap_vrfb_request_ctx(struct vrfb *vrfb);

extern void omap_vrfb_release_ctx(struct vrfb *vrfb);

extern void omap_vrfb_adjust_size(u16 *width, u16 *height,
@@ -47,4 +48,19 @@ extern void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr, 
extern int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot);

extern void omap_vrfb_restore_context(void);



#else

static inline int omap_vrfb_request_ctx(struct vrfb *vrfb) { return 0; }

static inline void omap_vrfb_release_ctx(struct vrfb *vrfb) {}

static inline void omap_vrfb_adjust_size(u16 *width, u16 *height,

		u8 bytespp) {}

static inline u32 omap_vrfb_min_phys_size(u16 width, u16 height, u8 bytespp)

		{ return 0; }

static inline u16 omap_vrfb_max_height(u32 phys_size, u16 width, u8 bytespp)

		{ return 0; }

static inline void omap_vrfb_setup(struct vrfb *vrfb, unsigned long paddr,

		u16 width, u16 height, unsigned bytespp, bool yuv_mode) {}

static inline int omap_vrfb_map_angle(struct vrfb *vrfb, u16 height, u8 rot)

		{ return 0; }

static inline void omap_vrfb_restore_context(void) {}

#endif

#endif /* __VRFB_H */

drivers/video/omap/lcd_omap3beagle.c

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <linux/gpio.h>

#include <linux/i2c/twl.h>



#include <plat/mux.h>

#include <plat/mux.h>

#include <asm/mach-types.h>



#include "omapfb.h"

drivers/video/omap2/displays/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ config PANEL_TPO_TD043MTEA1 


config PANEL_ACX565AKM

	tristate "ACX565AKM Panel"

	depends on OMAP2_DSS_SDI

	depends on OMAP2_DSS_SDI && SPI

	select BACKLIGHT_CLASS_DEVICE

	help

	  This is the LCD panel used on Nokia N900

CRA Git | Maintained and supported by SUSTech CRA and CCSE