diff options
| author | Dirk Eibach <eibach@gdsys.de> | 2013-07-25 19:28:13 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2013-07-25 19:35:42 +0200 |
| commit | e50e8968d994491a426116c3ed6b3e7e26e45f3a (patch) | |
| tree | 0ad97c3680cc54c9b666f2dc9a0c407214113ad2 /board/gdsys/common | |
| parent | 869b550ea31b0b12e863203e1e22d4433ebad287 (diff) | |
| download | blackbird-obmc-uboot-e50e8968d994491a426116c3ed6b3e7e26e45f3a.tar.gz blackbird-obmc-uboot-e50e8968d994491a426116c3ed6b3e7e26e45f3a.zip | |
powerpc/ppc4xx: Support gdsys multichannel iocon hardware
Signed-off-by: Dirk Eibach <dirk.eibach@gdsys.cc>
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/gdsys/common')
| -rw-r--r-- | board/gdsys/common/Makefile | 2 | ||||
| -rw-r--r-- | board/gdsys/common/osd.c | 20 |
2 files changed, 18 insertions, 4 deletions
diff --git a/board/gdsys/common/Makefile b/board/gdsys/common/Makefile index 60b16048b9..216ad964af 100644 --- a/board/gdsys/common/Makefile +++ b/board/gdsys/common/Makefile @@ -17,7 +17,7 @@ COBJS-$(CONFIG_SYS_FPGA_COMMON) += fpga.o COBJS-$(CONFIG_IO) += miiphybb.o COBJS-$(CONFIG_IO64) += miiphybb.o -COBJS-$(CONFIG_IOCON) += osd.o +COBJS-$(CONFIG_IOCON) += osd.o mclink.o COBJS-$(CONFIG_DLVISION_10G) += osd.o COBJS-$(CONFIG_CONTROLCENTERD) += dp501.o diff --git a/board/gdsys/common/osd.c b/board/gdsys/common/osd.c index fd84388f89..354bf0b6e0 100644 --- a/board/gdsys/common/osd.c +++ b/board/gdsys/common/osd.c @@ -6,8 +6,8 @@ */ #include <common.h> -#include <asm/io.h> #include <i2c.h> +#include <malloc.h> #include <gdsys_fpga.h> @@ -51,6 +51,12 @@ enum { CH7301_DSP = 0x56, /* DVI Sync polarity Register */ }; +unsigned int max_osd_screen = CONFIG_SYS_OSD_SCREENS - 1; + +#ifdef CONFIG_SYS_CH7301 +int ch7301_i2c[] = CONFIG_SYS_CH7301_I2C; +#endif + #if defined(CONFIG_SYS_ICS8N3QV01) || defined(CONFIG_SYS_SIL1178) static void fpga_iic_write(unsigned screen, u8 slave, u8 reg, u8 data) { @@ -270,7 +276,7 @@ static int osd_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { unsigned screen; - for (screen = 0; screen < CONFIG_SYS_OSD_SCREENS; ++screen) { + for (screen = 0; screen <= max_osd_screen; ++screen) { unsigned x; unsigned y; unsigned charcount; @@ -311,6 +317,9 @@ int osd_probe(unsigned screen) unsigned width; unsigned height; u8 value; +#ifdef CONFIG_SYS_CH7301 + int old_bus = i2c_get_bus_num(); +#endif FPGA_GET_REG(0, osd.version, &version); FPGA_GET_REG(0, osd.features, &features); @@ -322,9 +331,11 @@ int osd_probe(unsigned screen) screen, version/100, version%100, width, height); #ifdef CONFIG_SYS_CH7301 + i2c_set_bus_num(ch7301_i2c[screen]); value = i2c_reg_read(CH7301_I2C_ADDR, CH7301_DID); if (value != 0x17) { printf(" Probing CH7301 failed, DID %02x\n", value); + i2c_set_bus_num(old_bus); return -1; } i2c_reg_write(CH7301_I2C_ADDR, CH7301_TPCP, 0x08); @@ -332,6 +343,7 @@ int osd_probe(unsigned screen) i2c_reg_write(CH7301_I2C_ADDR, CH7301_TPF, 0x60); i2c_reg_write(CH7301_I2C_ADDR, CH7301_DC, 0x09); i2c_reg_write(CH7301_I2C_ADDR, CH7301_PM, 0xc0); + i2c_set_bus_num(old_bus); #endif #ifdef CONFIG_SYS_MPC92469AC @@ -368,6 +380,8 @@ int osd_probe(unsigned screen) FPGA_SET_REG(screen, osd.x_pos, 0x007f); FPGA_SET_REG(screen, osd.y_pos, 0x005f); + if (screen > max_osd_screen) + max_osd_screen = screen; return 0; } @@ -376,7 +390,7 @@ int osd_write(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { unsigned screen; - for (screen = 0; screen < CONFIG_SYS_OSD_SCREENS; ++screen) { + for (screen = 0; screen <= max_osd_screen; ++screen) { unsigned x; unsigned y; unsigned k; |
