Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e6720fb authored by Russell King's avatar Russell King
Browse files

FB: sa1100: move machine inf structures to <video/sa1100fb.h> 



Move the LCD data structures to an include file which can be shared
with the board code in arch/arm/mach-sa1100.

Acked-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 531060fc

drivers/video/sa1100fb.c

+5 −1
Original line number Original line Diff line number Diff line
@@ -178,6 +178,8 @@ 
#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/io.h>

#include <linux/io.h>





#include <video/sa1100fb.h>



#include <mach/hardware.h>

#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <mach/assabet.h>

#include <mach/assabet.h>
@@ -1388,6 +1390,8 @@ static struct sa1100fb_info * __devinit sa1100fb_init_fbinfo(struct device *dev) 
	fbi->rgb[RGB_8]		= &rgb_8;

	fbi->rgb[RGB_8]		= &rgb_8;

	fbi->rgb[RGB_16]	= &def_rgb_16;

	fbi->rgb[RGB_16]	= &def_rgb_16;





	inf = dev->platform_data;

	if (!inf)

		inf = sa1100fb_get_machine_info(fbi);

		inf = sa1100fb_get_machine_info(fbi);





	/*

	/*

drivers/video/sa1100fb.h

+0 −42
Original line number Original line Diff line number Diff line
@@ -10,48 +10,6 @@ 
 * for more details.

 * for more details.

 */

 */





#define RGB_4	0

#define RGB_8	1

#define RGB_16	2

#define NR_RGB	3



/* These are the bitfields for each display depth that we support. */

struct sa1100fb_rgb {

	struct fb_bitfield	red;

	struct fb_bitfield	green;

	struct fb_bitfield	blue;

	struct fb_bitfield	transp;

};



/* This structure describes the machine which we are running on. */

struct sa1100fb_mach_info {

	u_long		pixclock;



	u_short		xres;

	u_short		yres;



	u_char		bpp;

	u_char		hsync_len;

	u_char		left_margin;

	u_char		right_margin;



	u_char		vsync_len;

	u_char		upper_margin;

	u_char		lower_margin;

	u_char		sync;



	u_int		cmap_greyscale:1,

			cmap_inverse:1,

			cmap_static:1,

			unused:29;



	u_int		lccr0;

	u_int		lccr3;



	/* Overrides for the default RGB maps */

	const struct sa1100fb_rgb *rgb[NR_RGB];

};



/* Shadows for LCD controller registers */

/* Shadows for LCD controller registers */

struct sa1100fb_lcd_reg {

struct sa1100fb_lcd_reg {

	unsigned long lccr0;

	unsigned long lccr0;

include/video/sa1100fb.h

0 → 100644
+59 −0
Original line number Original line Diff line number Diff line 
/*

 * StrongARM 1100 LCD Controller Frame Buffer Device

 *

 * Copyright (C) 1999 Eric A. Thomas

 *  Based on acornfb.c Copyright (C) Russell King.

 *  

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file COPYING in the main directory of this archive

 * for more details.

 */

#ifndef _VIDEO_SA1100FB_H

#define _VIDEO_SA1100FB_H



#include <linux/fb.h>

#include <linux/types.h>



#define RGB_4	0

#define RGB_8	1

#define RGB_16	2

#define NR_RGB	3



/* These are the bitfields for each display depth that we support. */

struct sa1100fb_rgb {

	struct fb_bitfield	red;

	struct fb_bitfield	green;

	struct fb_bitfield	blue;

	struct fb_bitfield	transp;

};



/* This structure describes the machine which we are running on. */

struct sa1100fb_mach_info {

	u_long		pixclock;



	u_short		xres;

	u_short		yres;



	u_char		bpp;

	u_char		hsync_len;

	u_char		left_margin;

	u_char		right_margin;



	u_char		vsync_len;

	u_char		upper_margin;

	u_char		lower_margin;

	u_char		sync;



	u_int		cmap_greyscale:1,

			cmap_inverse:1,

			cmap_static:1,

			unused:29;



	u_int		lccr0;

	u_int		lccr3;



	/* Overrides for the default RGB maps */

	const struct sa1100fb_rgb *rgb[NR_RGB];

};



#endif