[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-433-g7140c12
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-433-g7140c12
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2012-06-30 13:07:27
|
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 7140c12a9ef59f9273d15c848bd088f984fc8393 (commit)
via fe128828e0a4678f1e64348cfe14cd216aed2d69 (commit)
from a6002d16be8fb445655f03ff789edd5374d90df5 (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 7140c12a9ef59f9273d15c848bd088f984fc8393
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Jun 30 15:05:03 2012 +0200
[LINUX][APF28] 3.4.2: Declares apf28_dev_init as external function in apf28.c
commit fe128828e0a4678f1e64348cfe14cd216aed2d69
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Jun 30 14:55:24 2012 +0200
[LINUX][APF28] 3.4.2: Adds i2c0 registration and configuration of the related pins
-----------------------------------------------------------------------
Summary of changes:
...1-armadeus-add_apf28dev_baseboard_support.patch | 36 ++++++++++++-------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
index 0d062e7..bcb8330 100644
--- a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: linux-3.4.2/arch/arm/mach-mxs/Kconfig
===================================================================
---- linux-3.4.2.orig/arch/arm/mach-mxs/Kconfig 2012-06-22 21:47:40.000000000 +0200
-+++ linux-3.4.2/arch/arm/mach-mxs/Kconfig 2012-06-22 21:47:48.000000000 +0200
-@@ -116,4 +116,21 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Kconfig
++++ linux-3.4.2/arch/arm/mach-mxs/Kconfig
+@@ -116,4 +116,21 @@ config MACH_APF28
Include support for the Armadeus systems APF28 SOM. This includes
specific configurations for the module and its peripherals.
@@ -30,9 +30,9 @@ Index: linux-3.4.2/arch/arm/mach-mxs/Kconfig
endif
Index: linux-3.4.2/arch/arm/mach-mxs/Makefile
===================================================================
---- linux-3.4.2.orig/arch/arm/mach-mxs/Makefile 2012-06-22 21:47:40.000000000 +0200
-+++ linux-3.4.2/arch/arm/mach-mxs/Makefile 2012-06-22 21:47:48.000000000 +0200
-@@ -15,5 +15,6 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Makefile
++++ linux-3.4.2/arch/arm/mach-mxs/Makefile
+@@ -15,5 +15,6 @@ obj-$(CONFIG_MACH_APX4DEVKIT) += mach-ap
obj-$(CONFIG_MODULE_TX28) += module-tx28.o
obj-$(CONFIG_MACH_TX28) += mach-tx28.o
obj-$(CONFIG_MACH_APF28) += mach-apf28.o
@@ -41,9 +41,9 @@ Index: linux-3.4.2/arch/arm/mach-mxs/Makefile
obj-y += devices/
Index: linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c 2012-06-22 21:47:48.000000000 +0200
-@@ -0,0 +1,201 @@
+--- /dev/null
++++ linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
+@@ -0,0 +1,209 @@
+/*
+ * Copyright 2011 Armadeus systems.
+ *
@@ -170,6 +170,12 @@ Index: linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
+ MX28_PAD_GPMI_RDY1__GPIO_0_21 | MXS_PAD_CTRL,
+ /* User button */
+ MX28_PAD_GPMI_RDY2__GPIO_0_22 | MXS_PAD_CTRL,
++
++ /* I2C0 */
++ MX28_PAD_I2C0_SCL__I2C0_SCL |
++ (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
++ MX28_PAD_I2C0_SDA__I2C0_SDA |
++ (MXS_PAD_3V3 | MXS_PAD_8MA | MXS_PAD_PULLUP),
+};
+
+/* fec */
@@ -243,13 +249,15 @@ Index: linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
+ mx28_add_mxsfb(&apf28dev_mxsfb_pdata);
+
+ mx28_add_mxs_mmc(0, &apf28dev_mmc0_pdata);
++
++ mx28_add_mxs_i2c(0);
+}
+EXPORT_SYMBOL_GPL(apf28dev_init);
Index: linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
===================================================================
---- linux-3.4.2.orig/arch/arm/mach-mxs/mach-apf28.c 2012-06-22 21:47:40.000000000 +0200
-+++ linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c 2012-06-22 21:47:48.000000000 +0200
-@@ -78,6 +78,17 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/mach-apf28.c
++++ linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
+@@ -78,6 +78,19 @@ static struct fec_platform_data mx28_fec
.phy = PHY_INTERFACE_MODE_RMII,
};
@@ -264,10 +272,12 @@ Index: linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
+}
+__setup("baseboard=", apf28_get_baseboard);
+
++extern void __init apf28dev_init(void);
++
static void __init apf28_init(void)
{
mxs_iomux_setup_multiple_pads(apf28_pads, ARRAY_SIZE(apf28_pads));
-@@ -86,6 +97,12 @@
+@@ -86,6 +99,12 @@ static void __init apf28_init(void)
apf28_fec_reset();
mx28_add_fec(0, &mx28_fec0_pdata);
hooks/post-receive
--
armadeus
|
