From 8aa50540e4e8fe599857db522d58a55469bbb254 Mon Sep 17 00:00:00 2001 From: Dirk Eibach Date: Mon, 18 Apr 2011 10:42:19 +0200 Subject: ppc4xx: Enable LM64 on DLVision 10G Signed-off-by: Dirk Eibach Signed-off-by: Stefan Roese --- include/configs/dlvision-10g.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index f7609d71a95..ae209fa1573 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -111,7 +111,7 @@ /* Temp sensor/hwmon/dtt */ #define CONFIG_DTT_LM63 1 /* National LM63 */ -#define CONFIG_DTT_SENSORS { 0 } /* Sensor addresses */ +#define CONFIG_DTT_SENSORS { 0x4c, 0x4e } /* Sensor addresses */ #define CONFIG_DTT_PWM_LOOKUPTABLE \ { { 40, 10 }, { 50, 20 }, { 60, 40 } } #define CONFIG_DTT_TACH_LIMIT 0xa10 -- cgit v1.2.3 From 5cb4100f5825de5181be1edce8a020bf646a9475 Mon Sep 17 00:00:00 2001 From: Dirk Eibach Date: Wed, 6 Apr 2011 13:53:46 +0200 Subject: ppc4xx: Adapt DLVision 10G to new FPGA firmware Signed-off-by: Dirk Eibach Signed-off-by: Stefan Roese --- include/configs/dlvision-10g.h | 2 ++ include/gdsys_fpga.h | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index ae209fa1573..548b7ebd949 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -136,6 +136,8 @@ #define CONFIG_SYS_LATCH1_RESET 0xffcf #define CONFIG_SYS_LATCH1_BOOT 0xffff +#define CONFIG_SYS_FPGA_NO_RFL_HI + /* * FLASH organization */ diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h index 1fccd27cc02..eaf6daafb9b 100644 --- a/include/gdsys_fpga.h +++ b/include/gdsys_fpga.h @@ -94,13 +94,11 @@ typedef struct ihs_fpga { u16 extended_interrupt; /* 0x001c */ u16 reserved_1[9]; /* 0x001e */ ihs_i2c_t i2c; /* 0x0030 */ - u16 reserved_2[35]; /* 0x0038 */ - u16 reflection_high; /* 0x007e */ - u16 reserved_3[15]; /* 0x0080 */ + u16 reserved_2[51]; /* 0x0038 */ u16 videocontrol; /* 0x009e */ - u16 reserved_4[176]; /* 0x00a0 */ + u16 reserved_3[176]; /* 0x00a0 */ ihs_osd_t osd; /* 0x0200 */ - u16 reserved_5[764]; /* 0x0208 */ + u16 reserved_4[764]; /* 0x0208 */ u16 videomem; /* 0x0800 */ } ihs_fpga_t; #endif -- cgit v1.2.3 From 52158e361606fffca89136481db720fdaab608d0 Mon Sep 17 00:00:00 2001 From: Dirk Eibach Date: Wed, 6 Apr 2011 13:53:47 +0200 Subject: ppc4xx: Set DLVision 10G osd position to linux defaults Signed-off-by: Dirk Eibach Signed-off-by: Stefan Roese --- include/gdsys_fpga.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h index eaf6daafb9b..b02e28c8ee4 100644 --- a/include/gdsys_fpga.h +++ b/include/gdsys_fpga.h @@ -50,6 +50,9 @@ typedef struct ihs_osd { u16 features; u16 control; u16 xy_size; + u16 xy_scale; + u16 x_pos; + u16 y_pos; } ihs_osd_t; #ifdef CONFIG_IO @@ -79,7 +82,7 @@ typedef struct ihs_fpga { u16 reserved_2[93]; /* 0x0044 */ u16 reflection_high; /* 0x00fe */ ihs_osd_t osd; /* 0x0100 */ - u16 reserved_3[892]; /* 0x0108 */ + u16 reserved_3[88]; /* 0x010e */ u16 videomem; /* 0x0800 */ } ihs_fpga_t; #endif @@ -98,7 +101,7 @@ typedef struct ihs_fpga { u16 videocontrol; /* 0x009e */ u16 reserved_3[176]; /* 0x00a0 */ ihs_osd_t osd; /* 0x0200 */ - u16 reserved_4[764]; /* 0x0208 */ + u16 reserved_4[761]; /* 0x020e */ u16 videomem; /* 0x0800 */ } ihs_fpga_t; #endif -- cgit v1.2.3 From 7749c84e9d3a00b16b764368e727a5c12e0c4493 Mon Sep 17 00:00:00 2001 From: Dirk Eibach Date: Wed, 6 Apr 2011 13:53:48 +0200 Subject: ppc4xx: Enable MPC92469AC on DLVision 10G Signed-off-by: Dirk Eibach Signed-off-by: Stefan Roese --- include/configs/dlvision-10g.h | 1 + include/gdsys_fpga.h | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 548b7ebd949..368aceb15c3 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -312,6 +312,7 @@ * OSD Setup */ #define CONFIG_SYS_ICS8N3QV01 +#define CONFIG_SYS_MPC92469AC #define CONFIG_SYS_SIL1178 #define CONFIG_SYS_OSD_SCREENS CONFIG_SYS_FPGA_COUNT diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h index b02e28c8ee4..c0b1b5c3d74 100644 --- a/include/gdsys_fpga.h +++ b/include/gdsys_fpga.h @@ -97,11 +97,13 @@ typedef struct ihs_fpga { u16 extended_interrupt; /* 0x001c */ u16 reserved_1[9]; /* 0x001e */ ihs_i2c_t i2c; /* 0x0030 */ - u16 reserved_2[51]; /* 0x0038 */ + u16 reserved_2[16]; /* 0x0038 */ + u16 mpc3w_control; /* 0x0058 */ + u16 reserved_3[34]; /* 0x005a */ u16 videocontrol; /* 0x009e */ - u16 reserved_3[176]; /* 0x00a0 */ + u16 reserved_4[176]; /* 0x00a0 */ ihs_osd_t osd; /* 0x0200 */ - u16 reserved_4[761]; /* 0x020e */ + u16 reserved_5[761]; /* 0x020e */ u16 videomem; /* 0x0800 */ } ihs_fpga_t; #endif -- cgit v1.2.3 From 6c57c88dd27152770b1e913a3db1a8afe9247a8d Mon Sep 17 00:00:00 2001 From: Dirk Eibach Date: Wed, 6 Apr 2011 13:53:49 +0200 Subject: ppc4xx: Improve fan PWM curve on DLVision 10G Signed-off-by: Dirk Eibach Signed-off-by: Stefan Roese --- include/configs/dlvision-10g.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 368aceb15c3..c3f74381684 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -113,7 +113,8 @@ #define CONFIG_DTT_LM63 1 /* National LM63 */ #define CONFIG_DTT_SENSORS { 0x4c, 0x4e } /* Sensor addresses */ #define CONFIG_DTT_PWM_LOOKUPTABLE \ - { { 40, 10 }, { 50, 20 }, { 60, 40 } } + { { 40, 10 }, { 43, 13 }, { 46, 16 }, \ + { 50, 20 }, { 53, 27 }, { 56, 34 }, { 60, 40 } } #define CONFIG_DTT_TACH_LIMIT 0xa10 /* EBC peripherals */ -- cgit v1.2.3 From 6cfa9eecb4409b1b4e8b4753b2ddfbe33e28bd93 Mon Sep 17 00:00:00 2001 From: Dirk Eibach Date: Wed, 6 Apr 2011 13:53:50 +0200 Subject: ppc4xx: Do not stop booting on any keypress on dlvision-10g Use CONFIG_AUTOBOOT_KEYED on dlvision-10g so that booting can only be stopped with well defined keypresses. Signed-off-by: Dirk Eibach Signed-off-by: Stefan Roese --- include/configs/dlvision-10g.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index c3f74381684..4fc5262bc17 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -42,6 +42,10 @@ #define CONFIG_SYS_CLK_FREQ 33333333 /* external frequency to pll */ +#undef CONFIG_ZERO_BOOTDELAY_CHECK /* ignore keypress on bootdelay==0 */ +#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */ +#define CONFIG_AUTOBOOT_STOP_STR " " + /* * Configure PLL */ -- cgit v1.2.3