From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sascha Laue Date: Tue, 01 Apr 2008 09:56:46 +0200 Subject: [U-Boot-Users] [PATCH] lwmon5 dspic POST spezification In-Reply-To: <20080325231838.2D9B2243A7@gemini.denx.de> References: <20080325231838.2D9B2243A7@gemini.denx.de> Message-ID: <20080401075646.145810@gmx.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Wolfgang, sorry but it's the first time for me. let's try again. we modified the specification for the lwmon5 board dspic POST. Additionally I have add defines for the temperature- and voltagevalues. Signed-off-by: Sascha Laue --- post/board/lwmon5/sysmon.c | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/post/board/lwmon5/sysmon.c b/post/board/lwmon5/sysmon.c --- a/post/board/lwmon5/sysmon.c index 0cf1cf2..77e7ea2 100644 +++ b/post/board/lwmon5/sysmon.c @@ -34,9 +34,9 @@ * The test passes when all the following voltages and temperatures * are within allowed ranges: * - * Temperature -40 .. +85 C - * +5V +4.75 .. +5.25 V - * +5V standby +4.75 .. +5.25 V + * Temperature -40 .. +90 C + * +5V +4.50 .. +5.50 V + * +5V standby +3.50 .. +5.50 V * * LCD backlight is not enabled if temperature values are not within * allowed ranges (-30 .. + 80). The brightness of backlite can be @@ -62,6 +62,21 @@ extern int dspic_read(ushort reg, ushort *data); #define RELOC(x) if (x != NULL) x = (void *) ((ulong) (x) + gd->reloc_off) +#define REG_TEMPERATURE 0x12BC +#define REG_VOLTAGE_5V 0x12CA +#define REG_VOLTAGE_5V_STANDBY 0x12C6 + +#define TEMPERATURE_MIN (-40) /* C */ +#define TEMPERATURE_MAX (+90) /* C */ +#define TEMPERATURE_DISPLAY_MIN (-35) /* C */ +#define TEMPERATURE_DISPLAY_MAX (+85) /* C */ + +#define VOLTAGE_5V_MIN (+4500) /* mV */ +#define VOLTAGE_5V_MAX (+5500) /* mV */ + +#define VOLTAGE_5V_STANDBY_MIN (+3500) /* mV */ +#define VOLTAGE_5V_STANDBY_MAX (+5500) /* mV */ + typedef struct sysmon_s sysmon_t; typedef struct sysmon_table_s sysmon_table_t; @@ -115,16 +130,22 @@ struct sysmon_table_s static sysmon_table_t sysmon_table[] = { {"Temperature", " C", &sysmon_dspic_sgn, NULL, sysmon_backlight_disable, - 1, 1, -32768, 32767, 0xFFFF, 0x8000-40, 0x8000+85, 0, - 0x8000-30, 0x8000+80, 0, 0x12BC}, + 1, 1, -32768, 32767, 0xFFFF, + 0x8000 + TEMPERATURE_MIN, 0x8000 + TEMPERATURE_MAX, 0, + 0x8000 + TEMPERATURE_DISPLAY_MIN, 0x8000 + TEMPERATURE_DISPLAY_MAX, 0, + REG_TEMPERATURE }, {"+ 5 V", "V", &sysmon_dspic, NULL, NULL, - 100, 1000, 0, 0xFFFF, 0xFFFF, 4750, 5250, 0, - 4750, 5250, 0, 0x12CA}, + 100, 1000, 0, 0xFFFF, 0xFFFF, + VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, + VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0, + REG_VOLTAGE_5V }, {"+ 5 V standby", "V", &sysmon_dspic, NULL, NULL, - 100, 1000, 0, 0xFFFF, 0xFFFF, 4750, 5250, 0, - 4750, 5250, 0, 0x12C6}, + 100, 1000, 0, 0xFFFF, 0xFFFF, + VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX 5250, 0, + VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0, + REG_VOLTAGE_5V_STANDBY }, }; static int sysmon_table_size = sizeof(sysmon_table) / sizeof(sysmon_table[0]); -- 1.5.2.4 Best regards, Sascha Laue -------- Original-Nachricht -------- > Datum: Wed, 26 Mar 2008 00:18:38 +0100 > Von: Wolfgang Denk > An: "Sascha Laue" > CC: "Markus Klotzb?cher" , saschalaue at gmx.net, u-boot-users at lists.sourceforge.net, marcel.brasch at liebherr.com > Betreff: Re: [U-Boot-Users] [PATCH] lwmon5 dspic POST spezification > In message <20080320120557.182790@gmx.net> you wrote: > > Ups. > > > > Best regards > > > > Sascha Laue > > > > diff -u -r -N u-boot/post/board/lwmon5/sysmon.c > u-boot-mod/post/board/lwmon= > > 5/sysmon.c > > Sorry, but this patch does not apply: > > Applying lwmon5: update dsPIC POST spezification > .dotest/patch:29: trailing whitespace. > #define TEMPERATURE_DISPLAY_MAX (+85) /* ?C */ > .dotest/patch:46: trailing whitespace. > 1, 1, -0x8000, 0x7FFF, 0xFFFF, > .dotest/patch:48: trailing whitespace. > 0x8000 + TEMPERATURE_DISPLAY_MIN, 0x8000 + > TEMPERATURE_DISPLAY_MAX, 0, > .dotest/patch:54: trailing whitespace. > 100, 1000, -0x8000, 0x7FFF, 0xFFFF, > .dotest/patch:56: trailing whitespace. > 0x8000 + VOLTAGE_5V_MIN , 0x8000 + VOLTAGE_5V_MAX, 0, > error: patch failed: post/board/lwmon5/sysmon.c:110 > error: post/board/lwmon5/sysmon.c: patch does not apply > fatal: sha1 information is lacking or useless > (post/board/lwmon5/sysmon.c). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0001. > > > Please cleanup the code (whitespace issues), and use git-format-patch > and git-send-email to post a clean, usable patch. > > Thanks. > > Best regards, > > Wolfgang Denk > > -- > DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel > HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany > Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de > A failure will not appear until a unit has passed final inspection.