[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-342-g1ebf83c

[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  1ebf83c5922a3f3bed7b8c4752ea058ba98ec497 (commit)
      from  fa65c74a1f1d80e5e5d461c2b4a4c9ebb5976a16 (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 1ebf83c5922a3f3bed7b8c4752ea058ba98ec497
Author: Eric Jarrige <eri...@ar...>
Date:   Sun Jul 28 23:37:53 2013 +0200

    [UBOOT] 2013.04: apf51: fix mmc card detect

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

Summary of changes:
 patches/u-boot/2013.04/401-apf51.patch |   23 +++++++++++++++++------
 1 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/patches/u-boot/2013.04/401-apf51.patch b/patches/u-boot/2013.04/401-apf51.patch
index 3ef1ef7..66a5455 100644
--- a/patches/u-boot/2013.04/401-apf51.patch
+++ b/patches/u-boot/2013.04/401-apf51.patch
@@ -67,7 +67,7 @@ new file mode 100644
 index 0000000..8ff1381
 --- /dev/null
 +++ b/board/armadeus/apf51/apf51.c
-@@ -0,0 +1,1193 @@
+@@ -0,0 +1,1204 @@
 +/*
 + * (C) Copyright 2010-2013 Eric Jarrige, Armadeus Project
 + *
@@ -97,6 +97,7 @@ index 0000000..8ff1381
 +#include <asm/arch/clock.h>
 +#include <asm/arch/crm_regs.h>
 +#include <asm/arch/iomux.h>
++#include <asm/arch/iomux-mx51.h>
 +#include <asm/arch/regs_esdctl.h>
 +#include <asm/arch/sys_proto.h>
 +#include <asm/gpio.h>
@@ -106,6 +107,7 @@ index 0000000..8ff1381
 +#include <fsl_esdhc.h>
 +#include "fpga.h"
 +#include <nand.h>
++#include <mmc.h>
 +
 +DECLARE_GLOBAL_DATA_PTR;
 +
@@ -833,6 +835,15 @@ index 0000000..8ff1381
 +	{MMC_SDHC2_BASE_ADDR},
 +};
 +
++int board_mmc_getcd(struct mmc *mmc)
++{
++	struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;
++	int ret = 0;
++	if (cfg->esdhc_base == MMC_SDHC1_BASE_ADDR)
++		ret = !gpio_get_value(IMX_GPIO_NR(2, 29));
++	return ret;
++}
++
 +#define SD_PAD_CFG		(PAD_CTL_DRV_MAX | PAD_CTL_DRV_VOT_HIGH | \
 +				 PAD_CTL_HYS_ENABLE | PAD_CTL_47K_PU |	\
 +				 PAD_CTL_PUE_PULL | PAD_CTL_PKE_ENABLE | \
@@ -844,11 +855,11 @@ index 0000000..8ff1381
 +
 +	switch (esdh_addr) {
 +	case MMC_SDHC1_BASE_ADDR:
-+/*
-+		mxc_request_iomux(MX51_PIN_GPIO1_0, IOMUX_CONFIG_ALT0 |
-+			IOMUX_CONFIG_SION);
-+		mxc_iomux_set_pad(MX51_PIN_GPIO1_0, SD_PAD_CFG);
-+*/
++
++		/* SD1_CD */
++		imx_iomux_v3_setup_pad(MX51_PAD_EIM_CS4__GPIO2_29);
++		gpio_direction_input(IMX_GPIO_NR(2, 29));
++
 +		/* SD1_CMD */
 +		mxc_request_iomux(MX51_PIN_SD1_CMD, IOMUX_CONFIG_ALT0 |
 +			IOMUX_CONFIG_SION);


hooks/post-receive
-- 
armadeus