diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-11-17 05:11:27 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-17 05:11:27 +0000 |
| commit | 437949a12c1d0076228bdbba35ee57c81e3248fb (patch) | |
| tree | efd616726047fee3bd59c196a6899ba448179626 /packages/linux/nas100d-kernel/2.6.14 | |
| parent | aaaadef77b1514397e2e3441cf1863c6a52f6b52 (diff) | |
nas100d-kernel: Added 2.6.15-rc1 support from jbowler and azummo.
Diffstat (limited to 'packages/linux/nas100d-kernel/2.6.14')
| -rw-r--r-- | packages/linux/nas100d-kernel/2.6.14/60-nas100d-i2c.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/linux/nas100d-kernel/2.6.14/60-nas100d-i2c.patch b/packages/linux/nas100d-kernel/2.6.14/60-nas100d-i2c.patch index 69d0c47282..5e180093a4 100644 --- a/packages/linux/nas100d-kernel/2.6.14/60-nas100d-i2c.patch +++ b/packages/linux/nas100d-kernel/2.6.14/60-nas100d-i2c.patch @@ -45,7 +45,7 @@ return 0; --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-nas100d/drivers/i2c/chips/pcf8563.c 2005-11-16 01:18:21.000000000 +0100 ++++ linux-nas100d/drivers/i2c/chips/pcf8563.c 2005-11-16 11:34:15.000000000 +0100 @@ -0,0 +1,547 @@ +/* + * pcf8563.c - An i2c driver for the Philips PCF8563 RTC @@ -75,7 +75,7 @@ + +#include <linux/pcf8563.h> + -+#define DRV_VERSION "0.2" ++#define DRV_VERSION "0.3.1" + +/* Addresses to scan */ +static unsigned short normal_i2c[] = { 0x51, I2C_CLIENT_END }; @@ -213,9 +213,9 @@ + tm->tm_hour = BCD2BIN(buf[PCF8563_REG_HR] & 0x3F); /* rtc hr 0-23 */ + tm->tm_mday = BCD2BIN(buf[PCF8563_REG_DM] & 0x3F); + tm->tm_wday = buf[PCF8563_REG_DW] & 0x07; -+ tm->tm_mon = BCD2BIN(buf[PCF8563_REG_MN] & 0x1F) - 1; /* rtc mn 1-12 */ ++ tm->tm_mon = BCD2BIN(buf[PCF8563_REG_MO] & 0x1F) - 1; /* rtc mn 1-12 */ + tm->tm_year = BCD2BIN(buf[PCF8563_REG_YR]) -+ + (buf[PCF8563_REG_MN] & 0x80 ? 100 : 0); ++ + (buf[PCF8563_REG_MO] & 0x80 ? 100 : 0); + + dev_dbg(&client->dev, "%s: tm is secs=%d, mins=%d, hours=%d, " + "mday=%d, mon=%d, year=%d, wday=%d\n", @@ -223,7 +223,7 @@ + tm->tm_sec, tm->tm_min, tm->tm_hour, + tm->tm_mday, tm->tm_mon, tm->tm_year, tm->tm_wday); + -+ if (!pcf8563_validate_tm(tm)) { ++ if (pcf8563_validate_tm(tm) < 0) { + dev_err(&client->dev, "retrieved date/time is not valid.\n"); + return -EINVAL; + } |