diff for duplicates of <4227A711.8000604@katalix.com> diff --git a/a/1.txt b/N1/1.txt index 2ff1148..85501e7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,425 +19,4 @@ Jean Delvare wrote: > i2c_smbus_{read,write}_i2c_block_data. Adapter which declare themselves > I2C_FUNC_SMBUS_I2C_BLOCK-capable may not implement master_xfer. You > really need to check for I2C_FUNC_I2C. -> --------------- next part -------------- -i2c: add ds1337 RTC chip support - -Signed-off-by: James Chapman <jchapman@katalix.com> - -Index: linux-2.6.i2c/drivers/i2c/chips/ds1337.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.i2c/drivers/i2c/chips/ds1337.c 2005-03-04 00:01:44.000000000 +0000 -@@ -0,0 +1,380 @@ -+/* -+ * linux/drivers/i2c/chips/ds1337.c -+ * -+ * Copyright (C) 2005 James Chapman <jchapman@katalix.com> -+ * -+ * based on linux/drivers/acron/char/pcf8583.c -+ * Copyright (C) 2000 Russell King -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ * Driver for Dallas Semiconductor DS1337 real time clock chip -+ */ -+ -+#include <linux/config.h> -+#include <linux/module.h> -+#include <linux/init.h> -+#include <linux/slab.h> -+#include <linux/i2c.h> -+#include <linux/i2c-sensor.h> -+#include <linux/string.h> -+#include <linux/rtc.h> /* get the user-level API */ -+#include <linux/bcd.h> -+#include <linux/list.h> -+ -+#define DS1337_NUM_REGS 16 -+#define DS1337_REG_CONFIG 2 -+ -+/* FIXME - how do we export these interface constants? */ -+#define DS1337_GET_DATE 0 -+#define DS1337_SET_DATE 1 -+ -+/* -+ * Functions declaration -+ */ -+static unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END }; -+static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; -+ -+SENSORS_INSMOD_1(ds1337); -+ -+static int ds1337_attach_adapter(struct i2c_adapter *adapter); -+static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind); -+static void ds1337_init_client(struct i2c_client *client); -+static int ds1337_detach_client(struct i2c_client *client); -+static int ds1337_command(struct i2c_client *client, unsigned int cmd, -+ void *arg); -+ -+/* -+ * Driver data (common to all clients) -+ */ -+static struct i2c_driver ds1337_driver = { -+ .owner = THIS_MODULE, -+ .name = "ds1337", -+ .flags = I2C_DF_NOTIFY, -+ .attach_adapter = ds1337_attach_adapter, -+ .detach_client = ds1337_detach_client, -+ .command = ds1337_command, -+}; -+ -+/* -+ * Client data (each client gets its own) -+ */ -+struct ds1337_data { -+ struct i2c_client client; -+ struct list_head list; -+ int id; -+}; -+ -+/* -+ * Internal variables -+ */ -+static int ds1337_id; -+static LIST_HEAD(ds1337_clients); -+ -+static inline int ds1337_read(struct i2c_client *client, u8 reg, u8 *value) -+{ -+ s32 tmp = i2c_smbus_read_byte_data(client, reg); -+ -+ if (tmp < 0) -+ return -EIO; -+ -+ *value = tmp; -+ -+ return 0; -+} -+ -+/* -+ * Chip access functions -+ */ -+static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt) -+{ -+ struct ds1337_data *data = i2c_get_clientdata(client); -+ int result; -+ u8 buf[7]; -+ u8 val; -+ struct i2c_msg msg[2]; -+ u8 offs = 0; -+ -+ if (!dt) { -+ dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n", -+ __FUNCTION__); -+ -+ return -EINVAL; -+ } -+ -+ msg[0].addr = client->addr; -+ msg[0].flags = 0; -+ msg[0].len = 1; -+ msg[0].buf = &offs; -+ -+ msg[1].addr = client->addr; -+ msg[1].flags = I2C_M_RD; -+ msg[1].len = sizeof(buf); -+ msg[1].buf = &buf[0]; -+ -+ result = client->adapter->algo->master_xfer(client->adapter, -+ &msg[0], 2); -+ -+ dev_dbg(&client->adapter->dev, -+ "%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n", -+ __FUNCTION__, result, buf[0], buf[1], buf[2], buf[3], -+ buf[4], buf[5], buf[6]); -+ -+ if (result >= 0) { -+ dt->tm_sec = BCD_TO_BIN(buf[0]); -+ dt->tm_min = BCD_TO_BIN(buf[1]); -+ val = buf[2] & 0x3f; -+ dt->tm_hour = BCD_TO_BIN(val); -+ dt->tm_wday = BCD_TO_BIN(buf[3]) - 1; -+ dt->tm_mday = BCD_TO_BIN(buf[4]); -+ val = buf[5] & 0x7f; -+ dt->tm_mon = BCD_TO_BIN(val); -+ dt->tm_year = 1900 + BCD_TO_BIN(buf[6]); -+ if (buf[5] & 0x80) -+ dt->tm_year += 100; -+ -+ dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, " -+ "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n", -+ __FUNCTION__, dt->tm_sec, dt->tm_min, -+ dt->tm_hour, dt->tm_mday, -+ dt->tm_mon, dt->tm_year, dt->tm_wday); -+ } else { -+ dev_err(&client->adapter->dev, "ds1337[%d]: error reading " -+ "data! %d\n", data->id, result); -+ result = -EIO; -+ } -+ -+ return result; -+} -+ -+static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt) -+{ -+ struct ds1337_data *data = i2c_get_clientdata(client); -+ int result; -+ u8 buf[8]; -+ u8 val; -+ struct i2c_msg msg[1]; -+ -+ if (!dt) { -+ dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n", -+ __FUNCTION__); -+ -+ return -EINVAL; -+ } -+ -+ dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, hours=%d, " -+ "mday=%d, mon=%d, year=%d, wday=%d\n", __FUNCTION__, -+ dt->tm_sec, dt->tm_min, dt->tm_hour, -+ dt->tm_mday, dt->tm_mon, dt->tm_year, dt->tm_wday); -+ -+ buf[0] = 0; /* reg offset */ -+ buf[1] = BIN_TO_BCD(dt->tm_sec); -+ buf[2] = BIN_TO_BCD(dt->tm_min); -+ buf[3] = BIN_TO_BCD(dt->tm_hour) | (1 << 6); -+ buf[4] = BIN_TO_BCD(dt->tm_wday) + 1; -+ buf[5] = BIN_TO_BCD(dt->tm_mday); -+ buf[6] = BIN_TO_BCD(dt->tm_mon); -+ if (dt->tm_year >= 2000) { -+ val = dt->tm_year - 2000; -+ buf[6] |= (1 << 7); -+ } else { -+ val = dt->tm_year - 1900; -+ } -+ buf[7] = BIN_TO_BCD(val); -+ -+ msg[0].addr = client->addr; -+ msg[0].flags = 0; -+ msg[0].len = sizeof(buf); -+ msg[0].buf = &buf[0]; -+ -+ result = client->adapter->algo->master_xfer(client->adapter, -+ &msg[0], 1); -+ if (result < 0) { -+ dev_err(&client->adapter->dev, "ds1337[%d]: error " -+ "writing data! %d\n", data->id, result); -+ result = -EIO; -+ } else { -+ result = 0; -+ } -+ -+ return result; -+} -+ -+static int ds1337_command(struct i2c_client *client, unsigned int cmd, -+ void *arg) -+{ -+ dev_dbg(&client->adapter->dev, "%s: cmd=%d\n", __FUNCTION__, cmd); -+ -+ switch (cmd) { -+ case DS1337_GET_DATE: -+ return ds1337_get_datetime(client, arg); -+ -+ case DS1337_SET_DATE: -+ return ds1337_set_datetime(client, arg); -+ -+ default: -+ return -EINVAL; -+ } -+} -+ -+/* Public API for access to specific device. Useful for low-level -+ * RTC access from kernel code. -+ */ -+int ds1337_do_command(int id, int cmd, void *arg) -+{ -+ struct list_head *walk; -+ struct list_head *tmp; -+ struct ds1337_data *data; -+ -+ list_for_each_safe(walk, tmp, &ds1337_clients) { -+ data = list_entry(walk, struct ds1337_data, list); -+ if (data->id = id) -+ return ds1337_command(&data->client, cmd, arg); -+ } -+ -+ return -ENODEV; -+} -+ -+static int ds1337_attach_adapter(struct i2c_adapter *adapter) -+{ -+ return i2c_detect(adapter, &addr_data, ds1337_detect); -+} -+ -+/* -+ * The following function does more than just detection. If detection -+ * succeeds, it also registers the new chip. -+ */ -+static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind) -+{ -+ struct i2c_client *new_client; -+ struct ds1337_data *data; -+ int err = 0; -+ const char *name = ""; -+ -+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA | -+ I2C_FUNC_I2C)) -+ goto exit; -+ -+ if (!(data = kmalloc(sizeof(struct ds1337_data), GFP_KERNEL))) { -+ err = -ENOMEM; -+ goto exit; -+ } -+ memset(data, 0, sizeof(struct ds1337_data)); -+ INIT_LIST_HEAD(&data->list); -+ -+ /* The common I2C client data is placed right before the -+ * DS1337-specific data. -+ */ -+ new_client = &data->client; -+ i2c_set_clientdata(new_client, data); -+ new_client->addr = address; -+ new_client->adapter = adapter; -+ new_client->driver = &ds1337_driver; -+ new_client->flags = 0; -+ -+ /* -+ * Now we do the remaining detection. A negative kind means that -+ * the driver was loaded with no force parameter (default), so we -+ * must both detect and identify the chip. A zero kind means that -+ * the driver was loaded with the force parameter, the detection -+ * step shall be skipped. A positive kind means that the driver -+ * was loaded with the force parameter and a given kind of chip is -+ * requested, so both the detection and the identification steps -+ * are skipped. -+ */ -+ -+ /* Default to an DS1337 if forced */ -+ if (kind = 0) -+ kind = ds1337; -+ -+ if (kind < 0) { /* detection and identification */ -+ -+ u8 buf[DS1337_NUM_REGS]; -+ int reg; -+ -+ /* Check that all DS1337 registers are present */ -+ for (reg = 0; reg < DS1337_NUM_REGS; reg++) -+ if (ds1337_read(new_client, reg, &buf[reg]) < 0) -+ goto exit_free; -+ -+ /* Check that control register bits 6-5 are zero */ -+ if (buf[14] & 0x60) -+ goto exit_free; -+ -+ /* Check that status register bits 6-2 are zero */ -+ if (buf[15] & 0x7c) -+ goto exit_free; -+ -+ kind = ds1337; -+ } -+ -+ if (kind = ds1337) -+ name = "ds1337"; -+ -+ /* We can fill in the remaining client fields */ -+ strlcpy(new_client->name, name, I2C_NAME_SIZE); -+ -+ /* Tell the I2C layer a new client has arrived */ -+ if ((err = i2c_attach_client(new_client))) -+ goto exit_free; -+ -+ /* Initialize the DS1337 chip */ -+ ds1337_init_client(new_client); -+ -+ /* Add client to local list */ -+ data->id = ds1337_id++; -+ list_add(&data->list, &ds1337_clients); -+ -+ return 0; -+ -+exit_free: -+ kfree(data); -+exit: -+ return err; -+} -+ -+static void ds1337_init_client(struct i2c_client *client) -+{ -+ s32 val; -+ -+ /* Ensure that device is set in 24-hour mode */ -+ val = i2c_smbus_read_byte_data(client, DS1337_REG_CONFIG); -+ if ((val >= 0) && (val & (1 << 6)) = 0) -+ i2c_smbus_write_byte_data(client, DS1337_REG_CONFIG, -+ val | (1 << 6)); -+} -+ -+static int ds1337_detach_client(struct i2c_client *client) -+{ -+ int err; -+ struct ds1337_data *data = i2c_get_clientdata(client); -+ -+ if ((err = i2c_detach_client(client))) { -+ dev_err(&client->dev, "Client deregistration failed, " -+ "client not detached.\n"); -+ return err; -+ } -+ -+ list_del(&data->list); -+ kfree(data); -+ return 0; -+} -+ -+static int __init ds1337_init(void) -+{ -+ return i2c_add_driver(&ds1337_driver); -+} -+ -+static void __exit ds1337_exit(void) -+{ -+ i2c_del_driver(&ds1337_driver); -+} -+ -+MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); -+MODULE_DESCRIPTION("DS1337 RTC driver"); -+MODULE_LICENSE("GPL"); -+ -+module_init(ds1337_init); -+module_exit(ds1337_exit); -Index: linux-2.6.i2c/drivers/i2c/chips/Kconfig -=================================--- linux-2.6.i2c.orig/drivers/i2c/chips/Kconfig 2005-03-03 23:15:54.000000000 +0000 -+++ linux-2.6.i2c/drivers/i2c/chips/Kconfig 2005-03-04 00:01:15.000000000 +0000 -@@ -320,6 +320,17 @@ - menu "Other I2C Chip support" - depends on I2C - -+config SENSORS_DS1337 -+ tristate "Dallas Semiconductor DS1337 Real Time Clock" -+ depends on I2C && EXPERIMENTAL -+ select I2C_SENSOR -+ help -+ If you say yes here you get support for Dallas Semiconductor -+ DS1337 real-time clock chips. -+ -+ This driver can also be built as a module. If so, the module -+ will be called ds1337. -+ - config SENSORS_EEPROM - tristate "EEPROM reader" - depends on I2C && EXPERIMENTAL -Index: linux-2.6.i2c/drivers/i2c/chips/Makefile -=================================--- linux-2.6.i2c.orig/drivers/i2c/chips/Makefile 2005-03-03 23:15:54.000000000 +0000 -+++ linux-2.6.i2c/drivers/i2c/chips/Makefile 2005-03-04 00:01:15.000000000 +0000 -@@ -11,6 +11,7 @@ - obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o - obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o - obj-$(CONFIG_SENSORS_ADM1031) += adm1031.o -+obj-$(CONFIG_SENSORS_DS1337) += ds1337.o - obj-$(CONFIG_SENSORS_DS1621) += ds1621.o - obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o - obj-$(CONFIG_SENSORS_FSCHER) += fscher.o +> diff --git a/N1/2.hdr b/N1/2.hdr new file mode 100644 index 0000000..11a8148 --- /dev/null +++ b/N1/2.hdr @@ -0,0 +1,5 @@ +Content-Type: text/plain; + name="ds1337.patch" +Content-Transfer-Encoding: 7bit +Content-Disposition: inline; + filename="ds1337.patch" diff --git a/N1/2.txt b/N1/2.txt new file mode 100644 index 0000000..19f2b76 --- /dev/null +++ b/N1/2.txt @@ -0,0 +1,423 @@ +i2c: add ds1337 RTC chip support + +Signed-off-by: James Chapman <jchapman@katalix.com> + +Index: linux-2.6.i2c/drivers/i2c/chips/ds1337.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ linux-2.6.i2c/drivers/i2c/chips/ds1337.c 2005-03-04 00:01:44.000000000 +0000 +@@ -0,0 +1,380 @@ ++/* ++ * linux/drivers/i2c/chips/ds1337.c ++ * ++ * Copyright (C) 2005 James Chapman <jchapman@katalix.com> ++ * ++ * based on linux/drivers/acron/char/pcf8583.c ++ * Copyright (C) 2000 Russell King ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Driver for Dallas Semiconductor DS1337 real time clock chip ++ */ ++ ++#include <linux/config.h> ++#include <linux/module.h> ++#include <linux/init.h> ++#include <linux/slab.h> ++#include <linux/i2c.h> ++#include <linux/i2c-sensor.h> ++#include <linux/string.h> ++#include <linux/rtc.h> /* get the user-level API */ ++#include <linux/bcd.h> ++#include <linux/list.h> ++ ++#define DS1337_NUM_REGS 16 ++#define DS1337_REG_CONFIG 2 ++ ++/* FIXME - how do we export these interface constants? */ ++#define DS1337_GET_DATE 0 ++#define DS1337_SET_DATE 1 ++ ++/* ++ * Functions declaration ++ */ ++static unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END }; ++static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END }; ++ ++SENSORS_INSMOD_1(ds1337); ++ ++static int ds1337_attach_adapter(struct i2c_adapter *adapter); ++static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind); ++static void ds1337_init_client(struct i2c_client *client); ++static int ds1337_detach_client(struct i2c_client *client); ++static int ds1337_command(struct i2c_client *client, unsigned int cmd, ++ void *arg); ++ ++/* ++ * Driver data (common to all clients) ++ */ ++static struct i2c_driver ds1337_driver = { ++ .owner = THIS_MODULE, ++ .name = "ds1337", ++ .flags = I2C_DF_NOTIFY, ++ .attach_adapter = ds1337_attach_adapter, ++ .detach_client = ds1337_detach_client, ++ .command = ds1337_command, ++}; ++ ++/* ++ * Client data (each client gets its own) ++ */ ++struct ds1337_data { ++ struct i2c_client client; ++ struct list_head list; ++ int id; ++}; ++ ++/* ++ * Internal variables ++ */ ++static int ds1337_id; ++static LIST_HEAD(ds1337_clients); ++ ++static inline int ds1337_read(struct i2c_client *client, u8 reg, u8 *value) ++{ ++ s32 tmp = i2c_smbus_read_byte_data(client, reg); ++ ++ if (tmp < 0) ++ return -EIO; ++ ++ *value = tmp; ++ ++ return 0; ++} ++ ++/* ++ * Chip access functions ++ */ ++static int ds1337_get_datetime(struct i2c_client *client, struct rtc_time *dt) ++{ ++ struct ds1337_data *data = i2c_get_clientdata(client); ++ int result; ++ u8 buf[7]; ++ u8 val; ++ struct i2c_msg msg[2]; ++ u8 offs = 0; ++ ++ if (!dt) { ++ dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n", ++ __FUNCTION__); ++ ++ return -EINVAL; ++ } ++ ++ msg[0].addr = client->addr; ++ msg[0].flags = 0; ++ msg[0].len = 1; ++ msg[0].buf = &offs; ++ ++ msg[1].addr = client->addr; ++ msg[1].flags = I2C_M_RD; ++ msg[1].len = sizeof(buf); ++ msg[1].buf = &buf[0]; ++ ++ result = client->adapter->algo->master_xfer(client->adapter, ++ &msg[0], 2); ++ ++ dev_dbg(&client->adapter->dev, ++ "%s: [%d] %02x %02x %02x %02x %02x %02x %02x\n", ++ __FUNCTION__, result, buf[0], buf[1], buf[2], buf[3], ++ buf[4], buf[5], buf[6]); ++ ++ if (result >= 0) { ++ dt->tm_sec = BCD_TO_BIN(buf[0]); ++ dt->tm_min = BCD_TO_BIN(buf[1]); ++ val = buf[2] & 0x3f; ++ dt->tm_hour = BCD_TO_BIN(val); ++ dt->tm_wday = BCD_TO_BIN(buf[3]) - 1; ++ dt->tm_mday = BCD_TO_BIN(buf[4]); ++ val = buf[5] & 0x7f; ++ dt->tm_mon = BCD_TO_BIN(val); ++ dt->tm_year = 1900 + BCD_TO_BIN(buf[6]); ++ if (buf[5] & 0x80) ++ dt->tm_year += 100; ++ ++ dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, " ++ "hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n", ++ __FUNCTION__, dt->tm_sec, dt->tm_min, ++ dt->tm_hour, dt->tm_mday, ++ dt->tm_mon, dt->tm_year, dt->tm_wday); ++ } else { ++ dev_err(&client->adapter->dev, "ds1337[%d]: error reading " ++ "data! %d\n", data->id, result); ++ result = -EIO; ++ } ++ ++ return result; ++} ++ ++static int ds1337_set_datetime(struct i2c_client *client, struct rtc_time *dt) ++{ ++ struct ds1337_data *data = i2c_get_clientdata(client); ++ int result; ++ u8 buf[8]; ++ u8 val; ++ struct i2c_msg msg[1]; ++ ++ if (!dt) { ++ dev_dbg(&client->adapter->dev, "%s: EINVAL: dt=NULL\n", ++ __FUNCTION__); ++ ++ return -EINVAL; ++ } ++ ++ dev_dbg(&client->adapter->dev, "%s: secs=%d, mins=%d, hours=%d, " ++ "mday=%d, mon=%d, year=%d, wday=%d\n", __FUNCTION__, ++ dt->tm_sec, dt->tm_min, dt->tm_hour, ++ dt->tm_mday, dt->tm_mon, dt->tm_year, dt->tm_wday); ++ ++ buf[0] = 0; /* reg offset */ ++ buf[1] = BIN_TO_BCD(dt->tm_sec); ++ buf[2] = BIN_TO_BCD(dt->tm_min); ++ buf[3] = BIN_TO_BCD(dt->tm_hour) | (1 << 6); ++ buf[4] = BIN_TO_BCD(dt->tm_wday) + 1; ++ buf[5] = BIN_TO_BCD(dt->tm_mday); ++ buf[6] = BIN_TO_BCD(dt->tm_mon); ++ if (dt->tm_year >= 2000) { ++ val = dt->tm_year - 2000; ++ buf[6] |= (1 << 7); ++ } else { ++ val = dt->tm_year - 1900; ++ } ++ buf[7] = BIN_TO_BCD(val); ++ ++ msg[0].addr = client->addr; ++ msg[0].flags = 0; ++ msg[0].len = sizeof(buf); ++ msg[0].buf = &buf[0]; ++ ++ result = client->adapter->algo->master_xfer(client->adapter, ++ &msg[0], 1); ++ if (result < 0) { ++ dev_err(&client->adapter->dev, "ds1337[%d]: error " ++ "writing data! %d\n", data->id, result); ++ result = -EIO; ++ } else { ++ result = 0; ++ } ++ ++ return result; ++} ++ ++static int ds1337_command(struct i2c_client *client, unsigned int cmd, ++ void *arg) ++{ ++ dev_dbg(&client->adapter->dev, "%s: cmd=%d\n", __FUNCTION__, cmd); ++ ++ switch (cmd) { ++ case DS1337_GET_DATE: ++ return ds1337_get_datetime(client, arg); ++ ++ case DS1337_SET_DATE: ++ return ds1337_set_datetime(client, arg); ++ ++ default: ++ return -EINVAL; ++ } ++} ++ ++/* Public API for access to specific device. Useful for low-level ++ * RTC access from kernel code. ++ */ ++int ds1337_do_command(int id, int cmd, void *arg) ++{ ++ struct list_head *walk; ++ struct list_head *tmp; ++ struct ds1337_data *data; ++ ++ list_for_each_safe(walk, tmp, &ds1337_clients) { ++ data = list_entry(walk, struct ds1337_data, list); ++ if (data->id == id) ++ return ds1337_command(&data->client, cmd, arg); ++ } ++ ++ return -ENODEV; ++} ++ ++static int ds1337_attach_adapter(struct i2c_adapter *adapter) ++{ ++ return i2c_detect(adapter, &addr_data, ds1337_detect); ++} ++ ++/* ++ * The following function does more than just detection. If detection ++ * succeeds, it also registers the new chip. ++ */ ++static int ds1337_detect(struct i2c_adapter *adapter, int address, int kind) ++{ ++ struct i2c_client *new_client; ++ struct ds1337_data *data; ++ int err = 0; ++ const char *name = ""; ++ ++ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA | ++ I2C_FUNC_I2C)) ++ goto exit; ++ ++ if (!(data = kmalloc(sizeof(struct ds1337_data), GFP_KERNEL))) { ++ err = -ENOMEM; ++ goto exit; ++ } ++ memset(data, 0, sizeof(struct ds1337_data)); ++ INIT_LIST_HEAD(&data->list); ++ ++ /* The common I2C client data is placed right before the ++ * DS1337-specific data. ++ */ ++ new_client = &data->client; ++ i2c_set_clientdata(new_client, data); ++ new_client->addr = address; ++ new_client->adapter = adapter; ++ new_client->driver = &ds1337_driver; ++ new_client->flags = 0; ++ ++ /* ++ * Now we do the remaining detection. A negative kind means that ++ * the driver was loaded with no force parameter (default), so we ++ * must both detect and identify the chip. A zero kind means that ++ * the driver was loaded with the force parameter, the detection ++ * step shall be skipped. A positive kind means that the driver ++ * was loaded with the force parameter and a given kind of chip is ++ * requested, so both the detection and the identification steps ++ * are skipped. ++ */ ++ ++ /* Default to an DS1337 if forced */ ++ if (kind == 0) ++ kind = ds1337; ++ ++ if (kind < 0) { /* detection and identification */ ++ ++ u8 buf[DS1337_NUM_REGS]; ++ int reg; ++ ++ /* Check that all DS1337 registers are present */ ++ for (reg = 0; reg < DS1337_NUM_REGS; reg++) ++ if (ds1337_read(new_client, reg, &buf[reg]) < 0) ++ goto exit_free; ++ ++ /* Check that control register bits 6-5 are zero */ ++ if (buf[14] & 0x60) ++ goto exit_free; ++ ++ /* Check that status register bits 6-2 are zero */ ++ if (buf[15] & 0x7c) ++ goto exit_free; ++ ++ kind = ds1337; ++ } ++ ++ if (kind == ds1337) ++ name = "ds1337"; ++ ++ /* We can fill in the remaining client fields */ ++ strlcpy(new_client->name, name, I2C_NAME_SIZE); ++ ++ /* Tell the I2C layer a new client has arrived */ ++ if ((err = i2c_attach_client(new_client))) ++ goto exit_free; ++ ++ /* Initialize the DS1337 chip */ ++ ds1337_init_client(new_client); ++ ++ /* Add client to local list */ ++ data->id = ds1337_id++; ++ list_add(&data->list, &ds1337_clients); ++ ++ return 0; ++ ++exit_free: ++ kfree(data); ++exit: ++ return err; ++} ++ ++static void ds1337_init_client(struct i2c_client *client) ++{ ++ s32 val; ++ ++ /* Ensure that device is set in 24-hour mode */ ++ val = i2c_smbus_read_byte_data(client, DS1337_REG_CONFIG); ++ if ((val >= 0) && (val & (1 << 6)) == 0) ++ i2c_smbus_write_byte_data(client, DS1337_REG_CONFIG, ++ val | (1 << 6)); ++} ++ ++static int ds1337_detach_client(struct i2c_client *client) ++{ ++ int err; ++ struct ds1337_data *data = i2c_get_clientdata(client); ++ ++ if ((err = i2c_detach_client(client))) { ++ dev_err(&client->dev, "Client deregistration failed, " ++ "client not detached.\n"); ++ return err; ++ } ++ ++ list_del(&data->list); ++ kfree(data); ++ return 0; ++} ++ ++static int __init ds1337_init(void) ++{ ++ return i2c_add_driver(&ds1337_driver); ++} ++ ++static void __exit ds1337_exit(void) ++{ ++ i2c_del_driver(&ds1337_driver); ++} ++ ++MODULE_AUTHOR("James Chapman <jchapman@katalix.com>"); ++MODULE_DESCRIPTION("DS1337 RTC driver"); ++MODULE_LICENSE("GPL"); ++ ++module_init(ds1337_init); ++module_exit(ds1337_exit); +Index: linux-2.6.i2c/drivers/i2c/chips/Kconfig +=================================================================== +--- linux-2.6.i2c.orig/drivers/i2c/chips/Kconfig 2005-03-03 23:15:54.000000000 +0000 ++++ linux-2.6.i2c/drivers/i2c/chips/Kconfig 2005-03-04 00:01:15.000000000 +0000 +@@ -320,6 +320,17 @@ + menu "Other I2C Chip support" + depends on I2C + ++config SENSORS_DS1337 ++ tristate "Dallas Semiconductor DS1337 Real Time Clock" ++ depends on I2C && EXPERIMENTAL ++ select I2C_SENSOR ++ help ++ If you say yes here you get support for Dallas Semiconductor ++ DS1337 real-time clock chips. ++ ++ This driver can also be built as a module. If so, the module ++ will be called ds1337. ++ + config SENSORS_EEPROM + tristate "EEPROM reader" + depends on I2C && EXPERIMENTAL +Index: linux-2.6.i2c/drivers/i2c/chips/Makefile +=================================================================== +--- linux-2.6.i2c.orig/drivers/i2c/chips/Makefile 2005-03-03 23:15:54.000000000 +0000 ++++ linux-2.6.i2c/drivers/i2c/chips/Makefile 2005-03-04 00:01:15.000000000 +0000 +@@ -11,6 +11,7 @@ + obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o + obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o + obj-$(CONFIG_SENSORS_ADM1031) += adm1031.o ++obj-$(CONFIG_SENSORS_DS1337) += ds1337.o + obj-$(CONFIG_SENSORS_DS1621) += ds1621.o + obj-$(CONFIG_SENSORS_EEPROM) += eeprom.o + obj-$(CONFIG_SENSORS_FSCHER) += fscher.o diff --git a/a/content_digest b/N1/content_digest index ad2eb35..3bb802f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,13 @@ "ref\0cIyC5ZN2.1109756623.5808030.khali@localhost\0" "ref\0422747FB.9020004@katalix.com\0" "ref\020050303204934.69620667.khali@linux-fr.org\0" - "From\0jchapman@katalix.com (James Chapman)\0" - "Subject\0[PATCH: 2.6.11-rc5] i2c chips: ds1337 RTC driver\0" - "Date\0Thu, 19 May 2005 06:25:41 +0000\0" + "From\0James Chapman <jchapman@katalix.com>\0" + "Subject\0Re: [PATCH: 2.6.11-rc5] i2c chips: ds1337 RTC driver\0" + "Date\0Fri, 04 Mar 2005 00:08:49 +0000\0" "To\0LM Sensors <sensors@stimpy.netroedge.com>" " LKML <linux-kernel@vger.kernel.org>\0" "Cc\0Greg KH <greg@kroah.com>\0" - "\00:1\0" + "\01:1\0" "b\0" "Revised patch is attached.\n" "\n" @@ -30,14 +30,17 @@ "> i2c_smbus_{read,write}_i2c_block_data. Adapter which declare themselves\n" "> I2C_FUNC_SMBUS_I2C_BLOCK-capable may not implement master_xfer. You\n" "> really need to check for I2C_FUNC_I2C.\n" - "> \n" - "-------------- next part --------------\n" + > + "\01:2\0" + "fn\0ds1337.patch\0" + "b\0" "i2c: add ds1337 RTC chip support\n" "\n" "Signed-off-by: James Chapman <jchapman@katalix.com>\n" "\n" "Index: linux-2.6.i2c/drivers/i2c/chips/ds1337.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6.i2c/drivers/i2c/chips/ds1337.c\t2005-03-04 00:01:44.000000000 +0000\n" "@@ -0,0 +1,380 @@\n" "+/*\n" @@ -272,7 +275,7 @@ "+\n" "+\tlist_for_each_safe(walk, tmp, &ds1337_clients) {\n" "+\t\tdata = list_entry(walk, struct ds1337_data, list);\n" - "+\t\tif (data->id = id)\n" + "+\t\tif (data->id == id)\n" "+\t\t\treturn ds1337_command(&data->client, cmd, arg);\n" "+\t}\n" "+\n" @@ -328,7 +331,7 @@ "+\t */\n" "+\n" "+\t/* Default to an DS1337 if forced */\n" - "+\tif (kind = 0)\n" + "+\tif (kind == 0)\n" "+\t\tkind = ds1337;\n" "+\n" "+\tif (kind < 0) {\t\t/* detection and identification */\n" @@ -352,7 +355,7 @@ "+\t\tkind = ds1337;\n" "+\t}\n" "+\n" - "+\tif (kind = ds1337)\n" + "+\tif (kind == ds1337)\n" "+\t\tname = \"ds1337\";\n" "+\n" "+\t/* We can fill in the remaining client fields */\n" @@ -383,7 +386,7 @@ "+\n" "+\t/* Ensure that device is set in 24-hour mode */\n" "+\tval = i2c_smbus_read_byte_data(client, DS1337_REG_CONFIG);\n" - "+\tif ((val >= 0) && (val & (1 << 6)) = 0)\n" + "+\tif ((val >= 0) && (val & (1 << 6)) == 0)\n" "+\t\ti2c_smbus_write_byte_data(client, DS1337_REG_CONFIG,\n" "+\t\t\t\t\t val | (1 << 6));\n" "+}\n" @@ -421,7 +424,8 @@ "+module_init(ds1337_init);\n" "+module_exit(ds1337_exit);\n" "Index: linux-2.6.i2c/drivers/i2c/chips/Kconfig\n" - "=================================--- linux-2.6.i2c.orig/drivers/i2c/chips/Kconfig\t2005-03-03 23:15:54.000000000 +0000\n" + "===================================================================\n" + "--- linux-2.6.i2c.orig/drivers/i2c/chips/Kconfig\t2005-03-03 23:15:54.000000000 +0000\n" "+++ linux-2.6.i2c/drivers/i2c/chips/Kconfig\t2005-03-04 00:01:15.000000000 +0000\n" "@@ -320,6 +320,17 @@\n" " menu \"Other I2C Chip support\"\n" @@ -442,7 +446,8 @@ " \ttristate \"EEPROM reader\"\n" " \tdepends on I2C && EXPERIMENTAL\n" "Index: linux-2.6.i2c/drivers/i2c/chips/Makefile\n" - "=================================--- linux-2.6.i2c.orig/drivers/i2c/chips/Makefile\t2005-03-03 23:15:54.000000000 +0000\n" + "===================================================================\n" + "--- linux-2.6.i2c.orig/drivers/i2c/chips/Makefile\t2005-03-03 23:15:54.000000000 +0000\n" "+++ linux-2.6.i2c/drivers/i2c/chips/Makefile\t2005-03-04 00:01:15.000000000 +0000\n" "@@ -11,6 +11,7 @@\n" " obj-$(CONFIG_SENSORS_ADM1025)\t+= adm1025.o\n" @@ -453,4 +458,4 @@ " obj-$(CONFIG_SENSORS_EEPROM)\t+= eeprom.o\n" " obj-$(CONFIG_SENSORS_FSCHER)\t+= fscher.o" -5b645616efd2380a243646fb21e646a15ef458da156d05d9b7c92bc9588d340a +a69cdf9df4cbd0579d41a76141d0f08577797590bbd3645bcf318b5b18a8d9b2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.