aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-12-01 20:23:43 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-12-01 20:23:43 +0000
commit219694ee98f9eb9edbbd293ab0801599742dd4d9 (patch)
treebd0601b769b5eb06a67a47f7d663faa6a51833cc
parent36bf5d3dadfa5bf0af2e4776495d24fb51d5ecd1 (diff)
downloadupstream-219694ee98f9eb9edbbd293ab0801599742dd4d9.tar.gz
upstream-219694ee98f9eb9edbbd293ab0801599742dd4d9.tar.bz2
upstream-219694ee98f9eb9edbbd293ab0801599742dd4d9.zip
backport the new style ds1672 driver and switch to it
SVN-Revision: 13457
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/090-ds1672_new_style.patch227
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/091-ds1672_missing_id_table.patch21
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/403-ds1672_detect.patch16
-rw-r--r--target/linux/ixp4xx/patches-2.6.27/190-cambria_support.patch6
-rw-r--r--target/linux/ixp4xx/patches-2.6.27/300-avila_fetch_mac.patch6
5 files changed, 254 insertions, 22 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/090-ds1672_new_style.patch b/target/linux/generic-2.6/patches-2.6.27/090-ds1672_new_style.patch
new file mode 100644
index 0000000000..26c0097d03
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.27/090-ds1672_new_style.patch
@@ -0,0 +1,227 @@
+From: Alessandro Zummo <alessandro.zummo@towertech.it>
+Date: Thu, 16 Oct 2008 05:03:10 +0000 (-0700)
+Subject: rtc-ds1672 new style driver
+X-Git-Tag: v2.6.28-rc1~429
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=1716b0fea36c2be628440c1050182a1a1e9caae7
+
+rtc-ds1672 new style driver
+
+New style conversion and reformatting as per indent --linux-style
+
+Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
+Cc: David Brownell <david-b@pacbell.net>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+
+--- a/drivers/rtc/rtc-ds1672.c
++++ b/drivers/rtc/rtc-ds1672.c
+@@ -9,17 +9,10 @@
+ * published by the Free Software Foundation.
+ */
+
+-#include <linux/module.h>
+ #include <linux/i2c.h>
+ #include <linux/rtc.h>
+
+-#define DRV_VERSION "0.3"
+-
+-/* Addresses to scan: none. This chip cannot be detected. */
+-static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
+-
+-/* Insmod parameters */
+-I2C_CLIENT_INSMOD;
++#define DRV_VERSION "0.4"
+
+ /* Registers */
+
+@@ -29,8 +22,7 @@ I2C_CLIENT_INSMOD;
+
+ #define DS1672_REG_CONTROL_EOSC 0x80
+
+-/* Prototypes */
+-static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind);
++static struct i2c_driver ds1672_driver;
+
+ /*
+ * In the routines that deal directly with the ds1672 hardware, we use
+@@ -44,8 +36,8 @@ static int ds1672_get_datetime(struct i2
+ unsigned char buf[4];
+
+ struct i2c_msg msgs[] = {
+- { client->addr, 0, 1, &addr }, /* setup read ptr */
+- { client->addr, I2C_M_RD, 4, buf }, /* read date */
++ {client->addr, 0, 1, &addr}, /* setup read ptr */
++ {client->addr, I2C_M_RD, 4, buf}, /* read date */
+ };
+
+ /* read date registers */
+@@ -80,7 +72,7 @@ static int ds1672_set_mmss(struct i2c_cl
+ buf[2] = (secs & 0x0000FF00) >> 8;
+ buf[3] = (secs & 0x00FF0000) >> 16;
+ buf[4] = (secs & 0xFF000000) >> 24;
+- buf[5] = 0; /* set control reg to enable counting */
++ buf[5] = 0; /* set control reg to enable counting */
+
+ xfer = i2c_master_send(client, buf, 6);
+ if (xfer != 6) {
+@@ -127,8 +119,8 @@ static int ds1672_get_control(struct i2c
+ unsigned char addr = DS1672_REG_CONTROL;
+
+ struct i2c_msg msgs[] = {
+- { client->addr, 0, 1, &addr }, /* setup read ptr */
+- { client->addr, I2C_M_RD, 1, status }, /* read control */
++ {client->addr, 0, 1, &addr}, /* setup read ptr */
++ {client->addr, I2C_M_RD, 1, status}, /* read control */
+ };
+
+ /* read control register */
+@@ -141,7 +133,8 @@ static int ds1672_get_control(struct i2c
+ }
+
+ /* following are the sysfs callback functions */
+-static ssize_t show_control(struct device *dev, struct device_attribute *attr, char *buf)
++static ssize_t show_control(struct device *dev, struct device_attribute *attr,
++ char *buf)
+ {
+ struct i2c_client *client = to_i2c_client(dev);
+ u8 control;
+@@ -152,85 +145,46 @@ static ssize_t show_control(struct devic
+ return err;
+
+ return sprintf(buf, "%s\n", (control & DS1672_REG_CONTROL_EOSC)
+- ? "disabled" : "enabled");
++ ? "disabled" : "enabled");
+ }
++
+ static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);
+
+ static const struct rtc_class_ops ds1672_rtc_ops = {
+- .read_time = ds1672_rtc_read_time,
+- .set_time = ds1672_rtc_set_time,
+- .set_mmss = ds1672_rtc_set_mmss,
++ .read_time = ds1672_rtc_read_time,
++ .set_time = ds1672_rtc_set_time,
++ .set_mmss = ds1672_rtc_set_mmss,
+ };
+
+-static int ds1672_attach(struct i2c_adapter *adapter)
+-{
+- return i2c_probe(adapter, &addr_data, ds1672_probe);
+-}
+-
+-static int ds1672_detach(struct i2c_client *client)
++static int ds1672_remove(struct i2c_client *client)
+ {
+- int err;
+ struct rtc_device *rtc = i2c_get_clientdata(client);
+
+- if (rtc)
++ if (rtc)
+ rtc_device_unregister(rtc);
+
+- if ((err = i2c_detach_client(client)))
+- return err;
+-
+- kfree(client);
+-
+ return 0;
+ }
+
+-static struct i2c_driver ds1672_driver = {
+- .driver = {
+- .name = "ds1672",
+- },
+- .id = I2C_DRIVERID_DS1672,
+- .attach_adapter = &ds1672_attach,
+- .detach_client = &ds1672_detach,
+-};
+-
+-static int ds1672_probe(struct i2c_adapter *adapter, int address, int kind)
++static int ds1672_probe(struct i2c_client *client,
++ const struct i2c_device_id *id)
+ {
+ int err = 0;
+ u8 control;
+- struct i2c_client *client;
+ struct rtc_device *rtc;
+
+- dev_dbg(&adapter->dev, "%s\n", __func__);
+-
+- if (!i2c_check_functionality(adapter, I2C_FUNC_I2C)) {
+- err = -ENODEV;
+- goto exit;
+- }
+-
+- if (!(client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL))) {
+- err = -ENOMEM;
+- goto exit;
+- }
++ dev_dbg(&client->dev, "%s\n", __func__);
+
+- /* I2C client */
+- client->addr = address;
+- client->driver = &ds1672_driver;
+- client->adapter = adapter;
+-
+- strlcpy(client->name, ds1672_driver.driver.name, I2C_NAME_SIZE);
+-
+- /* Inform the i2c layer */
+- if ((err = i2c_attach_client(client)))
+- goto exit_kfree;
++ if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
++ return -ENODEV;
+
+ dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
+
+ rtc = rtc_device_register(ds1672_driver.driver.name, &client->dev,
+- &ds1672_rtc_ops, THIS_MODULE);
++ &ds1672_rtc_ops, THIS_MODULE);
+
+- if (IS_ERR(rtc)) {
+- err = PTR_ERR(rtc);
+- goto exit_detach;
+- }
++ if (IS_ERR(rtc))
++ return PTR_ERR(rtc);
+
+ i2c_set_clientdata(client, rtc);
+
+@@ -241,7 +195,7 @@ static int ds1672_probe(struct i2c_adapt
+
+ if (control & DS1672_REG_CONTROL_EOSC)
+ dev_warn(&client->dev, "Oscillator not enabled. "
+- "Set time to enable.\n");
++ "Set time to enable.\n");
+
+ /* Register sysfs hooks */
+ err = device_create_file(&client->dev, &dev_attr_control);
+@@ -250,19 +204,19 @@ static int ds1672_probe(struct i2c_adapt
+
+ return 0;
+
+-exit_devreg:
++ exit_devreg:
+ rtc_device_unregister(rtc);
+-
+-exit_detach:
+- i2c_detach_client(client);
+-
+-exit_kfree:
+- kfree(client);
+-
+-exit:
+ return err;
+ }
+
++static struct i2c_driver ds1672_driver = {
++ .driver = {
++ .name = "rtc-ds1672",
++ },
++ .probe = &ds1672_probe,
++ .remove = &ds1672_remove,
++};
++
+ static int __init ds1672_init(void)
+ {
+ return i2c_add_driver(&ds1672_driver);
diff --git a/target/linux/generic-2.6/patches-2.6.27/091-ds1672_missing_id_table.patch b/target/linux/generic-2.6/patches-2.6.27/091-ds1672_missing_id_table.patch
new file mode 100644
index 0000000000..78a160c9ac
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.27/091-ds1672_missing_id_table.patch
@@ -0,0 +1,21 @@
+--- a/drivers/rtc/rtc-ds1672.c
++++ b/drivers/rtc/rtc-ds1672.c
+@@ -209,12 +209,18 @@ static int ds1672_probe(struct i2c_clien
+ return err;
+ }
+
++static struct i2c_device_id ds1672_id[] = {
++ { "ds1672", 0 },
++ { }
++};
++
+ static struct i2c_driver ds1672_driver = {
+ .driver = {
+ .name = "rtc-ds1672",
+ },
+ .probe = &ds1672_probe,
+ .remove = &ds1672_remove,
++ .id_table = ds1672_id,
+ };
+
+ static int __init ds1672_init(void)
diff --git a/target/linux/generic-2.6/patches-2.6.27/403-ds1672_detect.patch b/target/linux/generic-2.6/patches-2.6.27/403-ds1672_detect.patch
deleted file mode 100644
index 86c26346a8..0000000000
--- a/target/linux/generic-2.6/patches-2.6.27/403-ds1672_detect.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/drivers/rtc/rtc-ds1672.c
-+++ b/drivers/rtc/rtc-ds1672.c
-@@ -13,10 +13,10 @@
- #include <linux/i2c.h>
- #include <linux/rtc.h>
-
--#define DRV_VERSION "0.3"
-+#define DRV_VERSION "0.4"
-
--/* Addresses to scan: none. This chip cannot be detected. */
--static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
-+/* Addresses to scan: 0x68 */
-+static const unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END };
-
- /* Insmod parameters */
- I2C_CLIENT_INSMOD;
diff --git a/target/linux/ixp4xx/patches-2.6.27/190-cambria_support.patch b/target/linux/ixp4xx/patches-2.6.27/190-cambria_support.patch
index 87bfd09a4f..d1a9f85067 100644
--- a/target/linux/ixp4xx/patches-2.6.27/190-cambria_support.patch
+++ b/target/linux/ixp4xx/patches-2.6.27/190-cambria_support.patch
@@ -441,9 +441,9 @@
+};
+
+static struct i2c_board_info __initdata cambria_i2c_board_info[] = {
-+/* {
-+ I2C_BOARD_INFO("rtc-ds1672", 0x68),
-+ },*/
++ {
++ I2C_BOARD_INFO("ds1672", 0x68),
++ },
+ {
+ I2C_BOARD_INFO("ad7418", 0x28),
+ },
diff --git a/target/linux/ixp4xx/patches-2.6.27/300-avila_fetch_mac.patch b/target/linux/ixp4xx/patches-2.6.27/300-avila_fetch_mac.patch
index 2c87aadd97..4581bdd347 100644
--- a/target/linux/ixp4xx/patches-2.6.27/300-avila_fetch_mac.patch
+++ b/target/linux/ixp4xx/patches-2.6.27/300-avila_fetch_mac.patch
@@ -190,9 +190,9 @@
+};
+
+static struct i2c_board_info __initdata avila_i2c_board_info[] = {
-+/* {
-+ I2C_BOARD_INFO("rtc-ds1672", 0x68),
-+ },*/
++ {
++ I2C_BOARD_INFO("ds1672", 0x68),
++ },
+ {
+ I2C_BOARD_INFO("ad7418", 0x28),
+ },