[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2563-g3820de5
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2563-g3820de5
|
From: Fabien M <fa...@us...> - 2011-10-21 12:49:02
|
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 3820de59d5a21a799be86b7491745f72f96f7857 (commit)
from 51fee5020d0bb2ec08eec58e4fab91dcffef2e5e (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 3820de59d5a21a799be86b7491745f72f96f7857
Author: Fabien Marteau <fab...@ar...>
Date: Fri Oct 21 14:48:16 2011 +0200
[linux] adding fpga CLK0 signal as a GPIO by default
-----------------------------------------------------------------------
Summary of changes:
.../2.6.38/400-armadeus-add_apf51_module.patch | 23 +++++++++++--------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch b/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
index 8c7f377..fbb0ab5 100644
--- a/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
+++ b/patches/linux/2.6.38/400-armadeus-add_apf51_module.patch
@@ -1,7 +1,7 @@
Index: linux-2.6.38.8/arch/arm/mach-mx5/Kconfig
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2011-10-21 11:26:54.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2011-10-21 12:13:39.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Kconfig 2011-10-21 12:19:07.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Kconfig 2011-10-21 14:30:28.000000000 +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.8/arch/arm/mach-mx5/Kconfig
endif
Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
===================================================================
---- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2011-06-03 03:35:11.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2011-10-21 12:13:39.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/mach-mx5/Makefile 2011-10-21 12:19:07.000000000 +0200
++++ linux-2.6.38.8/arch/arm/mach-mx5/Makefile 2011-10-21 14:30:28.000000000 +0200
@@ -7,6 +7,7 @@
obj-$(CONFIG_SOC_IMX50) += mm-mx50.o
@@ -34,8 +34,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/Makefile
Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c 2011-10-21 12:14:53.000000000 +0200
-@@ -0,0 +1,502 @@
++++ linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c 2011-10-21 14:32:58.000000000 +0200
+@@ -0,0 +1,505 @@
+/*
+ * Support for APF51 System On Module
+ * Copyright (C) 2010-2011 Armadeus Systems <su...@ar...>
@@ -86,6 +86,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+#define MX51_USB_CTRL_UH1_EXT_CLK_EN (1 << 25)
+#define MX51_USB_CTRL_UH2_EXT_CLK_EN (1 << 26)
+
++#define APF51_GPIO_SPECIAL_PAD_CTRL (PAD_CTL_DSE_HIGH | PAD_CTL_PKE | PAD_CTL_SRE_FAST | PAD_CTL_PUE)
++
+
+static iomux_v3_cfg_t apf51_pads[] = {
+#ifdef APF51_PROTO
@@ -166,6 +168,7 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+ MX51_PAD_CSI2_D18__GPIO4_11, /* CONFIG_SYS_FPGA_INIT */
+ MX51_PAD_CSI2_D13__GPIO4_10, /* CONFIG_SYS_FPGA_DONE */
+ MX51_PAD_DISPB2_SER_DIO__GPIO3_6, /* CONFIG_SYS_FPGA_SUSPEND */
++ (_MX51_PAD_GPIO1_5__GPIO1_5 | MUX_PAD_CTRL(APF51_GPIO_SPECIAL_PAD_CTRL)), /* CLK0 as gpio */
+};
+
+
@@ -540,8 +543,8 @@ Index: linux-2.6.38.8/arch/arm/mach-mx5/board-apf51.c
+
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 11:26:55.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 11:26:56.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 12:19:07.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h 2011-10-21 12:21:14.000000000 +0200
@@ -63,6 +63,7 @@
#define MX3X_UART1_BASE_ADDR 0x43F90000
#define MX3X_UART2_BASE_ADDR 0x43F94000
@@ -562,8 +565,8 @@ Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/uncompress.h
}
Index: linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h
===================================================================
---- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 11:26:56.000000000 +0200
-+++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 11:26:56.000000000 +0200
+--- linux-2.6.38.8.orig/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 12:21:14.000000000 +0200
++++ linux-2.6.38.8/arch/arm/plat-mxc/include/mach/irqs.h 2011-10-21 12:21:14.000000000 +0200
@@ -53,6 +53,8 @@
#define MXC_BOARD_IRQS 80
#elif defined CONFIG_MACH_APF27
hooks/post-receive
--
armadeus
|
