[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-316-g4ab4be1
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-316-g4ab4be1
|
From: Julien B a. A. <ar...@us...> - 2014-06-30 13:17:53
|
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 4ab4be142c38300d05430ec72f304e19a108ebbf (commit)
via ab9a5e1138e54ffe3151977b5c69ae5942a4d8e6 (commit)
via 219d60dea235cf880d2ff83d4baab8d1258b3703 (commit)
via 2970e1522bff101fd1183a579240e0953fccb2ff (commit)
via bd2e965b84280a46d7ebbd67fd5656c8184f5b9b (commit)
from ba19fa24d1c81638abb27840d2f8144fa2315511 (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 4ab4be142c38300d05430ec72f304e19a108ebbf
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 15:16:15 2014 +0200
[ASDEVICES] Cleanup BR package makefile
commit ab9a5e1138e54ffe3151977b5c69ae5942a4d8e6
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 15:06:03 2014 +0200
[BUILDROOT] Fixes fpgaregs executable rights, wiped out by a previous cleanup commit
commit 219d60dea235cf880d2ff83d4baab8d1258b3703
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 11:39:46 2014 +0200
[LINUX] 3.15: fixes 0445-armadeus-dts-add-apf27-USB-support.patch
commit 2970e1522bff101fd1183a579240e0953fccb2ff
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 11:36:15 2014 +0200
[LINUX] Make pod_gpio and apf27-fpga-loader drivers build again on recent Linux kernels
commit bd2e965b84280a46d7ebbd67fd5656c8184f5b9b
Author: Julien Boibessot <jul...@ar...>
Date: Mon Jun 30 11:33:34 2014 +0200
[LINUX] 3.1x: APF27/51: move Armadeus specific FPGA mapping include to include/linux/armadeus_fpga.h
-----------------------------------------------------------------------
Summary of changes:
.../package/armadeus/as_devices/as_devices.mk | 12 +--
buildroot/package/armadeus/fpgaregs/fpgaregs.mk | 2 +-
.../device/armadeus/apf27/apf27-linux-3.10.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.11.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.12.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.13.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.14.config | 2 +-
.../device/armadeus/apf27/apf27-linux-3.15.config | 2 +-
.../linux/3.10/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.11/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.12/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.13/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.14/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 27 -------
.../linux/3.15/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 26 -------
.../0445-armadeus-dts-add-apf27-USB-support.patch | 71 +++++++++++++++++
.../linux/3.16/0322-armadeus-add_mach_fpga_h.patch | 19 ++---
...rmadeus-mach_fpga_add_dt_support_for_mx27.patch | 26 -------
.../fpga/dev_tools/loader/apf27-fpga-loader.c | 2 +-
.../fpga/virtual_components/pod_gpio/pod_gpio.c | 80 ++++++++++++--------
25 files changed, 193 insertions(+), 306 deletions(-)
delete mode 100644 patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.11/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.12/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.13/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
delete mode 100644 patches/linux/3.15/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
create mode 100644 patches/linux/3.15/0445-armadeus-dts-add-apf27-USB-support.patch
delete mode 100644 patches/linux/3.16/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
diff --git a/buildroot/package/armadeus/as_devices/as_devices.mk b/buildroot/package/armadeus/as_devices/as_devices.mk
index 5c66025..f6a3c6b 100644
--- a/buildroot/package/armadeus/as_devices/as_devices.mk
+++ b/buildroot/package/armadeus/as_devices/as_devices.mk
@@ -1,8 +1,8 @@
-#############################################################
+################################################################################
#
-# as_devices library
+# as_devices
#
-#############################################################
+################################################################################
AS_DEVICES_VERSION = 0.17
AS_DEVICES_SITE = $(TOPDIR)/../target/packages/as_devices
@@ -78,7 +78,6 @@ endif
define AS_DEVICES_INSTALL_TARGET_CMDS
$(MAKE) INSTALL_DIR=$(TARGET_DIR) \
- STRIP="$(STRIPCMD) $(STRIP_STRIP_UNNEEDED)" \
-C $(@D) install-exe
$(AS_DEVICES_INSTALL_TEST)
$(AS_DEVICES_INSTALL_CPP_LIB)
@@ -86,11 +85,6 @@ define AS_DEVICES_INSTALL_TARGET_CMDS
$(AS_DEVICES_INSTALL_PYTHON)
endef
-# Clean
-define AS_DEVICES_CLEAN_CMDS
- $(MAKE) -C $(@D) clean
-endef
-
ifeq ($(generic-package), )
$(eval $(call GENTARGETS))
else
diff --git a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
index faeb44b..b2f7310 100644
--- a/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
+++ b/buildroot/package/armadeus/fpgaregs/fpgaregs.mk
@@ -25,7 +25,7 @@ define FPGAREGS_BUILD_CMDS
endef
define FPGAREGS_INSTALL_TARGET_CMDS
- $(INSTALL) -m 644 $(@D)/$(FPGAREGS_BINARY) $(TARGET_DIR)/usr/bin/fpgaregs
+ $(INSTALL) -m 755 $(@D)/$(FPGAREGS_BINARY) $(TARGET_DIR)/usr/bin/fpgaregs
endef
$(eval $(generic-package))
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
index d09275d..f76a50b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.10.config
@@ -203,7 +203,7 @@ CONFIG_IIO=m
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.config
index d09275d..f76a50b 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.11.config
@@ -203,7 +203,7 @@ CONFIG_IIO=m
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
index d6ed683..bf9abcb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.12.config
@@ -208,7 +208,7 @@ CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
index e05962f..c2efccb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.13.config
@@ -217,7 +217,7 @@ CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config
index e05962f..c2efccb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.14.config
@@ -217,7 +217,7 @@ CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
index e05962f..c2efccb 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.15.config
@@ -217,7 +217,7 @@ CONFIG_PWM_IMX=y
CONFIG_ARMADEUS_DRIVERS=y
CONFIG_ARMADEUS_FPGA_DRIVERS=y
CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=y
-# CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS is not set
+CONFIG_ARMADEUS_FPGA_VIRTUAL_COMPONENTS_GPIO=m
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
CONFIG_EXT3_FS_POSIX_ACL=y
diff --git a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.10/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.10/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.11/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.11/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.11/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.11/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.11/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.11/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.11/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.12/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.12/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.12/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.12/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.12/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.12/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.12/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.13/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.13/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.13/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.13/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.13/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.13/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.13/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.14/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b51a39a..0000000
--- a/patches/linux/3.14/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
-
diff --git a/patches/linux/3.15/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.15/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.15/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.15/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.15/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.15/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b811fbe..0000000
--- a/patches/linux/3.15/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
diff --git a/patches/linux/3.15/0445-armadeus-dts-add-apf27-USB-support.patch b/patches/linux/3.15/0445-armadeus-dts-add-apf27-USB-support.patch
new file mode 100644
index 0000000..b2fae52
--- /dev/null
+++ b/patches/linux/3.15/0445-armadeus-dts-add-apf27-USB-support.patch
@@ -0,0 +1,71 @@
+Index: linux-3.15.1/arch/arm/boot/dts/imx27-apf27.dts
+===================================================================
+--- linux-3.15.1.orig/arch/arm/boot/dts/imx27-apf27.dts 2014-06-26 16:24:44.014143620 +0200
++++ linux-3.15.1/arch/arm/boot/dts/imx27-apf27.dts 2014-06-26 16:45:43.828390693 +0200
+@@ -33,6 +33,17 @@
+ clock-frequency = <0>;
+ };
+ };
++
++ regulators {
++ compatible = "simple-bus";
++
++ reg_usbotg_vbus: usbotg_vbus {
++ compatible = "regulator-fixed";
++ regulator-name = "usbotg_vbus";
++ regulator-min-microvolt = <5000000>;
++ regulator-max-microvolt = <5000000>;
++ };
++ };
+ };
+
+ &iomuxc {
+@@ -66,6 +77,23 @@
+ MX27_PAD_UART1_RXD__UART1_RXD 0x0
+ >;
+ };
++
++ pinctrl_usbotg: usbotg {
++ fsl,pins = <
++ MX27_PAD_USBOTG_NXT__USBOTG_NXT 0x0
++ MX27_PAD_USBOTG_STP__USBOTG_STP 0x0
++ MX27_PAD_USBOTG_DIR__USBOTG_DIR 0x0
++ MX27_PAD_USBOTG_CLK__USBOTG_CLK 0x0
++ MX27_PAD_USBOTG_DATA0__USBOTG_DATA0 0x0
++ MX27_PAD_USBOTG_DATA1__USBOTG_DATA1 0x0
++ MX27_PAD_USBOTG_DATA2__USBOTG_DATA2 0x0
++ MX27_PAD_USBOTG_DATA3__USBOTG_DATA3 0x0
++ MX27_PAD_USBOTG_DATA4__USBOTG_DATA4 0x0
++ MX27_PAD_USBOTG_DATA5__USBOTG_DATA5 0x0
++ MX27_PAD_USBOTG_DATA6__USBOTG_DATA6 0x0
++ MX27_PAD_USBOTG_DATA7__USBOTG_DATA7 0x0
++ >;
++ };
+ };
+ };
+
+@@ -75,6 +103,24 @@
+ status = "okay";
+ };
+
++&usbmisc {
++ status = "okay";
++};
++
++&usbotg {
++ pinctrl-names = "default";
++ pinctrl-0 = <&pinctrl_usbotg>;
++ phy_type = "ulpi";
++ dr_mode = "otg";
++ vbus-supply = <®_usbotg_vbus>;
++ disable-over-current;
++ status = "okay";
++};
++
++&usbphy0 {
++ status = "okay";
++};
++
+ &fec {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_fec1>;
diff --git a/patches/linux/3.16/0322-armadeus-add_mach_fpga_h.patch b/patches/linux/3.16/0322-armadeus-add_mach_fpga_h.patch
index 4fc87d2..026047d 100644
--- a/patches/linux/3.16/0322-armadeus-add_mach_fpga_h.patch
+++ b/patches/linux/3.16/0322-armadeus-add_mach_fpga_h.patch
@@ -1,10 +1,10 @@
-Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+Index: linux/include/linux/armadeus_fpga.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8-rc1/arch/arm/mach-imx/fpga.h 2013-01-02 22:16:56.000000000 +0100
-@@ -0,0 +1,46 @@
++++ linux/include/linux/armadeus_fpga.h 2013-01-02 22:16:56.000000000 +0100
+@@ -0,0 +1,45 @@
+/*
-+ * Copyright (C) 2009-2013 Armadeus Systems
++ * Copyright (C) 2009-2014 Armadeus Systems
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
@@ -21,18 +21,17 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+ * MA 02110-1301, USA.
+ */
+
-+#ifndef __ASM_ARCH_ARMADEUS_FPGA_H__
-+#define __ASM_ARCH_ARMADEUS_FPGA_H__
++#ifndef __LINUX_ARMADEUS_FPGA_H__
++#define __LINUX_ARMADEUS_FPGA_H__
+
-+#if defined(CONFIG_MACH_APF51) /* */
++#if defined(CONFIG_MACH_APF51) || defined(CONFIG_MACH_MX51) /* DT */
+# define APF51_FPGA_BASE_ADDR 0xb8000000
+# define ARMADEUS_FPGA_BASE_ADDR APF51_FPGA_BASE_ADDR
+# define APF51_FPGA_INT_PIN (IMX_GPIO_NR(4, 11)) /* INITB */
+# define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
+# define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
+# define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
-+#elif defined(CONFIG_MACH_APF27) /* */
-+#include "iomux-v1.h"
++#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* DT */
+# define APF27_FPGA_BASE_ADDR 0xd6000000
+# define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
+# define APF27_FPGA_INT_PIN (GPIO_PORTF | 12)
@@ -48,4 +47,4 @@ Index: linux-3.8-rc1/arch/arm/mach-imx/fpga.h
+
+#define IRQ_FPGA(x) (IRQ_FPGA_START + x)
+
-+#endif /* __ASM_ARCH_ARMADEUS_FPGA_H__ */
++#endif /* __LINUX_ARMADEUS_FPGA_H__ */
diff --git a/patches/linux/3.16/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch b/patches/linux/3.16/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
deleted file mode 100644
index b811fbe..0000000
--- a/patches/linux/3.16/0323-armadeus-mach_fpga_add_dt_support_for_mx27.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 23f189ce6a2940e8d2f1d57db28dcb35e43195eb Mon Sep 17 00:00:00 2001
-From: Philippe Reynes <tr...@ya...>
-Date: Sat, 22 Jun 2013 18:56:18 +0200
-Subject: [PATCH] apf27: define base addr when using device tree
-
-
-Signed-off-by: Philippe Reynes <tr...@ya...>
----
- arch/arm/mach-imx/fpga.h | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/arch/arm/mach-imx/fpga.h b/arch/arm/mach-imx/fpga.h
-index 49ec4b9..58c4a9a 100644
---- a/arch/arm/mach-imx/fpga.h
-+++ b/arch/arm/mach-imx/fpga.h
-@@ -26,7 +26,7 @@
- # define APF51_FPGA_IRQ (gpio_to_irq(APF51_FPGA_INT_PIN))
- # define ARMADEUS_FPGA_IRQ APF51_FPGA_IRQ
- # define IRQ_FPGA_START (MXC_BOARD_IRQ_START + 64)
--#elif defined(CONFIG_MACH_APF27) /* */
-+#elif defined(CONFIG_MACH_APF27) || defined(CONFIG_MACH_MX27) /* */
- #include "iomux-v1.h"
- # define APF27_FPGA_BASE_ADDR 0xd6000000
- # define ARMADEUS_FPGA_BASE_ADDR APF27_FPGA_BASE_ADDR
---
-1.7.4.4
diff --git a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
index ca62f1b..6cb3ae4 100644
--- a/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
+++ b/target/linux/modules/fpga/dev_tools/loader/apf27-fpga-loader.c
@@ -38,7 +38,7 @@
#include <linux/gpio.h>
#endif
#if LINUX_VERSION_CODE > KERNEL_VERSION(3,7,20)
-#include <linux/../../arch/arm/mach-imx/fpga.h>
+#include <linux/armadeus_fpga.h>
#else
#include <mach/fpga.h>
#endif
diff --git a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
index 61797fd..e8160f9 100644
--- a/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
+++ b/target/linux/modules/fpga/virtual_components/pod_gpio/pod_gpio.c
@@ -19,20 +19,34 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include <linux/version.h>
#include <linux/gpio.h>
#include <linux/io.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/interrupt.h>
-#include <mach/hardware.h>
-#include <mach/irqs.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)
+# include <mach/hardware.h>
+# include <mach/irqs.h>
+# ifndef CONFIG_MACH_APF9328
+# include <mach/fpga.h> /* To remove when MX1 platform is merged */
+# endif
+# define irq_get_chip(x) get_irq_chip(x)
+# define irq_set_type(x) set_type(x)
+# define irq_set_chip(x) set_irq_chip(x)
+# define irq_set_handler(x) set_irq_handler(x)
+# define irq_set_chip_and_handler(x) set_irq_chip_and_handler(x)
+#else
+# include <linux/armadeus_fpga.h>
+#endif
#include <asm/irq.h>
#include <asm/io.h> /* readb() & Co */
#include <asm/mach/irq.h>
+#define DRIVER_NAME "pod_gpio"
+#define IRQ_GPIO_POD(x) IRQ_FPGA(x+16)
-#include "pod_gpio.h"
-
+/* IP registers map: */
#define GPIO_ID 0x00
#define GPIO_CONFIG 0x02
#define GPIO_VALUE 0x04
@@ -61,7 +75,7 @@ static void cg_write_reg(const struct pod_gpio_chip *cg_chip, int reg,
static void pod_gpio_ack_irq(struct irq_data *data)
{
- struct irq_chip *chip = get_irq_chip(data->irq);
+ struct irq_chip *chip = irq_get_chip(data->irq);
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip, interrupt_chip);
@@ -71,7 +85,7 @@ static void pod_gpio_ack_irq(struct irq_data *data)
static void pod_gpio_mask_irq(struct irq_data *data)
{
- struct irq_chip *chip = get_irq_chip(data->irq);
+ struct irq_chip *chip = irq_get_chip(data->irq);
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip, interrupt_chip);
@@ -85,7 +99,7 @@ static void pod_gpio_mask_irq(struct irq_data *data)
static void pod_gpio_unmask_irq(struct irq_data *data)
{
- struct irq_chip *chip = get_irq_chip(data->irq);
+ struct irq_chip *chip = irq_get_chip(data->irq);
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip, interrupt_chip);
@@ -98,24 +112,26 @@ static void pod_gpio_unmask_irq(struct irq_data *data)
(1 << (data->irq - IRQ_GPIO_POD(0))));
}
-static int pod_gpio_irq_type(unsigned int _irq, unsigned int type)
+/* static int pod_gpio_irq_type(unsigned int _irq, unsigned int type) old kernels ? */
+static int pod_gpio_irq_type(struct irq_data *data, unsigned int type)
{
- struct irq_chip *chip = get_irq_chip(_irq);
+ /* unsigned int irq = _irq; old kernels ? */
+ unsigned int irq = data->irq;
+ struct irq_chip *chip = irq_get_chip(irq);
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip,
interrupt_chip);
u16 edge_config;
-
edge_config = cg_read_reg(cg_chip, GPIO_INTERRUPT_EDGE_TYPE);
/* Only falling and rising edge are supporter by pod_gpio */
if (type == IRQ_TYPE_EDGE_RISING) {
cg_write_reg(cg_chip, GPIO_INTERRUPT_EDGE_TYPE, edge_config |
- (1 << (_irq - IRQ_GPIO_POD(0))));
+ (1 << (irq - IRQ_GPIO_POD(0))));
} else if (type == IRQ_TYPE_EDGE_FALLING) {
cg_write_reg(cg_chip, GPIO_INTERRUPT_EDGE_TYPE, edge_config &
- ~(1 << (_irq - IRQ_GPIO_POD(0))));
+ ~(1 << (irq - IRQ_GPIO_POD(0))));
} else {
dev_err(&cg_chip->pdev->dev,
"The selected edge type is not supported by the driver.\n");
@@ -132,14 +148,15 @@ static irqreturn_t pod_gpio_interrupt(int irq, void *data)
u16 pending_interrupts;
irq = IRQ_GPIO_POD(0);
- desc = irq_to_desc(irq);
+// desc = irq_to_desc(irq);
pending_interrupts = cg_read_reg(cg_chip, GPIO_INTERRUPT_STATUS);
while (pending_interrupts) {
if (pending_interrupts & 1) {
/* Get irq handle */
- desc_handle_irq(irq, desc);
+// desc_handle_irq(irq, desc);
+ generic_handle_irq(irq);
}
irq++;
desc++;
@@ -198,7 +215,7 @@ static int pod_gpio_direction_out(struct gpio_chip *chip,
container_of(chip, struct pod_gpio_chip, chip);
u16 io_config;
- pod_gpio_set(cg_chip, gpio_num, val); /* set output value before */
+ pod_gpio_set(chip, gpio_num, val); /* set output value before */
io_config = cg_read_reg(cg_chip, GPIO_CONFIG) & ~(1 << gpio_num);
cg_write_reg(cg_chip, GPIO_CONFIG, io_config);
@@ -207,7 +224,6 @@ static int pod_gpio_direction_out(struct gpio_chip *chip,
static int pod_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
{
-
struct pod_gpio_chip *cg_chip =
container_of(chip, struct pod_gpio_chip, chip);
@@ -232,7 +248,7 @@ static int pod_gpio_probe(struct platform_device *pdev)
}
if (!request_mem_region(resource_memory->start,
- resource_size(resource_memory), pod_gpio_DRIVER_NAME)) {
+ resource_size(resource_memory), DRIVER_NAME)) {
dev_err(&pdev->dev, "Can't request memory region %x to %x\n",
resource_memory->start, resource_memory->start +
resource_memory->end);
@@ -240,7 +256,7 @@ static int pod_gpio_probe(struct platform_device *pdev)
goto exit;
}
- /*Allocate memory for pod_gpio chip*/
+ /* Allocate memory for pod_gpio chip */
cg_chip = kzalloc(sizeof(struct pod_gpio_chip), GFP_KERNEL);
if (!cg_chip) {
err = -ENOMEM;
@@ -251,8 +267,8 @@ static int pod_gpio_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, cg_chip);
- /*Chip configuration*/
- cg_chip->chip.label = pod_gpio_DRIVER_NAME;
+ /* Chip configuration */
+ cg_chip->chip.label = DRIVER_NAME;
cg_chip->chip.owner = THIS_MODULE;
cg_chip->chip.ngpio = 16;
cg_chip->chip.base = -1;
@@ -264,17 +280,17 @@ static int pod_gpio_probe(struct platform_device *pdev)
cg_chip->irq_base = IRQ_GPIO_POD(0);
cg_chip->pdev = pdev;
- /*Interrupt chip configuration*/
- cg_chip->interrupt_chip.name = pod_gpio_DRIVER_NAME;
+ /* Interrupt chip configuration */
+ cg_chip->interrupt_chip.name = DRIVER_NAME;
cg_chip->interrupt_chip.irq_ack = pod_gpio_ack_irq;
cg_chip->interrupt_chip.irq_mask = pod_gpio_mask_irq;
cg_chip->interrupt_chip.irq_unmask = pod_gpio_unmask_irq;
- cg_chip->interrupt_chip.set_type = pod_gpio_irq_type;
+ cg_chip->interrupt_chip.irq_set_type = pod_gpio_irq_type;
- /* Add virtual interrupts from GPIO*/
- for (irq = IRQ_GPIO_POD(0) ; irq < IRQ_GPIO_POD(16) ; irq++) {
- set_irq_chip_data(irq, cg_chip);
- set_irq_chip_and_handler(irq, &cg_chip->interrupt_chip,
+ /* Add virtual interrupts from GPIO */
+ for (irq = IRQ_GPIO_POD(0); irq < IRQ_GPIO_POD(16); irq++) {
+ irq_set_chip_data(irq, cg_chip);
+ irq_set_chip_and_handler(irq, &cg_chip->interrupt_chip,
handle_edge_irq);
set_irq_flags(irq, IRQF_VALID);
}
@@ -287,7 +303,7 @@ static int pod_gpio_probe(struct platform_device *pdev)
goto free_chip;
}
- /*Check if ID is correct*/
+ /* Check if ID is correct */
id = cg_read_reg(cg_chip, GPIO_ID);
if (pdev->id != id) {
dev_err(&pdev->dev,
@@ -303,7 +319,7 @@ static int pod_gpio_probe(struct platform_device *pdev)
/* Disable all interrupts */
cg_write_reg(cg_chip, GPIO_ENABLE_INTERRUPT, 0x00);
- /* Add the GPIO chip*/
+ /* Add the GPIO chip */
err = gpiochip_add(&cg_chip->chip);
if (err) {
dev_err(&pdev->dev, "Can't add the gpio chip\n");
@@ -358,8 +374,8 @@ static int pod_gpio_remove(struct platform_device *pdev)
resource_size(resource_memory));
for (irq = IRQ_GPIO_POD(0) ; irq < IRQ_GPIO_POD(16) ; irq++) {
- set_irq_chip(irq, NULL);
- set_irq_handler(irq, NULL);
+ irq_set_chip(irq, NULL);
+ irq_set_handler(irq, NULL);
set_irq_flags(irq, 0);
}
@@ -372,7 +388,7 @@ static int pod_gpio_remove(struct platform_device *pdev)
static struct platform_driver pod_gpio_drv = {
.driver = {
- .name = pod_gpio_DRIVER_NAME,
+ .name = DRIVER_NAME,
.owner = THIS_MODULE,
},
.probe = pod_gpio_probe,
hooks/post-receive
--
armadeus
|
