[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2420-gb6f0502
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2420-gb6f0502
|
From: Fabien M <fa...@us...> - 2011-07-18 14:14:30
|
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 b6f0502f2636609f5b4be76fcc87bde2d4248983 (commit)
via 699ef41f7b0f2ff5ada7c8965a524e23367e6d8d (commit)
from 2403b93f95e677fbee6aeda72f447c42aef8c198 (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 b6f0502f2636609f5b4be76fcc87bde2d4248983
Author: Kevin JOLY <jol...@gm...>
Date: Mon Jul 18 16:05:20 2011 +0200
Update HMS Anybus driver: add some define to anybus_interface.h and make irq reachable by interruption number instead of GPIO number
Signed-off-by: Kevin JOLY <jol...@gm...>
commit 699ef41f7b0f2ff5ada7c8965a524e23367e6d8d
Author: Kevin JOLY <jol...@gm...>
Date: Mon Jul 18 16:05:19 2011 +0200
Increase number of IRQ on APF27 and APF51
Signed-off-by: Kevin JOLY <jol...@gm...>
-----------------------------------------------------------------------
Summary of changes:
...apf27-armadeus-increases_board_irq_number.patch | 10 ++++----
.../2.6.38/400-armadeus-add_apf51_module.patch | 22 ++++++++++----------
.../440-armadeus-add-hms-anybus-driver.patch | 13 ++++++++---
3 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/323-apf27-armadeus-increases_board_irq_number.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/323-apf27-armadeus-increases_board_irq_number.patch
index 99995aa..6b18fca 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/323-apf27-armadeus-increases_board_irq_number.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/323-apf27-armadeus-increases_board_irq_number.patch
@@ -2,16 +2,16 @@ Increases board reserved interrupts to 32. This is needed for the APF27 FPGA.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/irqs.h
+Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/irqs.h 2010-11-25 20:27:40.000000000 +0100
-+++ linux-2.6.36/arch/arm/plat-mxc/include/mach/irqs.h 2010-11-25 20:28:54.000000000 +0100
-@@ -47,6 +47,8 @@
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-03-23 21:04:47.000000000 +0100
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-07-18 15:16:49.921814000 +0200
+@@ -51,6 +51,8 @@
#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
#define MXC_BOARD_IRQS 80
+#elif defined CONFIG_MACH_APF27
-+#define MXC_BOARD_IRQS 32
++#define MXC_BOARD_IRQS 48
#else
#define MXC_BOARD_IRQS 16
#endif
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
index 8dd6ebc..e3c2c71 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-06-05 23:00:49.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-06-06 13:08:52.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Kconfig 2011-07-18 15:25:44.569814001 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Kconfig 2011-07-18 15:29:36.529814001 +0200
@@ -162,4 +162,16 @@
Include support for MX50 reference design platform (RDP) board. This
includes specific configurations for the board and its peripherals.
@@ -21,8 +21,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-03-23 21:04:47.000000000 +0100
-+++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-06-06 13:08:52.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/mach-mx5/Makefile 2011-07-18 15:25:44.553814000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/Makefile 2011-07-18 15:29:36.517814001 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -34,7 +34,7 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-06-06 12:08:57.000000000 +0200
++++ linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c 2011-07-18 15:26:44.681814002 +0200
@@ -0,0 +1,500 @@
+/*
+ * Support for APF51 System On Module
@@ -538,8 +538,8 @@ Index: linux-2.6.38.1/arch/arm/mach-mx5/board-apf51.c
+
Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-06-05 23:00:51.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-06-05 23:00:52.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-07-18 15:25:44.517814000 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h 2011-07-18 15:26:44.681814002 +0200
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -560,14 +560,14 @@ Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/uncompress.h
}
Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-06-05 23:00:52.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-06-05 23:00:52.000000000 +0200
+--- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-07-18 15:25:44.533814001 +0200
++++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/irqs.h 2011-07-18 15:29:50.097814001 +0200
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
- #define MXC_BOARD_IRQS 32
+ #define MXC_BOARD_IRQS 48
+#elif defined CONFIG_MACH_APF51
-+#define MXC_BOARD_IRQS 80 /* WM8311 needs 64 of them and FPGA 16 */
++#define MXC_BOARD_IRQS 96 /* WM8311 needs 64 of them and FPGA 16 */
#else
#define MXC_BOARD_IRQS 16
#endif
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
index 6f9acf9..1ea1107 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/440-armadeus-add-hms-anybus-driver.patch
@@ -35,7 +35,7 @@ Index: linux-2.6.38.1/drivers/net/Makefile
Index: linux-2.6.38.1/drivers/net/anybus_interface.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/drivers/net/anybus_interface.c 2011-07-18 11:39:19.637814000 +0200
++++ linux-2.6.38.1/drivers/net/anybus_interface.c 2011-07-18 14:59:25.049814001 +0200
@@ -0,0 +1,1061 @@
+/*
+ * HMS Anybus module driver
@@ -968,7 +968,7 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
+
+ dev_set_drvdata(&pdev->dev, dev);
+
-+ dev->irq = gpio_to_irq(resource_irq->start);
++ dev->irq = resource_irq->start;
+
+ dev->netdev_ops = &anybus_netdev_ops;
+
@@ -1101,8 +1101,8 @@ Index: linux-2.6.38.1/drivers/net/anybus_interface.c
Index: linux-2.6.38.1/include/net/anybus_interface.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.1/include/net/anybus_interface.h 2011-07-18 11:42:44.385814001 +0200
-@@ -0,0 +1,40 @@
++++ linux-2.6.38.1/include/net/anybus_interface.h 2011-07-18 15:04:17.953813999 +0200
+@@ -0,0 +1,45 @@
+/*
+ * Definitions for the module HMS anybus
+ *
@@ -1127,6 +1127,11 @@ Index: linux-2.6.38.1/include/net/anybus_interface.h
+#ifndef LINUX_ANYBUS_INTERFACE
+#define LINUX_ANYBUS_INTERFACE
+
++#define MB_READ 0
++#define MB_WRITE 1
++
++#define ANYBUS_INTERFACE_DRIVER_NAME "anybus_interface"
++
+struct anybus_frame {
+ int reg;
+ unsigned short data[256];
hooks/post-receive
--
armadeus
|
