Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 08:01:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'next' of git://git.denx.de/u-boot-video into next

Browse source
This commit is contained in:
Wolfgang Denk 2010-06-17 22:53:03 +02:00
commit ec6baf53f7
5 changed files with 125 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/powerpc/cpu/mpc512x/diu.c
View file

@ -179,18 +179,4 @@ void *video_hw_init(void)
return (void *)pGD;
}
/**
* Set the LUT
*
* @index: color number
* @r: red
* @b: blue
* @g: green
*/
void video_set_lut
(unsigned int index, unsigned char r, unsigned char g, unsigned char b)
{
return;
}
#endif /* defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) */

9
board/freescale/mpc8610hpcd/mpc8610hpcd_diu.c
View file

@ -183,15 +183,6 @@ void *video_hw_init(void)
return (void *)pGD;
}
void video_set_lut (unsigned int index, /* color number */
unsigned char r, /* red */
unsigned char g, /* green */
unsigned char b /* blue */
)
{
return;
}
#endif /* defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE) */
#endif /* CONFIG_FSL_DIU_FB */

12
drivers/video/cfb_console.c
View file

@ -749,6 +749,18 @@ void video_puts (const char *s)
/*****************************************************************************/
/*
* Do not enforce drivers (or board code) to provide empty
* video_set_lut() if they do not support 8 bpp format.
* Implement weak default function instead.
*/
void __video_set_lut (unsigned int index, unsigned char r,
unsigned char g, unsigned char b)
{
}
void video_set_lut (unsigned int, unsigned char, unsigned char, unsigned char)
__attribute__((weak, alias("__video_set_lut")));
#if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
#define FILL_8BIT_332RGB(r,g,b) { \

130
drivers/video/sm501.c
View file

@ -31,6 +31,7 @@
#include <common.h>
#include <asm/io.h>
#include <video_fb.h>
#include <sm501.h>
@ -54,6 +55,18 @@
GraphicDevice sm501;
void write_be32(int off, unsigned int val)
{
out_be32((unsigned __iomem *)(sm501.isaBase + off), val);
}
void write_le32(int off, unsigned int val)
{
out_le32((unsigned __iomem *)(sm501.isaBase + off), val);
}
void (*write_reg32)(int off, unsigned int val) = write_be32;
/*-----------------------------------------------------------------------------
* SmiSetRegs --
*-----------------------------------------------------------------------------
@ -66,7 +79,7 @@ static void SmiSetRegs (void)
*/
const SMI_REGS *preg = board_get_regs ();
while (preg->Index) {
write32 (preg->Index, preg->Value);
write_reg32 (preg->Index, preg->Value);
/*
* Insert a delay between
*/
@ -75,26 +88,120 @@ static void SmiSetRegs (void)
}
}
#ifdef CONFIG_VIDEO_SM501_PCI
static struct pci_device_id sm501_pci_tbl[] = {
{ PCI_VENDOR_ID_SMI, PCI_DEVICE_ID_SMI_501 },
{}
};
#endif
/*
* We do not enforce board code to provide empty/unused
* functions for this driver and define weak default
* functions here.
*/
unsigned int __board_video_init (void)
{
return 0;
}
unsigned int board_video_init (void)
__attribute__((weak, alias("__board_video_init")));
unsigned int __board_video_get_fb (void)
{
return 0;
}
unsigned int board_video_get_fb (void)
__attribute__((weak, alias("__board_video_get_fb")));
void __board_validate_screen (unsigned int base)
{
}
void board_validate_screen (unsigned int base)
__attribute__((weak, alias("__board_validate_screen")));
/*-----------------------------------------------------------------------------
* video_hw_init --
*-----------------------------------------------------------------------------
*/
void *video_hw_init (void)
{
#ifdef CONFIG_VIDEO_SM501_PCI
unsigned int pci_mem_base, pci_mmio_base;
unsigned int id;
unsigned short device_id;
pci_dev_t devbusfn;
int mem;
#endif
unsigned int *vm, i;
memset (&sm501, 0, sizeof (GraphicDevice));
#ifdef CONFIG_VIDEO_SM501_PCI
printf("Video: ");
/* Look for SM501/SM502 chips */
devbusfn = pci_find_devices(sm501_pci_tbl, 0);
if (devbusfn < 0) {
printf ("PCI Controller not found.\n");
goto not_pci;
}
/* Setup */
pci_write_config_dword (devbusfn, PCI_COMMAND,
(PCI_COMMAND_MEMORY | PCI_COMMAND_IO));
pci_read_config_word (devbusfn, PCI_DEVICE_ID, &device_id);
pci_read_config_dword (devbusfn, PCI_REVISION_ID, &id);
pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_0, &pci_mem_base);
pci_read_config_dword (devbusfn, PCI_BASE_ADDRESS_1, &pci_mmio_base);
sm501.frameAdrs = pci_mem_to_phys (devbusfn, pci_mem_base);
sm501.isaBase = pci_mem_to_phys (devbusfn, pci_mmio_base);
if (sm501.isaBase)
write_reg32 = write_le32;
mem = in_le32 ((unsigned __iomem *)(sm501.isaBase + 0x10));
mem = (mem & 0x0000e000) >> 13;
switch (mem) {
case 1:
mem = 8;
break;
case 2:
mem = 16;
break;
case 3:
mem = 32;
break;
case 4:
mem = 64;
break;
case 5:
mem = 2;
break;
case 0:
default:
mem = 4;
}
printf ("PCI SM50%d %d MB\n", ((id & 0xff) == 0xC0) ? 2 : 1, mem);
not_pci:
#endif
/*
* Initialization of the access to the graphic chipset Retreive base
* address of the chipset (see board/RPXClassic/eccx.c)
*/
if ((sm501.isaBase = board_video_init ()) == 0) {
return (NULL);
if (!sm501.isaBase) {
sm501.isaBase = board_video_init ();
if (!sm501.isaBase)
return NULL;
}
if ((sm501.frameAdrs = board_video_get_fb ()) == 0) {
return (NULL);
if (!sm501.frameAdrs) {
sm501.frameAdrs = board_video_get_fb ();
if (!sm501.frameAdrs)
return NULL;
}
sm501.winSizeX = board_get_width ();
@ -131,16 +238,3 @@ void *video_hw_init (void)
return (&sm501);
}
/*-----------------------------------------------------------------------------
* video_set_lut --
*-----------------------------------------------------------------------------
*/
void video_set_lut (
unsigned int index, /* color number */
unsigned char r, /* red */
unsigned char g, /* green */
unsigned char b /* blue */
)
{
}

1
include/pci_ids.h
View file

@ -1454,6 +1454,7 @@
#define PCI_DEVICE_ID_SMI_710 0x0710
#define PCI_DEVICE_ID_SMI_712 0x0712
#define PCI_DEVICE_ID_SMI_810 0x0810
#define PCI_DEVICE_ID_SMI_501 0x0501
#define PCI_VENDOR_ID_HUGHES 0x1273
#define PCI_DEVICE_ID_HUGHES_DIRECPC 0x0002