[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-434-g3b4e013
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-434-g3b4e013
|
From: jorasse <jo...@us...> - 2012-07-05 15:46:57
|
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 3b4e0131fc8e8fc06036baab02c794a3fbfa2e52 (commit)
from 7140c12a9ef59f9273d15c848bd088f984fc8393 (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 3b4e0131fc8e8fc06036baab02c794a3fbfa2e52
Author: Eric Jarrige <eri...@ar...>
Date: Thu Jul 5 17:49:09 2012 +0200
[LINUX] apf28: activate AUART 1 & 4 on the expension connector - remove SSP2 that can be replaced by the SSP2 with its 3 chip select
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf28/apf28-linux-2.6.35.config | 10 +-
...1-armadeus-add_apf28dev_baseboard_support.patch | 80 +++++++++++--------
2 files changed, 51 insertions(+), 39 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
index 7206406..83f7baa 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
+++ b/buildroot/target/device/armadeus/apf28/apf28-linux-2.6.35.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.35.3
-# Wed Jun 13 00:36:04 2012
+# Thu Jul 5 17:40:52 2012
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -275,14 +275,14 @@ CONFIG_MXS_AUART_DMA_SUPPORT=y
CONFIG_MXS_AUART_PORTS=5
CONFIG_MXS_AUART0_DEVICE_ENABLE=y
CONFIG_MXS_AUART0_DMA_ENABLE=y
-# CONFIG_MXS_AUART1_DEVICE_ENABLE is not set
-# CONFIG_MXS_AUART1_DMA_ENABLE is not set
+CONFIG_MXS_AUART1_DEVICE_ENABLE=y
+CONFIG_MXS_AUART1_DMA_ENABLE=y
CONFIG_MXS_AUART2_DEVICE_ENABLE=y
CONFIG_MXS_AUART2_DMA_ENABLE=y
CONFIG_MXS_AUART3_DEVICE_ENABLE=y
CONFIG_MXS_AUART3_DMA_ENABLE=y
-# CONFIG_MXS_AUART4_DEVICE_ENABLE is not set
-# CONFIG_MXS_AUART4_DMA_ENABLE is not set
+CONFIG_MXS_AUART4_DEVICE_ENABLE=y
+CONFIG_MXS_AUART4_DMA_ENABLE=y
CONFIG_MXS_RAM_FREQ_SCALING=y
# CONFIG_MXS_RAM_MDDR is not set
# CONFIG_MXS_RAM_DDR is not set
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 9ce73f6..aa81eea 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
+++ linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
-@@ -0,0 +1,859 @@
+@@ -0,0 +1,871 @@
+/*
+ * Copyright (C) 2012 Armadeus systems
+ *
@@ -380,6 +380,28 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .fun = PIN_FUN1,
+ },
+#endif
++#ifdef CONFIG_MXS_AUART1_DEVICE_ENABLE
++ {
++ .name = "AUART1.RX",
++ .id = PINID_AUART1_RX,
++ .fun = PIN_FUN1,
++ },
++ {
++ .name = "AUART1.TX",
++ .id = PINID_AUART1_TX,
++ .fun = PIN_FUN1,
++ },
++ {
++ .name = "AUART1.CTS",
++ .id = PINID_AUART1_CTS,
++ .fun = PIN_FUN1,
++ },
++ {
++ .name = "AUART1.RTS",
++ .id = PINID_AUART1_RTS,
++ .fun = PIN_FUN1,
++ },
++#endif
+#ifdef CONFIG_MXS_AUART2_DEVICE_ENABLE
+ {
+ .name = "AUART2.RX",
@@ -424,6 +446,28 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .fun = PIN_FUN1,
+ },
+#endif
++#ifdef CONFIG_MXS_AUART4_DEVICE_ENABLE
++ {
++ .name = "AUART4.RX",
++ .id = PINID_SSP3_MOSI,
++ .fun = PIN_FUN2,
++ },
++ {
++ .name = "AUART4.TX",
++ .id = PINID_SSP3_SCK,
++ .fun = PIN_FUN2,
++ },
++ {
++ .name = "AUART4.CTS",
++ .id = PINID_SSP3_SS0,
++ .fun = PIN_FUN2,
++ },
++ {
++ .name = "AUART4.RTS",
++ .id = PINID_SSP3_MISO,
++ .fun = PIN_FUN2,
++ },
++#endif
+#if defined(CONFIG_CAN_FLEXCAN) || defined(CONFIG_CAN_FLEXCAN_MODULE)
+ {
+ .name = "CAN0_TX",
@@ -510,7 +554,7 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ {
+ .name = "SAIF0_BITCLK",
+ .id = PINID_SAIF0_BITCLK,
-+ .fun = PIN_FUN3,
++ .fun = PIN_FUN1,
+ .strength = PAD_4MA,
+ .voltage = PAD_3_3V,
+ .pullup = 1,
@@ -686,38 +730,6 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/apf28dev.c
+ .voltage = PAD_3_3V,
+ .drive = 1,
+ },
-+ {
-+ .name = "SSP3 MOSI",
-+ .id = PINID_SSP3_MOSI,
-+ .fun = PIN_FUN1,
-+ .strength = PAD_4MA,
-+ .voltage = PAD_3_3V,
-+ .drive = 1,
-+ },
-+ {
-+ .name = "SSP3 MISO",
-+ .id = PINID_SSP3_MISO,
-+ .fun = PIN_FUN1,
-+ .strength = PAD_4MA,
-+ .voltage = PAD_3_3V,
-+ .drive = 1,
-+ },
-+ {
-+ .name = "SSP3 SCK",
-+ .id = PINID_SSP3_SCK,
-+ .fun = PIN_FUN1,
-+ .strength = PAD_4MA,
-+ .voltage = PAD_3_3V,
-+ .drive = 1,
-+ },
-+ {
-+ .name = "SSP3 SS0",
-+ .id = PINID_SSP3_SS0,
-+ .fun = PIN_FUN1,
-+ .strength = PAD_4MA,
-+ .voltage = PAD_3_3V,
-+ .drive = 1,
-+ },
+#endif
+};
+
hooks/post-receive
--
armadeus
|
