mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dlvision-10g: Support displayport

Browse source 
Support dlvision-10g hardware with displayport output.

Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
This commit is contained in:
Dirk Eibach 2015-10-28 11:46:28 +01:00 • committed by Tom Rini
parent d054c2f8c6
commit e1d1127a9a
3 changed files with 52 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
board/gdsys/405ep/dlvision-10g.c
View file

@ -25,17 +25,19 @@
#define LATCH2_MC2_PRESENT_N 0x0080 #define LATCH2_MC2_PRESENT_N 0x0080
enum { enum {
UNITTYPE_VIDEO_USER = 0, UNITTYPE_MAIN = 1<<0,
UNITTYPE_MAIN_USER = 1, UNITTYPE_SERVER = 1<<1,
UNITTYPE_VIDEO_SERVER = 2, UNITTYPE_DISPLAYPORT = 1<<2,
UNITTYPE_MAIN_SERVER = 3,
}; };
enum { enum {
HWVER_101 = 0, HWVER_101 = 0,
HWVER_110 = 1, HWVER_110 = 1,
HWVER_120 = 2, HWVER_130 = 2,
HWVER_130 = 3, HWVER_140 = 3,
HWVER_150 = 4,
HWVER_160 = 5,
HWVER_170 = 6,
}; };
enum { enum {
@ -121,27 +123,20 @@ static void print_fpga_info(unsigned dev)
feature_carriers = (fpga_features >> 2) & 0x0003; feature_carriers = (fpga_features >> 2) & 0x0003;
feature_video_channels = fpga_features & 0x0003; feature_video_channels = fpga_features & 0x0003;
switch (unit_type) { if (unit_type & UNITTYPE_MAIN)
case UNITTYPE_VIDEO_USER: printf("Mainchannel ");
printf("Videochannel Userside"); else
break; printf("Videochannel ");
case UNITTYPE_MAIN_USER: if (unit_type & UNITTYPE_SERVER)
printf("Mainchannel Userside"); printf("Serverside ");
break; else
printf("Userside ");
case UNITTYPE_VIDEO_SERVER: if (unit_type & UNITTYPE_DISPLAYPORT)
printf("Videochannel Serverside"); printf("DisplayPort");
break; else
printf("DVI-DL");
case UNITTYPE_MAIN_SERVER:
printf("Mainchannel Serverside");
break;
default:
printf("UnitType %d(not supported)", unit_type);
break;
}
switch (hardware_version) { switch (hardware_version) {
case HWVER_101: case HWVER_101:
@ -149,17 +144,29 @@ static void print_fpga_info(unsigned dev)
break; break;
case HWVER_110: case HWVER_110:
printf(" HW-Ver 1.10-1.12\n"); printf(" HW-Ver 1.10-1.20\n");
break;
case HWVER_120:
printf(" HW-Ver 1.20\n");
break; break;
case HWVER_130: case HWVER_130:
printf(" HW-Ver 1.30\n"); printf(" HW-Ver 1.30\n");
break; break;
case HWVER_140:
printf(" HW-Ver 1.40-1.43\n");
break;
case HWVER_150:
printf(" HW-Ver 1.50\n");
break;
case HWVER_160:
printf(" HW-Ver 1.60-1.61\n");
break;
case HWVER_170:
printf(" HW-Ver 1.70\n");
break;
default: default:
printf(" HW-Ver %d(not supported)\n", printf(" HW-Ver %d(not supported)\n",
hardware_version); hardware_version);
@ -260,7 +267,7 @@ int last_stage_init(void)
if (get_mc2_present()) if (get_mc2_present())
print_fpga_info(1); print_fpga_info(1);
if (((versions >> 4) & 0x000f) != UNITTYPE_MAIN_USER) if (((versions >> 4) & 0x000f) & UNITTYPE_SERVER)
return 0; return 0;
if (!get_fpga_state(0) || (get_hwver() == HWVER_101)) if (!get_fpga_state(0) || (get_hwver() == HWVER_101))

2
board/gdsys/common/Makefile
View file

@ -10,6 +10,6 @@ obj-$(CONFIG_CMD_IOLOOP) += cmd_ioloop.o
obj-$(CONFIG_IO) += miiphybb.o obj-$(CONFIG_IO) += miiphybb.o
obj-$(CONFIG_IO64) += miiphybb.o obj-$(CONFIG_IO64) += miiphybb.o
obj-$(CONFIG_IOCON) += osd.o mclink.o dp501.o phy.o obj-$(CONFIG_IOCON) += osd.o mclink.o dp501.o phy.o
obj-$(CONFIG_DLVISION_10G) += osd.o obj-$(CONFIG_DLVISION_10G) += osd.o dp501.o
obj-$(CONFIG_CONTROLCENTERD) += dp501.o obj-$(CONFIG_CONTROLCENTERD) += dp501.o
obj-$(CONFIG_HRCON) += osd.o mclink.o dp501.o phy.o obj-$(CONFIG_HRCON) += osd.o mclink.o dp501.o phy.o

18
include/configs/dlvision-10g.h
View file

@ -67,7 +67,7 @@
#undef CONFIG_CMD_DHCP #undef CONFIG_CMD_DHCP
#undef CONFIG_CMD_DIAG #undef CONFIG_CMD_DIAG
#undef CONFIG_CMD_EEPROM #undef CONFIG_CMD_EEPROM
#undef CONFIG_CMD_I2C #define CONFIG_CMD_I2C
#undef CONFIG_CMD_IRQ #undef CONFIG_CMD_IRQ
/* /*
@ -105,17 +105,22 @@
#define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F #define CONFIG_SYS_I2C_PPC4XX_SLAVE_0 0x7F
#define CONFIG_SYS_I2C_IHS #define CONFIG_SYS_I2C_IHS
#define CONFIG_SYS_I2C_IHS_DUAL
#define CONFIG_SYS_I2C_IHS_CH0 #define CONFIG_SYS_I2C_IHS_CH0
#define CONFIG_SYS_I2C_IHS_SPEED_0 50000 #define CONFIG_SYS_I2C_IHS_SPEED_0 50000
#define CONFIG_SYS_I2C_IHS_SLAVE_0 0x7F #define CONFIG_SYS_I2C_IHS_SLAVE_0 0x7F
#define CONFIG_SYS_I2C_IHS_SPEED_0_1 50000
#define CONFIG_SYS_I2C_IHS_SLAVE_0_1 0x7F
#define CONFIG_SYS_I2C_IHS_CH1 #define CONFIG_SYS_I2C_IHS_CH1
#define CONFIG_SYS_I2C_IHS_SPEED_1 50000 #define CONFIG_SYS_I2C_IHS_SPEED_1 50000
#define CONFIG_SYS_I2C_IHS_SLAVE_1 0x7F #define CONFIG_SYS_I2C_IHS_SLAVE_1 0x7F
#define CONFIG_SYS_I2C_IHS_SPEED_1_1 50000
#define CONFIG_SYS_I2C_IHS_SLAVE_1_1 0x7F
#define CONFIG_SYS_SPD_BUS_NUM 2 #define CONFIG_SYS_SPD_BUS_NUM 4
/* Temp sensor/hwmon/dtt */ /* Temp sensor/hwmon/dtt */
#define CONFIG_SYS_DTT_BUS_NUM 2 #define CONFIG_SYS_DTT_BUS_NUM 4
#define CONFIG_DTT_LM63 1 /* National LM63 */ #define CONFIG_DTT_LM63 1 /* National LM63 */
#define CONFIG_DTT_SENSORS { 0x4c, 0x4e, 0x18 } /* Sensor addresses */ #define CONFIG_DTT_SENSORS { 0x4c, 0x4e, 0x18 } /* Sensor addresses */
#define CONFIG_DTT_PWM_LOOKUPTABLE \ #define CONFIG_DTT_PWM_LOOKUPTABLE \
@ -123,8 +128,9 @@
{ 54, 27 }, { 56, 31 }, { 58, 36 }, { 60, 40 } } { 54, 27 }, { 56, 31 }, { 58, 36 }, { 60, 40 } }
#define CONFIG_DTT_TACH_LIMIT 0xa10 #define CONFIG_DTT_TACH_LIMIT 0xa10
#define CONFIG_SYS_ICS8N3QV01_I2C {0, 1} #define CONFIG_SYS_ICS8N3QV01_I2C {1, 3}
#define CONFIG_SYS_SIL1178_I2C {0, 1} #define CONFIG_SYS_SIL1178_I2C {0, 2}
#define CONFIG_SYS_DP501_I2C {0, 2}
/* EBC peripherals */ /* EBC peripherals */
@ -327,5 +333,7 @@
*/ */
#define CONFIG_SYS_MPC92469AC #define CONFIG_SYS_MPC92469AC
#define CONFIG_SYS_OSD_SCREENS CONFIG_SYS_FPGA_COUNT #define CONFIG_SYS_OSD_SCREENS CONFIG_SYS_FPGA_COUNT
#define CONFIG_SYS_DP501_DIFFERENTIAL
#define CONFIG_SYS_DP501_VCAPCTRL0 0x01 /* DDR mode 0, DE for H/VSYNC */
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */