[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2625-g9fae894
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2625-g9fae894
|
From: Julien B a. A. <ar...@us...> - 2011-12-07 18:18:33
|
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 9fae894595e79761f5f246ba7fceb95ad5960b6a (commit)
from 50fe0b376054aedb57b7f45fa6d8e550127f679a (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 9fae894595e79761f5f246ba7fceb95ad5960b6a
Author: Julien Boibessot <jul...@ar...>
Date: Wed Dec 7 19:17:25 2011 +0100
[LINUX] 3.0: Makes patch 427 effective again
-----------------------------------------------------------------------
Summary of changes:
.../3.0/408-armadeus-add_apf51-dev_baseboard.patch | 2 +-
..._possibility_to_deactivate_SDIO_interrupt.patch | 2 +-
..._possibility_to_deactivate_SDIO_interrupt.tofix | 56 --------------------
3 files changed, 2 insertions(+), 58 deletions(-)
delete mode 100644 patches/linux/3.0/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.tofix
diff --git a/patches/linux/3.0/408-armadeus-add_apf51-dev_baseboard.patch b/patches/linux/3.0/408-armadeus-add_apf51-dev_baseboard.patch
index d92d5ef..c93b85f 100644
--- a/patches/linux/3.0/408-armadeus-add_apf51-dev_baseboard.patch
+++ b/patches/linux/3.0/408-armadeus-add_apf51-dev_baseboard.patch
@@ -385,7 +385,7 @@ Index: linux-3.0.10/arch/arm/mach-mx5/apf51dev-baseboard.c
+};
+
+static struct esdhc_platform_data edshc1_pdata = {
-+// .no_sdio_irq = 1, /* Temporary ! (for Wi2Wi) */
++ .no_sdio_irq = 1, /* Temporary ! (for Wi2Wi) */
+};
+
+/* board key switchs */
diff --git a/patches/linux/3.0/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch b/patches/linux/3.0/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
index c620f50..9bc8d88 100644
--- a/patches/linux/3.0/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
+++ b/patches/linux/3.0/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
@@ -45,7 +45,7 @@ Index: linux-2.6.38.1/drivers/mmc/host/sdhci-esdhc-imx.c
host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
+
+ if (boarddata->no_sdio_irq)
-+ host->quirks |= SDHCI_QUIRK_NO_SDIO_IRQ;
++ host->quirks2 |= SDHCI_QUIRK_NO_SDIO_IRQ;
}
return 0;
diff --git a/patches/linux/3.0/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.tofix b/patches/linux/3.0/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.tofix
deleted file mode 100644
index 1102f8a..0000000
--- a/patches/linux/3.0/427-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.tofix
+++ /dev/null
@@ -1,56 +0,0 @@
-Allows to deactivate SDIO interrupt usage.
-
-Signed-off-by: Julien Boibessot <jul...@ar...>
-
-Index: linux-2.6.38.1/include/linux/mmc/sdhci.h
-===================================================================
---- linux-2.6.38.1.orig/include/linux/mmc/sdhci.h 2011-04-05 15:18:40.000000000 +0200
-+++ linux-2.6.38.1/include/linux/mmc/sdhci.h 2011-04-05 15:19:26.000000000 +0200
-@@ -85,6 +85,8 @@
- #define SDHCI_QUIRK_NO_HISPD_BIT (1<<29)
- /* Controller treats ADMA descriptors with length 0000h incorrectly */
- #define SDHCI_QUIRK_BROKEN_ADMA_ZEROLEN_DESC (1<<30)
-+/* Controller do not handle SDIO interrupts correctly */
-+#define SDHCI_QUIRK_NO_SDIO_IRQ (1<<31)
-
- int irq; /* Device IRQ */
- void __iomem *ioaddr; /* Mapped address */
-Index: linux-2.6.38.1/arch/arm/plat-mxc/include/mach/esdhc.h
-===================================================================
---- linux-2.6.38.1.orig/arch/arm/plat-mxc/include/mach/esdhc.h 2011-04-05 15:18:40.000000000 +0200
-+++ linux-2.6.38.1/arch/arm/plat-mxc/include/mach/esdhc.h 2011-04-05 15:19:26.000000000 +0200
-@@ -13,5 +13,6 @@
- struct esdhc_platform_data {
- unsigned int wp_gpio; /* write protect pin */
- unsigned int cd_gpio; /* card detect pin */
-+ unsigned int no_sdio_irq;
- };
- #endif /* __ASM_ARCH_IMX_ESDHC_H */
-Index: linux-2.6.38.1/drivers/mmc/host/sdhci-esdhc-imx.c
-===================================================================
---- linux-2.6.38.1.orig/drivers/mmc/host/sdhci-esdhc-imx.c 2011-04-05 15:22:09.000000000 +0200
-+++ linux-2.6.38.1/drivers/mmc/host/sdhci-esdhc-imx.c 2011-04-05 15:23:48.000000000 +0200
-@@ -165,6 +165,9 @@
-
- host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION;
- }
-+
-+ if (pdat->no_sdio_irq)
-+ host->quirks |= SDHCI_QUIRK_NO_SDIO_IRQ;
- }
-
- clk = clk_get(mmc_dev(host->mmc), NULL);
-Index: linux-2.6.38.1/drivers/mmc/host/sdhci.c
-===================================================================
---- linux-2.6.38.1.orig/drivers/mmc/host/sdhci.c 2011-04-05 15:24:22.000000000 +0200
-+++ linux-2.6.38.1/drivers/mmc/host/sdhci.c 2011-04-05 15:26:07.000000000 +0200
-@@ -1879,7 +1879,8 @@
- mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200;
-
- mmc->f_max = host->max_clk;
-- mmc->caps |= MMC_CAP_SDIO_IRQ;
-+ if (!(host->quirks & SDHCI_QUIRK_NO_SDIO_IRQ))
-+ mmc->caps |= MMC_CAP_SDIO_IRQ;
-
- /*
- * A controller may support 8-bit width, but the board itself
hooks/post-receive
--
armadeus
|
