Patchwork [meta-fsl-arm-extra,v2,1/5] linux-imx (3.0.35): wandboard: fix sdhc platform data

login
register
mail settings
Submitter John Weber
Date March 18, 2013, 8:25 p.m.
Message ID <1363638331-4603-2-git-send-email-rjohnweber@gmail.com>
Download mbox | patch
Permalink /patch/46409/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

John Weber - March 18, 2013, 8:25 p.m.
Fixes the esdhc_platform_data structure defined in board-wand.c.  Before
this change there were problems with loading firmware for the BCM4329
wifi module on board Wandboard-Dual.  In addition, this squashes some
kernel warning messages concerning the MMC bus not having WP and CD for 
mmc1.

Signed-off-by: John Weber <rjohnweber@gmail.com>
---
 ...002-wandboard-dual-fix-sdhc-platform-data.patch |   52 ++++++++++++++++++++
 recipes-kernel/linux/linux-imx_3.0.35.bbappend     |    3 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch

Patch

diff --git a/recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch b/recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch
new file mode 100644
index 0000000..b5c9422
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-3.0.35/wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch
@@ -0,0 +1,52 @@ 
+From ea530483ad42e5b9a89934fbdfd57df81b3a90ab Mon Sep 17 00:00:00 2001
+From: John Weber <rjohnweber@gmail.com>
+Date: Fri, 15 Mar 2013 08:43:15 -0500
+Subject: [PATCH] wandboard: fix sdhc platform data
+
+Fixes sdhc platfrom data structure to solve a problem when loading
+the firmware files for the on-board Wifi module on Wandboard-dual.
+This problem only occured when udev is tasked with loading firmware
+from the filesystem.
+
+Upstream-Status: Pending
+
+Signed-off-by: John Weber <rjohnweber@gmail.com>
+---
+ arch/arm/mach-mx6/board-wand.c |   11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/arch/arm/mach-mx6/board-wand.c b/arch/arm/mach-mx6/board-wand.c
+index 7f972eb..7be6726 100644
+--- a/arch/arm/mach-mx6/board-wand.c
++++ b/arch/arm/mach-mx6/board-wand.c
+@@ -184,13 +184,17 @@ static const struct esdhc_platform_data wand_sd_data[3] = {
+ 		.cd_gpio		= WAND_SD1_CD,
+ 		.wp_gpio		=-EINVAL,
+ 		.keep_power_at_suspend	= 1,
+	        .support_8bit		= 0,
++	  .delay_line = 0,
+ 		.platform_pad_change	= plt_sd_pad_change,
++		.cd_type = ESDHC_CD_CONTROLLER,
+ 	}, {
+-		.cd_gpio		=-EINVAL,
+-		.wp_gpio		=-EINVAL,
+ 		.keep_power_at_suspend	= 1,
+ 		.platform_pad_change	= plt_sd_pad_change,
++		.always_present = 1,
++		.support_8bit = 0,
++		.delay_line = 0,
++		.cd_type = ESDHC_CD_PERMANENT,
+ 	}, {
+ 		.cd_gpio		= WAND_SD3_CD,
+ 		.wp_gpio		= WAND_SD3_WP,
+@@ -198,6 +202,7 @@ static const struct esdhc_platform_data wand_sd_data[3] = {
+ 		.support_8bit		= 0,
+ 		.delay_line		= 0,
+ 		.platform_pad_change	= plt_sd_pad_change,
++		.cd_type = ESDHC_CD_CONTROLLER,
+ 	}
+ };
+ 
+-- 
+1.7.9.5
+
diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bbappend b/recipes-kernel/linux/linux-imx_3.0.35.bbappend
index f1abbf9..0466e67 100644
--- a/recipes-kernel/linux/linux-imx_3.0.35.bbappend
+++ b/recipes-kernel/linux/linux-imx_3.0.35.bbappend
@@ -1,10 +1,11 @@ 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
 
-PRINC := "${@int(PRINC) + 1}"
+PRINC := "${@int(PRINC) + 2}"
 
 # Wandboard-specific patches
 SRC_URI_append_wandboard-dual = " \
    file://wandboard-dual/0001-Linux-3.0.35-Add-wandboard-dual-support.patch \
+   file://wandboard-dual/0002-wandboard-dual-fix-sdhc-platform-data.patch \
 "
 # Add support for the Congatec qmx6 board
 SRC_URI_append_cgtqmx6 = " file://cgtqmx6/cgtqmx6.patch"