[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-354-g58d5a77

[jorasse <jo...@us...>]

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  58d5a77c9ae9a52cd782f2f01282342d3a5af326 (commit)
      from  3157f7505ade837f99af5bf2c834a8086797403c (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 58d5a77c9ae9a52cd782f2f01282342d3a5af326
Author: Eric Jarrige <eri...@ar...>
Date:   Fri Jun 8 14:48:32 2012 +0200

    [LINUX] apf28: patch clean-up

-----------------------------------------------------------------------

Summary of changes:
 ...1-armadeus-add_apf28dev_baseboard_support.patch |   57 +++-----------------
 1 files changed, 8 insertions(+), 49 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 7bb35b9..ca4b59f 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
@@ -1542,59 +1542,18 @@ Index: linux-2.6.35.3/arch/arm/mach-mx28/device.c
 ===================================================================
 --- linux-2.6.35.3.orig/arch/arm/mach-mx28/device.c
 +++ linux-2.6.35.3/arch/arm/mach-mx28/device.c
-@@ -426,7 +426,6 @@ static void mx28_init_gpmi_nfc(void)
+@@ -421,12 +421,12 @@ static void mx28_init_gpmi_nfc(void)
+ #endif
+ 
+ #if defined(CONFIG_MMC_MXS) || defined(CONFIG_MMC_MXS_MODULE)
+-#if defined(CONFIG_MACH_MX28EVK)
++/*#if defined(CONFIG_MACH_MX28EVK)*/
+ #define MMC0_POWER	MXS_PIN_TO_GPIO(PINID_PWM3)
  #define MMC1_POWER	MXS_PIN_TO_GPIO(PINID_PWM4)
  #define MMC0_WP		MXS_PIN_TO_GPIO(PINID_SSP1_SCK)
  #define MMC1_WP		MXS_PIN_TO_GPIO(PINID_GPMI_RESETN)
 -#endif
++/*#endif*/
  
  static int mxs_mmc_get_wp_ssp0(void)
  {
-@@ -467,6 +466,7 @@ static void mxs_mmc_hw_release_ssp0(void
- 	gpio_free(MMC0_WP);
- 
- }
-+#endif
- 
- static void mxs_mmc_cmd_pullup_ssp0(int enable)
- {
-@@ -490,6 +490,7 @@ static unsigned long mxs_mmc_setclock_ss
- 	return hz;
- }
- 
-+#if defined(CONFIG_MACH_MX28EVK)
- static int mxs_mmc_get_wp_ssp1(void)
- {
- 	return gpio_get_value(MMC1_WP);
-@@ -528,6 +529,7 @@ static void mxs_mmc_hw_release_ssp1(void
- 	gpio_free(MMC1_POWER);
- 	gpio_free(MMC1_WP);
- }
-+#endif /* CONFIG_MACH_MX28EVK */
- 
- static void mxs_mmc_cmd_pullup_ssp1(int enable)
- {
-@@ -552,9 +554,11 @@ static unsigned long mxs_mmc_setclock_ss
- }
- 
- static struct mxs_mmc_platform_data mmc0_data = {
-+#if defined(CONFIG_MACH_MX28EVK)
- 	.hw_init	= mxs_mmc_hw_init_ssp0,
- 	.hw_release	= mxs_mmc_hw_release_ssp0,
- 	.get_wp		= mxs_mmc_get_wp_ssp0,
-+#endif
- 	.cmd_pullup	= mxs_mmc_cmd_pullup_ssp0,
- 	.setclock	= mxs_mmc_setclock_ssp0,
- 	.caps 		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA
-@@ -591,9 +595,11 @@ static struct resource mmc0_resource[] =
- };
- 
- static struct mxs_mmc_platform_data mmc1_data = {
-+#if defined(CONFIG_MACH_MX28EVK)
- 	.hw_init	= mxs_mmc_hw_init_ssp1,
- 	.hw_release	= mxs_mmc_hw_release_ssp1,
- 	.get_wp		= mxs_mmc_get_wp_ssp1,
-+#endif
- 	.cmd_pullup	= mxs_mmc_cmd_pullup_ssp1,
- 	.setclock	= mxs_mmc_setclock_ssp1,
- 	.caps 		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA


hooks/post-receive
-- 
armadeus