[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-290-g5e34956
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2012-04-24 17:45:59
|
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 5e34956b53bfa966849edc51249e8bbb14df7f8e (commit)
via 9c9b2ea8d3b91e162493f55c38c7ac8c1aef7025 (commit)
from 7c6a3887cfe7fa5cb9ffd7ed0a0c238106d9c7dc (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 5e34956b53bfa966849edc51249e8bbb14df7f8e
Merge: 9c9b2ea 7c6a388
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 24 19:46:04 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 9c9b2ea8d3b91e162493f55c38c7ac8c1aef7025
Author: Eric Jarrige <eri...@ar...>
Date: Tue Apr 24 19:45:15 2012 +0200
[LINUX] APF28_DEV: add GPIO definition for user LED and button
-----------------------------------------------------------------------
Summary of changes:
...1-armadeus-add_apf28dev_baseboard_support.patch | 27 ++++++++++++++++++-
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
index 3bc0ee7..6d8c4c0 100644
--- a/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/2.6.35/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -45,7 +45,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c 2012-02-15 15:51:09.000000000 +0100
-@@ -0,0 +1,321 @@
+@@ -0,0 +1,344 @@
+/*
+ * Copyright (C) 2012 Armadeus systems
+ *
@@ -336,7 +336,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .strength = PAD_12MA,
+ .voltage = PAD_3_3V,
+ .pullup = 0,
-+ .drive = 2,
++ .drive = 1,
+ .pull = 0,
+ },
+ {
@@ -349,6 +349,29 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .drive = 1,
+ .pull = 0,
+ },
++ {
++ .name = "BT0",
++ .id = PINID_GPMI_CE1N,
++ .fun = PIN_GPIO,
++ .strength = PAD_4MA,
++ .voltage = PAD_3_3V,
++ .pullup = 0,
++ .drive = !0,
++ .pull = 0,
++ .output = 0,
++ },
++ {
++ .name = "LED",
++ .id = PINID_GPMI_RDY1,
++ .fun = PIN_GPIO,
++ .strength = PAD_4MA,
++ .voltage = PAD_3_3V,
++ .pullup = 0,
++ .drive = !0,
++ .pull = 0,
++ .output = 1,
++ .data = 1,
++ },
+};
+
+static void __init apf28dev_device_init(void)
hooks/post-receive
--
armadeus
|