[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-481-g0ec08ae
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-481-g0ec08ae
|
From: Julien B a. A. <ar...@us...> - 2013-10-05 08:16:47
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 0ec08aed9aa80594b175b7a0ee3aa1f972ffbcc2 (commit)
via 80c039ecab5c8c51e6156f12d878b473c99e7d91 (commit)
from 7edacdb643835d4a88ee5884747e7f8909286090 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0ec08aed9aa80594b175b7a0ee3aa1f972ffbcc2
Author: Julien Boibessot <jul...@ar...>
Date: Sat Oct 5 10:16:18 2013 +0200
[LINUX] 3.11: Add support for mcp7940x RTC
commit 80c039ecab5c8c51e6156f12d878b473c99e7d91
Author: Julien Boibessot <jul...@ar...>
Date: Sat Oct 5 10:10:54 2013 +0200
[LINUX] Common: Makes mcp7940x RTC driver also works on recent kernels
-----------------------------------------------------------------------
Summary of changes:
.../0450-armadeus-add_mcp7940x_rtc_driver.patch} | 0
.../0450b-armadeus-add_mcp7940x_rtc_driver.patch} | 20 +++++-----
.../000-armadeus-add_mcp7940x_rtc_driver.patch | 42 ++++++++++++-------
3 files changed, 36 insertions(+), 26 deletions(-)
copy patches/linux/{2.6.35/464-armadeus-add_mcp7940x_rtc_driver.patch => 3.11/0450-armadeus-add_mcp7940x_rtc_driver.patch} (100%)
copy patches/linux/{2.6.38/450b-armadeus-add_mcp7940x_rtc_driver.patch => 3.11/0450b-armadeus-add_mcp7940x_rtc_driver.patch} (65%)
diff --git a/patches/linux/2.6.35/464-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/3.11/0450-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 100%
copy from patches/linux/2.6.35/464-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/3.11/0450-armadeus-add_mcp7940x_rtc_driver.patch
diff --git a/patches/linux/2.6.38/450b-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/3.11/0450b-armadeus-add_mcp7940x_rtc_driver.patch
similarity index 65%
copy from patches/linux/2.6.38/450b-armadeus-add_mcp7940x_rtc_driver.patch
copy to patches/linux/3.11/0450b-armadeus-add_mcp7940x_rtc_driver.patch
index 047d916..c52861a 100644
--- a/patches/linux/2.6.38/450b-armadeus-add_mcp7940x_rtc_driver.patch
+++ b/patches/linux/3.11/0450b-armadeus-add_mcp7940x_rtc_driver.patch
@@ -1,14 +1,14 @@
-Add mcp79400 Linux driver for kernel 2.6.38
+Add mcp79400 Linux driver for 3.11 kernel
Signed-off-by: Fabien Marteau <fab...@ar...>
---
-Index: linux-2.6.38.8/drivers/rtc/Kconfig
+Index: linux/drivers/rtc/Kconfig
===================================================================
---- linux-2.6.38.8.orig/drivers/rtc/Kconfig 2012-11-16 17:52:01.000000000 +0100
-+++ linux-2.6.38.8/drivers/rtc/Kconfig 2012-11-16 17:54:51.000000000 +0100
-@@ -282,6 +282,17 @@
+--- linux.orig/drivers/rtc/Kconfig 2012-11-16 17:52:01.000000000 +0100
++++ linux/drivers/rtc/Kconfig 2012-11-16 17:54:51.000000000 +0100
+@@ -371,6 +371,17 @@
If you say Y here you will get support for the
watchdog timer in the ST M41T60 and M41T80 RTC chips series.
@@ -26,13 +26,13 @@ Index: linux-2.6.38.8/drivers/rtc/Kconfig
config RTC_DRV_BQ32K
tristate "TI BQ32000"
help
-Index: linux-2.6.38.8/drivers/rtc/Makefile
+Index: linux/drivers/rtc/Makefile
===================================================================
---- linux-2.6.38.8.orig/drivers/rtc/Makefile 2012-11-16 17:51:56.000000000 +0100
-+++ linux-2.6.38.8/drivers/rtc/Makefile 2012-11-16 17:52:28.000000000 +0100
-@@ -64,6 +64,7 @@
- obj-$(CONFIG_RTC_DRV_MAX8998) += rtc-max8998.o
+--- linux.orig/drivers/rtc/Makefile 2012-11-16 17:51:56.000000000 +0100
++++ linux/drivers/rtc/Makefile 2012-11-16 17:52:28.000000000 +0100
+@@ -76,6 +76,7 @@
obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o
+ obj-$(CONFIG_RTC_DRV_MAX77686) += rtc-max77686.o
obj-$(CONFIG_RTC_DRV_MC13XXX) += rtc-mc13xxx.o
+obj-$(CONFIG_RTC_DRV_MCP7940X) += rtc-mcp7940x.o
obj-$(CONFIG_RTC_DRV_MSM6242) += rtc-msm6242.o
diff --git a/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch b/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
index ed929ad..fef2f0b 100644
--- a/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
+++ b/patches/linux/common/000-armadeus-add_mcp7940x_rtc_driver.patch
@@ -3,11 +3,11 @@ Add mcp79400 Linux driver
Signed-off-by: Fabien Marteau <fab...@ar...>
---
-Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+Index: linux-3.11.1/drivers/rtc/rtc-mcp7940x.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c 2013-07-22 14:48:37.045061568 +0200
-@@ -0,0 +1,501 @@
++++ linux-3.11.1/drivers/rtc/rtc-mcp7940x.c 2013-10-05 09:29:52.179513345 +0200
+@@ -0,0 +1,511 @@
+/*
+ * RTC client/driver for the Microchip MCP7940x Real-Time Clock over I2C
+ *
@@ -34,6 +34,7 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+#include <linux/rtc.h>
+#include <linux/bcd.h>
+#include <linux/slab.h>
++#include <linux/version.h> /* LINUX_VERSION_CODE */
+
+/* Time of Day */
+#define MCP7940X_REG_TD_SECONDS 0x00
@@ -102,6 +103,7 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+
+static struct i2c_driver mcp7940x_driver;
+
++#if 0
+static void mcp7940x_reg_dump(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
@@ -137,6 +139,7 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+ printk(" MCP7940X_REG_TS1_DATE (0x%02X) -> 0x%02X\n", MCP7940X_REG_TS1_DATE ,i2c_smbus_read_byte_data(client,MCP7940X_REG_TS1_DATE));
+ printk(" MCP7940X_REG_TS1_MONTH (0x%02X) -> 0x%02X\n", MCP7940X_REG_TS1_MONTH ,i2c_smbus_read_byte_data(client,MCP7940X_REG_TS1_MONTH));
+}
++#endif
+
+static int mcp7940x_read_time(struct device *dev, struct rtc_time *time)
+{
@@ -367,28 +370,26 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+ return 0;
+}
+
-+
+/* TODO: see rtc-ds1511.c */
+static int mcp79400_alarm_irq_enable(struct device *dev, unsigned int enabled)
+{
+ return 0;
+}
+
-+static int mcp79400_update_irq_enable(struct device *dev, unsigned int enabled)
-+{
-+ return 0;
-+}
-+
-+
+static const struct rtc_class_ops mcp7940x_rtc_ops = {
-+ .read_time = mcp7940x_read_time,
-+ .set_time = mcp7940x_set_time,
-+ .read_alarm = mcp79400_read_alarm, /* Use ALARM0 only */
-+ .set_alarm = mcp79400_set_alarm,
-+ .alarm_irq_enable= mcp79400_alarm_irq_enable,
-+ .update_irq_enable=mcp79400_update_irq_enable,
++ .read_time = mcp7940x_read_time,
++ .set_time = mcp7940x_set_time,
++ .read_alarm = mcp79400_read_alarm, /* Use ALARM0 only */
++ .set_alarm = mcp79400_set_alarm,
++ .alarm_irq_enable = mcp79400_alarm_irq_enable,
+};
+
++static const struct of_device_id mcp7940x_rtc_dt_match[] = {
++ { .compatible = "microchip,mcp7940x-rtc", },
++ { /* sentinel */ }
++};
++MODULE_DEVICE_TABLE(of, mcp7940x_rtc_dt_match);
++
+static int mcp7940x_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
@@ -457,7 +458,11 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+ return ret;
+}
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
+static int __devexit mcp7940x_remove(struct i2c_client *client)
++#else
++static int __exit mcp7940x_remove(struct i2c_client *client)
++#endif
+{
+ struct mcp7940x *mcp7940x = i2c_get_clientdata(client);
+
@@ -485,11 +490,16 @@ Index: linux-2.6.35.3/drivers/rtc/rtc-mcp7940x.c
+ .driver = {
+ .name = "rtc-mcp7940x",
+ .owner = THIS_MODULE,
++ .of_match_table = mcp7940x_rtc_dt_match,
+ },
+ .probe = mcp7940x_probe,
+ .suspend = mcp7940x_suspend,
+ .resume = mcp7940x_resume,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)
+ .remove = __devexit_p(mcp7940x_remove),
++#else
++ .remove = __exit_p(mcp7940x_remove),
++#endif
+ .id_table = mcp7940x_id,
+};
+
hooks/post-receive
--
armadeus
|
