[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-317-g4761cd2
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-317-g4761cd2
|
From: Julien B a. A. <ar...@us...> - 2014-06-30 15:53:03
|
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 4761cd26463cf8a3e0cad0b6e8b8f96c26a33d61 (commit)
from 4ab4be142c38300d05430ec72f304e19a108ebbf (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 4761cd26463cf8a3e0cad0b6e8b8f96c26a33d61
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 17:51:58 2014 +0200
[LINUX] 3.13: re-add as1531 hwmon driver (only for 3.13 until it really works)
-----------------------------------------------------------------------
Summary of changes:
.../0363-armadeus-hwmon-add-as1531-adc.patch} | 44 ++++++++++++--------
1 files changed, 27 insertions(+), 17 deletions(-)
copy patches/linux/{3.0/363-armadeus-ADC-Adding_AS1531_adc_driver.patch => 3.13/0363-armadeus-hwmon-add-as1531-adc.patch} (89%)
diff --git a/patches/linux/3.0/363-armadeus-ADC-Adding_AS1531_adc_driver.patch b/patches/linux/3.13/0363-armadeus-hwmon-add-as1531-adc.patch
similarity index 89%
copy from patches/linux/3.0/363-armadeus-ADC-Adding_AS1531_adc_driver.patch
copy to patches/linux/3.13/0363-armadeus-hwmon-add-as1531-adc.patch
index 409dcd5..d87e831 100644
--- a/patches/linux/3.0/363-armadeus-ADC-Adding_AS1531_adc_driver.patch
+++ b/patches/linux/3.13/0363-armadeus-hwmon-add-as1531-adc.patch
@@ -3,11 +3,11 @@ Driver for Austria-Microsystem Analog to Digital Converter.
Signed-off-by: Fabien Marteau <fab...@ar...>
-Index: linux-3.0.10/drivers/hwmon/as1531.c
+Index: linux-3.13.11/drivers/hwmon/as1531.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.10/drivers/hwmon/as1531.c 2011-12-02 09:18:31.000000000 +0100
-@@ -0,0 +1,298 @@
++++ linux-3.13.11/drivers/hwmon/as1531.c 2014-06-30 17:20:58.142454610 +0200
+@@ -0,0 +1,308 @@
+/*
+ * as1531.c
+ *
@@ -215,9 +215,16 @@ Index: linux-3.0.10/drivers/hwmon/as1531.c
+ SENSOR_ATTR(in7_input, S_IRUGO, as1531_read, NULL, 7),
+};
+
-+/*----------------------------------------------------------------------*/
++#ifdef CONFIG_OF
++static struct of_device_id as1531_of_match[] __initdata = {
++ { .compatible = "armadeus,as1231", },
++ { /* sentinel */ }
++};
++
++MODULE_DEVICE_TABLE(of, as1531_of_match);
++#endif
+
-+static int __devinit as1531_probe(struct spi_device *spi)
++static int as1531_probe(struct spi_device *spi)
+{
+ struct as1531 *adc;
+ int status;
@@ -260,7 +267,7 @@ Index: linux-3.0.10/drivers/hwmon/as1531.c
+ return status;
+}
+
-+static int __devexit as1531_remove(struct spi_device *spi)
++static int as1531_remove(struct spi_device *spi)
+{
+ struct as1531 *adc = dev_get_drvdata(&spi->dev);
+ int i;
@@ -283,9 +290,12 @@ Index: linux-3.0.10/drivers/hwmon/as1531.c
+ .driver = {
+ .name = "as1531",
+ .owner = THIS_MODULE,
++#if defined(CONFIG_OF)
++ .of_match_table = as1531_of_match,
++#endif
+ },
+ .probe = as1531_probe,
-+ .remove = __devexit_p(as1531_remove),
++ .remove = as1531_remove,
+};
+
+/* Init module */
@@ -306,11 +316,11 @@ Index: linux-3.0.10/drivers/hwmon/as1531.c
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Fabien Marteau <fab...@ar...>");
+MODULE_DESCRIPTION("Driver for AS1531 ADC");
-Index: linux-3.0.10/drivers/hwmon/Kconfig
+Index: linux-3.13.11/drivers/hwmon/Kconfig
===================================================================
---- linux-3.0.10.orig/drivers/hwmon/Kconfig 2011-12-02 09:18:11.000000000 +0100
-+++ linux-3.0.10/drivers/hwmon/Kconfig 2011-12-02 09:18:31.000000000 +0100
-@@ -104,6 +104,14 @@
+--- linux-3.13.11.orig/drivers/hwmon/Kconfig 2014-04-23 01:49:33.000000000 +0200
++++ linux-3.13.11/drivers/hwmon/Kconfig 2014-06-30 15:57:08.889515912 +0200
+@@ -127,6 +127,14 @@
This driver can also be built as a module. If so, the module
will be called adcxx.
@@ -325,11 +335,11 @@ Index: linux-3.0.10/drivers/hwmon/Kconfig
config SENSORS_ADM1021
tristate "Analog Devices ADM1021 and compatibles"
depends on I2C
-Index: linux-3.0.10/drivers/hwmon/Makefile
+Index: linux-3.13.11/drivers/hwmon/Makefile
===================================================================
---- linux-3.0.10.orig/drivers/hwmon/Makefile 2011-12-02 09:18:11.000000000 +0100
-+++ linux-3.0.10/drivers/hwmon/Makefile 2011-12-02 09:18:31.000000000 +0100
-@@ -24,6 +24,7 @@
+--- linux-3.13.11.orig/drivers/hwmon/Makefile 2014-04-23 01:49:33.000000000 +0200
++++ linux-3.13.11/drivers/hwmon/Makefile 2014-06-30 15:57:08.889515912 +0200
+@@ -26,6 +26,7 @@
obj-$(CONFIG_SENSORS_AD7414) += ad7414.o
obj-$(CONFIG_SENSORS_AD7418) += ad7418.o
obj-$(CONFIG_SENSORS_ADCXX) += adcxx.o
@@ -337,10 +347,10 @@ Index: linux-3.0.10/drivers/hwmon/Makefile
obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o
obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o
obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o
-Index: linux-3.0.10/Documentation/hwmon/as1531
+Index: linux-3.13.11/Documentation/hwmon/as1531
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.0.10/Documentation/hwmon/as1531 2011-12-02 09:18:31.000000000 +0100
++++ linux-3.13.11/Documentation/hwmon/as1531 2014-06-30 15:57:08.889515912 +0200
@@ -0,0 +1,15 @@
+Kernel driver as1531
+====================
hooks/post-receive
--
armadeus
|
