aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRandy.Dunlap <rdunlap@xenotime.net>2005-11-07 04:00:28 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 10:53:49 -0500
commite65c0850ae811a53554e1abe71627fba1261cfc7 (patch)
tree5d9f3193b9c2a6f836a3c6acec004f2fef4feff9
parent80d188a643b0f550a2aaedf7bf4dd1abd86cfc45 (diff)
[PATCH] framebuffer: add some help text in Kconfig
Frame buffer driver help text changes: - Move S3 Trio next to S3 Savage; - add or clarify help text for several FB drivers; - add help text for FB console; - add help text for bootup logos; Acked-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat
-rw-r--r--drivers/video/Kconfig17
-rw-r--r--drivers/video/console/Kconfig2
-rw-r--r--drivers/video/logo/Kconfig2
3 files changed, 14 insertions, 7 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7192b770bfb6..564881ff1b2c 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -182,6 +182,9 @@ config FB_CLPS711X
182 select FB_CFB_COPYAREA 182 select FB_CFB_COPYAREA
183 select FB_CFB_IMAGEBLIT 183 select FB_CFB_IMAGEBLIT
184 select FB_SOFT_CURSOR 184 select FB_SOFT_CURSOR
185 help
186 Say Y to enable the Framebuffer driver for the CLPS7111 and
187 EP7212 processors.
185 188
186config FB_SA1100 189config FB_SA1100
187 bool "SA-1100 LCD support" 190 bool "SA-1100 LCD support"
@@ -405,7 +408,7 @@ config FB_CT65550
405 65550 graphics chip in PowerBooks. 408 65550 graphics chip in PowerBooks.
406 409
407config FB_ASILIANT 410config FB_ASILIANT
408 bool "Chips 69000 display support" 411 bool "Asiliant (Chips) 69000 display support"
409 depends on (FB = y) && PCI 412 depends on (FB = y) && PCI
410 select FB_CFB_FILLRECT 413 select FB_CFB_FILLRECT
411 select FB_CFB_COPYAREA 414 select FB_CFB_COPYAREA
@@ -422,12 +425,6 @@ config FB_IMSTT
422 The IMS Twin Turbo is a PCI-based frame buffer card bundled with 425 The IMS Twin Turbo is a PCI-based frame buffer card bundled with
423 many Macintosh and compatible computers. 426 many Macintosh and compatible computers.
424 427
425config FB_S3TRIO
426 bool "S3 Trio display support"
427 depends on (FB = y) && PPC && BROKEN
428 help
429 If you have a S3 Trio say Y. Say N for S3 Virge.
430
431config FB_VGA16 428config FB_VGA16
432 tristate "VGA 16-color graphics support" 429 tristate "VGA 16-color graphics support"
433 depends on FB && (X86 || PPC) 430 depends on FB && (X86 || PPC)
@@ -1047,6 +1044,12 @@ config FB_ATY_GX
1047 is at 1044 is at
1048 <http://support.ati.com/products/pc/mach64/graphics_xpression.html>. 1045 <http://support.ati.com/products/pc/mach64/graphics_xpression.html>.
1049 1046
1047config FB_S3TRIO
1048 bool "S3 Trio display support"
1049 depends on (FB = y) && PPC && BROKEN
1050 help
1051 If you have a S3 Trio say Y. Say N for S3 Virge.
1052
1050config FB_SAVAGE 1053config FB_SAVAGE
1051 tristate "S3 Savage support" 1054 tristate "S3 Savage support"
1052 depends on FB && PCI && EXPERIMENTAL 1055 depends on FB && PCI && EXPERIMENTAL
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 6a9ae2b3d1ab..81d44995f9eb 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -98,6 +98,8 @@ config FRAMEBUFFER_CONSOLE
98 tristate "Framebuffer Console support" 98 tristate "Framebuffer Console support"
99 depends on FB 99 depends on FB
100 select CRC32 100 select CRC32
101 help
102 Low-level framebuffer-based console driver.
101 103
102config STI_CONSOLE 104config STI_CONSOLE
103 tristate "STI text console" 105 tristate "STI text console"
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 3e9ccf370ab2..8cb7fb4db441 100644
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -7,6 +7,8 @@ menu "Logo configuration"
7config LOGO 7config LOGO
8 bool "Bootup logo" 8 bool "Bootup logo"
9 depends on FB || SGI_NEWPORT_CONSOLE 9 depends on FB || SGI_NEWPORT_CONSOLE
10 help
11 Enable and select frame buffer bootup logos.
10 12
11config LOGO_LINUX_MONO 13config LOGO_LINUX_MONO
12 bool "Standard black and white Linux logo" 14 bool "Standard black and white Linux logo"
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-06 13:46:23 -0400
div class='alt'>
153
154
155

156

157
158
159
160
161
162
163

164
















                                                                       

                        
                            




                                                    

                                         

































                                                         

                                              
 

                                            
                                            



                                            

                                            
                                            
                                            
                                            
 


                                            
                                            
 






                           


                   



                                
 

                                                           
 
                          


                    
                                        




                                                              
 
                                     


                     






                                              
 
                                           
                                
 

                                                             

                                                                  
 
                                        

  

                                                                 
                                              
                                                  


                                                


                                                                            


                                                     
                                           



                                                                            
                                               


                                                          
                                          






                                                                     
      
/*
 *  tifm.h - TI FlashMedia driver
 *
 *  Copyright (C) 2006 Alex Dubov <oakad@yahoo.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 *
 */

#ifndef _TIFM_H
#define _TIFM_H

#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/workqueue.h>

/* Host registers (relative to pci base address): */
enum {
	FM_SET_INTERRUPT_ENABLE   = 0x008,
	FM_CLEAR_INTERRUPT_ENABLE = 0x00c,
	FM_INTERRUPT_STATUS       = 0x014
};

