Hi Nicolas,
Could you pull the fix for [Bug 754254] imx51 randomly truncates serial input at 31 characters?
It extends the card CD/WP support for mx5 platforms, and adds the board level configuration for mx51evk to fix bug 754254 on this particular board. Other boards need to add their board level configuration to actually enable the support.
The following changes since commit dcd71f6729fbee40d28a99cb645c979c3db7b545
ARM: footbridge: fix clock event support
are available in the git repository at:
git://git.linaro.org/people/shawnguo/linux-2.6.git fix-754254
Chris Ball (2): mmc: Replace SDHCI_QUIRK_FORCE_BLK_SZ_2048 with a platform hook. mmc: Replace SDHCI_QUIRK_NO_MULTIBLOCK with a platform hook.
Shawn Guo (9): mmc: sdhci: make sdhci-pltfm device drivers self registered mmc: sdhci: eliminate sdhci_of_host and sdhci_of_data mmc: sdhci: make sdhci-of device drivers self registered mmc: sdhci: merge two sdhci-pltfm.h into one mmc: sdhci: change sdhci-pltfm into a module * mmc: sdhci: fix interrupt storm from card detection * mmc: sdhci-esdhc-imx: SDHCI_CARD_PRESENT does not get cleared * mmc: sdhci-esdhc-imx: remove "WP" from flag ESDHC_FLAG_GPIO_FOR_CD_WP * mmc: sdhci-esdhc-imx: extend card_detect and write_protect support for mx5
[ The last four patches marked with '*' are the actual fixing, and the others are prerequisite patches from mmc-next tree. ]
arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 3 +- arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 3 +- arch/arm/mach-imx/mach-mx25_3ds.c | 2 + arch/arm/mach-imx/mach-pcm043.c | 2 + arch/arm/mach-mx5/board-mx51_babbage.c | 24 ++- .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 12 + arch/arm/plat-mxc/include/mach/esdhc.h | 25 ++- drivers/mmc/host/Kconfig | 49 ++-- drivers/mmc/host/Makefile | 18 +- drivers/mmc/host/sdhci-cns3xxx.c | 44 ++++- drivers/mmc/host/sdhci-dove.c | 43 ++++- drivers/mmc/host/sdhci-esdhc-imx.c | 218 ++++++++++++----- drivers/mmc/host/sdhci-esdhc.h | 3 +- drivers/mmc/host/sdhci-of-core.c | 253 -------------------- drivers/mmc/host/sdhci-of-esdhc.c | 93 ++++++-- drivers/mmc/host/sdhci-of-hlwd.c | 67 +++++- drivers/mmc/host/sdhci-of.h | 42 ---- drivers/mmc/host/sdhci-pltfm.c | 216 ++++++++--------- drivers/mmc/host/sdhci-pltfm.h | 90 +++++++- drivers/mmc/host/sdhci-tegra.c | 117 +++++++--- drivers/mmc/host/sdhci.c | 32 ++- drivers/mmc/host/sdhci.h | 2 + include/linux/mmc/sdhci-pltfm.h | 35 --- include/linux/mmc/sdhci.h | 8 +- 24 files changed, 763 insertions(+), 638 deletions(-)
On Fri, 17 Jun 2011, Shawn Guo wrote:
Hi Nicolas,
Could you pull the fix for [Bug 754254] imx51 randomly truncates serial input at 31 characters?
It extends the card CD/WP support for mx5 platforms, and adds the board level configuration for mx51evk to fix bug 754254 on this particular board. Other boards need to add their board level configuration to actually enable the support.
Done.
Actually I did merge and pushed it yesterday but forgot to acknowledge.
Nicolas
Due to the issue reported with ESDHC_CD_CONTROLLER mode as below, GPIO mode becomes the best choice for card detection before the issue gets addressed.
http://article.gmane.org/gmane.linux.ports.arm.kernel/120790
Signed-off-by: Shawn Guo shawn.guo@linaro.org --- Actually the issue has been fixed with the v3 of the patch set as below, but it's still the safest to use gpio mode for card detection to let the monthly release go independently, since the fixing has not got enough feedback yet.
http://thread.gmane.org/gmane.linux.ports.arm.kernel/121081
arch/arm/mach-mx5/board-mx51_babbage.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-mx5/board-mx51_babbage.c b/arch/arm/mach-mx5/board-mx51_babbage.c index 6e6de47..ad693ec 100644 --- a/arch/arm/mach-mx5/board-mx51_babbage.c +++ b/arch/arm/mach-mx5/board-mx51_babbage.c @@ -41,6 +41,8 @@ #define BABBAGE_POWER_KEY IMX_GPIO_NR(2, 21) #define BABBAGE_ECSPI1_CS0 IMX_GPIO_NR(4, 24) #define BABBAGE_ECSPI1_CS1 IMX_GPIO_NR(4, 25) +#define BABBAGE_SD1_CD IMX_GPIO_NR(1, 0) +#define BABBAGE_SD1_WP IMX_GPIO_NR(1, 1) #define BABBAGE_SD2_CD IMX_GPIO_NR(1, 6) #define BABBAGE_SD2_WP IMX_GPIO_NR(1, 5)
@@ -141,9 +143,9 @@ static iomux_v3_cfg_t mx51babbage_pads[] = { MX51_PAD_SD1_DATA1__SD1_DATA1, MX51_PAD_SD1_DATA2__SD1_DATA2, MX51_PAD_SD1_DATA3__SD1_DATA3, - /* CD/WP from controller */ - MX51_PAD_GPIO1_0__SD1_CD, - MX51_PAD_GPIO1_1__SD1_WP, + /* CD/WP gpio */ + MX51_PAD_GPIO1_0__GPIO1_0, + MX51_PAD_GPIO1_1__GPIO1_1,
/* SD 2 */ MX51_PAD_SD2_CMD__SD2_CMD, @@ -340,8 +342,10 @@ static const struct spi_imx_master mx51_babbage_spi_pdata __initconst = { };
static const struct esdhc_platform_data mx51_babbage_sd1_data __initconst = { - .cd_type = ESDHC_CD_CONTROLLER, - .wp_type = ESDHC_WP_CONTROLLER, + .cd_gpio = BABBAGE_SD1_CD, + .wp_gpio = BABBAGE_SD1_WP, + .cd_type = ESDHC_CD_GPIO, + .wp_type = ESDHC_WP_GPIO, };
static const struct esdhc_platform_data mx51_babbage_sd2_data __initconst = {
On Mon, 20 Jun 2011, Shawn Guo wrote:
Due to the issue reported with ESDHC_CD_CONTROLLER mode as below, GPIO mode becomes the best choice for card detection before the issue gets addressed.
http://article.gmane.org/gmane.linux.ports.arm.kernel/120790
Signed-off-by: Shawn Guo shawn.guo@linaro.org
Thanks.
Nicolas
-
Nicolas Pitre -
Shawn Guo -
Shawn Guo