[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-177-g69fb496
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.2-177-g69fb496
|
From: Gwenhael Goavec-M. <gwe...@us...> - 2013-02-23 16:50:04
|
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 69fb4964789ae5d99800decd702f9d56f0490eec (commit)
via 531152f41613ea7fb3fd24fc4f2ab05716ef8816 (commit)
from 366f11e8a54f2c2260b74443d2864605ce6c9508 (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 69fb4964789ae5d99800decd702f9d56f0490eec
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Feb 23 17:48:17 2013 +0100
[LINUX][3.8] apf51dev: Add fsl,no_sdio_irq property for esdhci2
commit 531152f41613ea7fb3fd24fc4f2ab05716ef8816
Author: Gwenhael Goavec-Merou <gw...@tr...>
Date: Sat Feb 23 17:46:56 2013 +0100
[LINUX][3.8] imx51: adapt patch 427 from 3.0
-----------------------------------------------------------------------
Summary of changes:
.../3.8/0401-armadeus-add_apf51dev_baseboard.patch | 3 +-
..._possibility_to_deactivate_SDIO_interrupt.patch | 69 ++++++++++++++++++++
2 files changed, 71 insertions(+), 1 deletions(-)
create mode 100644 patches/linux/3.8/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
diff --git a/patches/linux/3.8/0401-armadeus-add_apf51dev_baseboard.patch b/patches/linux/3.8/0401-armadeus-add_apf51dev_baseboard.patch
index 92fe7fd..42c8bfe 100644
--- a/patches/linux/3.8/0401-armadeus-add_apf51dev_baseboard.patch
+++ b/patches/linux/3.8/0401-armadeus-add_apf51dev_baseboard.patch
@@ -7,7 +7,7 @@ Index: linux-3.8/arch/arm/boot/dts/imx51-apf51dev.dts
===================================================================
--- /dev/null
+++ linux-3.8/arch/arm/boot/dts/imx51-apf51dev.dts
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,72 @@
+/*
+ * Copyright 2013 Armadeus Systems - <su...@ar...>
+ *
@@ -59,6 +59,7 @@ Index: linux-3.8/arch/arm/boot/dts/imx51-apf51dev.dts
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_esdhc2_1>;
+ bus-width = <4>;
++ fsl,no_sdio_irq;
+ non-removable;
+ status = "okay";
+};
diff --git a/patches/linux/3.8/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch b/patches/linux/3.8/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
new file mode 100644
index 0000000..0e0e248
--- /dev/null
+++ b/patches/linux/3.8/0405-armadeus-esdhc-imx-add_possibility_to_deactivate_SDIO_interrupt.patch
@@ -0,0 +1,69 @@
+Allows to deactivate SDIO interrupt usage.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Gwenhael Goavec-Merou <gwe...@ar...>
+
+Index: linux-3.8/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
+===================================================================
+--- linux-3.8.orig/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
++++ linux-3.8/Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt
+@@ -12,6 +12,7 @@ Required properties:
+ Optional properties:
+ - fsl,cd-controller : Indicate to use controller internal card detection
+ - fsl,wp-controller : Indicate to use controller internal write protection
++- fsl,no_sdio_irq : Indicate to not use SDIO IRQ
+
+ Examples:
+
+Index: linux-3.8/drivers/mmc/host/sdhci-esdhc-imx.c
+===================================================================
+--- linux-3.8.orig/drivers/mmc/host/sdhci-esdhc-imx.c
++++ linux-3.8/drivers/mmc/host/sdhci-esdhc-imx.c
+@@ -421,6 +421,9 @@ sdhci_esdhc_imx_probe_dt(struct platform
+ if (of_get_property(np, "fsl,wp-controller", NULL))
+ boarddata->wp_type = ESDHC_WP_CONTROLLER;
+
++ if (of_get_property(np, "fsl,no_sdio_irq", NULL))
++ boarddata->no_sdio_irq = 1;
++
+ boarddata->cd_gpio = of_get_named_gpio(np, "cd-gpios", 0);
+ if (gpio_is_valid(boarddata->cd_gpio))
+ boarddata->cd_type = ESDHC_CD_GPIO;
+@@ -575,6 +578,9 @@ static int sdhci_esdhc_imx_probe(struct
+ break;
+ }
+
++ if (boarddata->no_sdio_irq)
++ host->quirks2 = SDHCI_QUIRK2_HOST_OFF_CARD_ON;
++
+ err = sdhci_add_host(host);
+ if (err)
+ goto disable_clk;
+Index: linux-3.8/drivers/mmc/host/sdhci.c
+===================================================================
+--- linux-3.8.orig/drivers/mmc/host/sdhci.c
++++ linux-3.8/drivers/mmc/host/sdhci.c
+@@ -2823,7 +2823,10 @@ int sdhci_add_host(struct sdhci_host *ho
+
+ mmc->max_discard_to = (1 << 27) / host->timeout_clk;
+
+- mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23;
++ mmc->caps |= MMC_CAP_ERASE | MMC_CAP_CMD23;
++
++ if (!(host->quirks2 & SDHCI_QUIRK2_HOST_OFF_CARD_ON))
++ mmc->caps |= MMC_CAP_SDIO_IRQ;
+
+ if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12)
+ host->flags |= SDHCI_AUTO_CMD12;
+Index: linux-3.8/include/linux/platform_data/mmc-esdhc-imx.h
+===================================================================
+--- linux-3.8.orig/include/linux/platform_data/mmc-esdhc-imx.h
++++ linux-3.8/include/linux/platform_data/mmc-esdhc-imx.h
+@@ -37,6 +37,7 @@ enum cd_types {
+ struct esdhc_platform_data {
+ unsigned int wp_gpio;
+ unsigned int cd_gpio;
++ unsigned int no_sdio_irq;
+ enum wp_types wp_type;
+ enum cd_types cd_type;
+ };
hooks/post-receive
--
armadeus
|
