[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-221-g6015e2b
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-221-g6015e2b
|
From: Julien B a. A. <ar...@us...> - 2013-04-11 12:04: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 6015e2bb86eaf11008a0b99b1acbb3ce50719205 (commit)
via c0ebd0e1516783af8b8cdda8b5ccfd90e05579f1 (commit)
via 11a9855f076b147726e0982aefd6fdc66577f6b4 (commit)
from bff3ea864e4ebc229e1e0577ac108fcc8b301fd2 (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 6015e2bb86eaf11008a0b99b1acbb3ce50719205
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 11 14:00:55 2013 +0200
[LINUX] 3.8: allows i.MX28 RTC to wakeup the system if powered with battery
commit c0ebd0e1516783af8b8cdda8b5ccfd90e05579f1
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 11 11:58:47 2013 +0200
[LINUX] Fixes some FPGA drivers build with 3.8+ kernels
commit 11a9855f076b147726e0982aefd6fdc66577f6b4
Author: Julien Boibessot <jul...@ar...>
Date: Thu Apr 11 10:40:48 2013 +0200
[LINUX] 3.8: move to 3.8.6
-----------------------------------------------------------------------
Summary of changes:
...linux-3.8.4.config => apf27-linux-3.8.6.config} | 0
...linux-3.8.4.config => apf28-linux-3.8.6.config} | 0
...linux-3.8.4.config => apf51-linux-3.8.6.config} | 0
...nux-3.8.4.config => apf9328-linux-3.8.6.config} | 0
patches/linux/{3.8.4 => 3.8.6} | 0
...low_to_use_the_wakeupalarm_functionnality.patch | 22 ++++++++++++++++++++
.../fpga/virtual_components/button/gbutton.c | 16 +++++++++++--
.../fpga/virtual_components/irq_mngr/main.c | 6 +++++
.../modules/fpga/virtual_components/led/g_led.c | 16 +++++++++++--
9 files changed, 54 insertions(+), 6 deletions(-)
rename buildroot/target/device/armadeus/apf27/{apf27-linux-3.8.4.config => apf27-linux-3.8.6.config} (100%)
rename buildroot/target/device/armadeus/apf28/{apf28-linux-3.8.4.config => apf28-linux-3.8.6.config} (100%)
rename buildroot/target/device/armadeus/apf51/{apf51-linux-3.8.4.config => apf51-linux-3.8.6.config} (100%)
rename buildroot/target/device/armadeus/apf9328/{apf9328-linux-3.8.4.config => apf9328-linux-3.8.6.config} (100%)
rename patches/linux/{3.8.4 => 3.8.6} (100%)
create mode 100644 patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.4.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.8.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf27/apf27-linux-3.8.4.config
rename to buildroot/target/device/armadeus/apf27/apf27-linux-3.8.6.config
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-3.8.4.config b/buildroot/target/device/armadeus/apf28/apf28-linux-3.8.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf28/apf28-linux-3.8.4.config
rename to buildroot/target/device/armadeus/apf28/apf28-linux-3.8.6.config
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.4.config b/buildroot/target/device/armadeus/apf51/apf51-linux-3.8.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf51/apf51-linux-3.8.4.config
rename to buildroot/target/device/armadeus/apf51/apf51-linux-3.8.6.config
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8.4.config b/buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8.6.config
similarity index 100%
rename from buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8.4.config
rename to buildroot/target/device/armadeus/apf9328/apf9328-linux-3.8.6.config
diff --git a/patches/linux/3.8.4 b/patches/linux/3.8.6
similarity index 100%
rename from patches/linux/3.8.4
rename to patches/linux/3.8.6
diff --git a/patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch b/patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
new file mode 100644
index 0000000..c5fde4e
--- /dev/null
+++ b/patches/linux/3.8/0442-armadeus-rtc-mxs-allow_to_use_the_wakeupalarm_functionnality.patch
@@ -0,0 +1,22 @@
+Without this fix /sys RTC interface can't be used to program a wakeup alarm,
+for example:
+ echo enabled > /sys/class/rtc/rtc0/device/power/wakeup
+ sec=`date '+%s'`
+ let "sec=$sec+30"
+ echo $sec > /sys/class/rtc/rtc0/wakealarm
+ poweroff
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-3.4.37/drivers/rtc/rtc-stmp3xxx.c
+===================================================================
+--- linux-3.4.37.orig/drivers/rtc/rtc-stmp3xxx.c 2013-04-10 11:16:54.000000000 +0200
++++ linux-3.4.37/drivers/rtc/rtc-stmp3xxx.c 2013-04-10 12:16:21.000000000 +0200
+@@ -217,6 +217,7 @@
+ STMP3XXX_RTC_CTRL_ALARM_IRQ_EN,
+ rtc_data->io + STMP3XXX_RTC_CTRL_CLR);
+
++ device_set_wakeup_capable(&pdev->dev, 1);
+ rtc_data->rtc = rtc_device_register(pdev->name, &pdev->dev,
+ &stmp3xxx_rtc_ops, THIS_MODULE);
+ if (IS_ERR(rtc_data->rtc)) {
diff --git a/target/linux/modules/fpga/virtual_components/button/gbutton.c b/target/linux/modules/fpga/virtual_components/button/gbutton.c
index 9b78ae4..c6c18a8 100644
--- a/target/linux/modules/fpga/virtual_components/button/gbutton.c
+++ b/target/linux/modules/fpga/virtual_components/button/gbutton.c
@@ -265,6 +265,16 @@ out_release_mem:
return ret;
}
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,8,0)
+/* __dev* stuff is removed from Linux since 30/11/2012 */
+#define __devexit
+#if defined(MODULE) || defined(CONFIG_HOTPLUG)
+# define __devexit_p(x) x
+# else
+# define __devexit_p(x) NULL
+# endif
+#endif
+
static int __devexit button_remove(struct platform_device *pdev)
{
struct plat_button_port *pdata = pdev->dev.platform_data;
@@ -291,9 +301,9 @@ static struct platform_driver plat_button_driver = {
.probe = button_probe,
.remove = __devexit_p(button_remove),
.driver = {
- .name = "button",
- .owner = THIS_MODULE,
- },
+ .name = "button",
+ .owner = THIS_MODULE,
+ },
};
static int __init button_init(void)
diff --git a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
index 1be5fb3..2d86bbd 100644
--- a/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
+++ b/target/linux/modules/fpga/virtual_components/irq_mngr/main.c
@@ -207,6 +207,12 @@ static int ocore_irq_mng_resume(struct platform_device *pdev)
# define ocore_irq_mng_resume NULL
#endif /* CONFIG_PM */
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,8,0)
+/* __dev* stuff is removed from Linux since 30/11/2012 */
+#define __devinit
+#define __devexit
+#endif
+
static int __devinit ocore_irq_mng_probe(struct platform_device *pdev)
{
struct ocore_irq_mng_pdata *pdata = pdev->dev.platform_data;
diff --git a/target/linux/modules/fpga/virtual_components/led/g_led.c b/target/linux/modules/fpga/virtual_components/led/g_led.c
index 3011a2d..b54b72b 100644
--- a/target/linux/modules/fpga/virtual_components/led/g_led.c
+++ b/target/linux/modules/fpga/virtual_components/led/g_led.c
@@ -266,6 +266,16 @@ out_release_mem:
return ret;
}
+#if LINUX_VERSION_CODE > KERNEL_VERSION(3,8,0)
+/* __dev* stuff is removed from Linux since 30/11/2012 */
+#define __devexit
+#if defined(MODULE) || defined(CONFIG_HOTPLUG)
+# define __devexit_p(x) x
+# else
+# define __devexit_p(x) NULL
+# endif
+#endif
+
static int __devexit led_remove(struct platform_device *pdev)
{
struct plat_led_port *dev = pdev->dev.platform_data;
@@ -286,9 +296,9 @@ static int __devexit led_remove(struct platform_device *pdev)
}
static struct platform_driver plat_led_driver = {
- .probe = led_probe,
- .remove = __devexit_p(led_remove),
- .driver = {
+ .probe = led_probe,
+ .remove = __devexit_p(led_remove),
+ .driver = {
.name = "led",
.owner = THIS_MODULE,
},
hooks/post-receive
--
armadeus
|