/* Socket registers (relative to socket base address): */
enum {
	SOCK_CONTROL                   = 0x004,
	SOCK_PRESENT_STATE             = 0x008,
	SOCK_DMA_ADDRESS               = 0x00c,
	SOCK_DMA_CONTROL               = 0x010,
	SOCK_DMA_FIFO_INT_ENABLE_SET   = 0x014,
	SOCK_DMA_FIFO_INT_ENABLE_CLEAR = 0x018,
	SOCK_DMA_FIFO_STATUS           = 0x020,
	SOCK_FIFO_CONTROL              = 0x024,
	SOCK_FIFO_PAGE_SIZE            = 0x028,
	SOCK_MMCSD_COMMAND             = 0x104,
	SOCK_MMCSD_ARG_LOW             = 0x108,
	SOCK_MMCSD_ARG_HIGH            = 0x10c,
	SOCK_MMCSD_CONFIG              = 0x110,
	SOCK_MMCSD_STATUS              = 0x114,
	SOCK_MMCSD_INT_ENABLE          = 0x118,
	SOCK_MMCSD_COMMAND_TO          = 0x11c,
	SOCK_MMCSD_DATA_TO             = 0x120,
	SOCK_MMCSD_DATA                = 0x124,
	SOCK_MMCSD_BLOCK_LEN           = 0x128,
	SOCK_MMCSD_NUM_BLOCKS          = 0x12c,
	SOCK_MMCSD_BUFFER_CONFIG       = 0x130,
	SOCK_MMCSD_SPI_CONFIG          = 0x134,
	SOCK_MMCSD_SDIO_MODE_CONFIG    = 0x138,
	SOCK_MMCSD_RESPONSE            = 0x144,
	SOCK_MMCSD_SDIO_SR             = 0x164,
	SOCK_MMCSD_SYSTEM_CONTROL      = 0x168,
	SOCK_MMCSD_SYSTEM_STATUS       = 0x16c,
	SOCK_MS_COMMAND                = 0x184,
	SOCK_MS_DATA                   = 0x188,
	SOCK_MS_STATUS                 = 0x18c,
	SOCK_MS_SYSTEM                 = 0x190,
	SOCK_FIFO_ACCESS               = 0x200
};

#define TIFM_CTRL_LED             0x00000040
#define TIFM_CTRL_FAST_CLK        0x00000100
#define TIFM_CTRL_POWER_MASK      0x00000007

#define TIFM_SOCK_STATE_OCCUPIED  0x00000008
#define TIFM_SOCK_STATE_POWERED   0x00000080

#define TIFM_FIFO_ENABLE          0x00000001
#define TIFM_FIFO_READY           0x00000001
#define TIFM_FIFO_MORE            0x00000008
#define TIFM_FIFO_INT_SETALL      0x0000ffff
#define TIFM_FIFO_INTMASK         0x00000005

#define TIFM_DMA_RESET            0x00000002
#define TIFM_DMA_TX               0x00008000
#define TIFM_DMA_EN               0x00000001
#define TIFM_DMA_TSIZE            0x0000007f

#define TIFM_TYPE_XD 1
#define TIFM_TYPE_MS 2
#define TIFM_TYPE_SD 3

struct tifm_device_id {
	unsigned char type;
};

struct tifm_driver;
struct tifm_dev {
	char __iomem  *addr;
	spinlock_t    lock;
	unsigned char type;
	unsigned int  socket_id;

	void          (*card_event)(struct tifm_dev *sock);
	void          (*data_event)(struct tifm_dev *sock);

	struct device dev;
};

struct tifm_driver {
	struct tifm_device_id *id_table;
	int                   (*probe)(struct tifm_dev *dev);
	void                  (*remove)(struct tifm_dev *dev);
	int                   (*suspend)(struct tifm_dev *dev,
					 pm_message_t state);
	int                   (*resume)(struct tifm_dev *dev);

	struct device_driver  driver;
};

struct tifm_adapter {
	char __iomem        *addr;
	spinlock_t          lock;
	unsigned int        irq_status;
	unsigned int        socket_change_set;
	unsigned int        id;
	unsigned int        num_sockets;
	struct completion   *finish_me;

	struct work_struct  media_switcher;
	struct device	    dev;

	void                (*eject)(struct tifm_adapter *fm,
				     struct tifm_dev *sock);
	int                 (*has_ms_pif)(struct tifm_adapter *fm,
					  struct tifm_dev *sock);

	struct tifm_dev     *sockets[0];
};

struct tifm_adapter *tifm_alloc_adapter(unsigned int num_sockets,
					struct device *dev);
int tifm_add_adapter(struct tifm_adapter *fm);
void tifm_remove_adapter(struct tifm_adapter *fm);
void tifm_free_adapter(struct tifm_adapter *fm);

void tifm_free_device(struct device *dev);
struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm, unsigned int id,
				   unsigned char type);

int tifm_register_driver(struct tifm_driver *drv);
void tifm_unregister_driver(struct tifm_driver *drv);
void tifm_eject(struct tifm_dev *sock);
int tifm_has_ms_pif(struct tifm_dev *sock);
int tifm_map_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents,
		int direction);
void tifm_unmap_sg(struct tifm_dev *sock, struct scatterlist *sg, int nents,
		   int direction);
void tifm_queue_work(struct work_struct *work);

static inline void *tifm_get_drvdata(struct tifm_dev *dev)
{
	return dev_get_drvdata(&dev->dev);
}

static inline void tifm_set_drvdata(struct tifm_dev *dev, void *data)
{
	dev_set_drvdata(&dev->dev, data);
}

#endif
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-06 13:46:23 -0400