Patchwork [meta-fsl-arm,1/3] linux-imx (3.0.35): mx6sabresd: Register SDHC3 first

login
register
mail settings
Submitter Otavio Salvador
Date Oct. 8, 2013, 12:32 p.m.
Message ID <1381235530-1256-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/59483/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Oct. 8, 2013, 12:32 p.m.
On sabresd boards we boot from SDHC3, so let's register it as mmc0.

Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present).

Registering SDHC3 is safer as we can always find the rootfs.

Change-Id: I99bb38c1b5939dc095bbddd298db3cf37fb7c2dc
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 ...6-board-mx6q_sabresd-Register-SDHC3-first.patch | 38 ++++++++++++++++++++++
 recipes-kernel/linux/linux-imx_3.0.35.bb           |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch

\ No newline at end of file
Daiane Angolini - Oct. 8, 2013, 1:55 p.m.
On 10/08/2013 09:32 AM, Otavio Salvador wrote:
> On sabresd boards we boot from SDHC3, so let's register it as mmc0.
>
> Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present).
>
> Registering SDHC3 is safer as we can always find the rootfs.

I agree

>
> Change-Id: I99bb38c1b5939dc095bbddd298db3cf37fb7c2dc
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   ...6-board-mx6q_sabresd-Register-SDHC3-first.patch | 38 ++++++++++++++++++++++
>   recipes-kernel/linux/linux-imx_3.0.35.bb           |  3 +-
>   2 files changed, 40 insertions(+), 1 deletion(-)
>   create mode 100644 recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
>
> diff --git a/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch b/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
> new file mode 100644
> index 0000000..d02aa40
> --- /dev/null
> +++ b/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
> @@ -0,0 +1,38 @@
> +From cd31abbe08372fa870fac78ae845edd4859f8835 Mon Sep 17 00:00:00 2001
> +From: Fabio Estevam <fabio.estevam@freescale.com>
> +Date: Sat, 28 Sep 2013 18:46:18 -0300
> +Subject: [PATCH] ARM: mach-mx6: board-mx6q_sabresd: Register SDHC3 first
> +Organization: O.S. Systems Software LTDA.
> +
> +On sabresd boards we boot from SDHC3, so let's register it as mmc0.
> +
> +Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present).
> +
> +Registering SDHC3 is safer as we can always find the rootfs.
> +
> +Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> +---
> + arch/arm/mach-mx6/board-mx6q_sabresd.c | 5 +----
> + 1 file changed, 1 insertion(+), 4 deletions(-)
> +
> +diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
> +index 3f9a845..4e6b323 100644
> +--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c
> ++++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c
> +@@ -1847,12 +1847,9 @@ static void __init mx6_sabresd_board_init(void)
> +
> + 	imx6q_add_pm_imx(0, &mx6q_sabresd_pm_data);
> +
> +-	/* Move sd4 to first because sd4 connect to emmc.
> +-	   Mfgtools want emmc is mmcblk0 and other sd card is mmcblk1.
> +-	*/
> ++	imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
> + 	imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabresd_sd4_data);
> + 	imx6q_add_sdhci_usdhc_imx(1, &mx6q_sabresd_sd2_data);
> +-	imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
> + 	imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata);
> + 	imx6q_sabresd_init_usb();
> + 	/* SATA is not supported by MX6DL/Solo */
> +--
> +1.8.4.rc3
> +
> diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb
> index dbdbd97..608fb87 100644
> --- a/recipes-kernel/linux/linux-imx_3.0.35.bb
> +++ b/recipes-kernel/linux/linux-imx_3.0.35.bb
> @@ -18,4 +18,5 @@ SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \
>               file://0003-ARM-7670-1-fix-the-memset-fix.patch \
>               file://0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch \
>               file://0005-ENGR00271359-Add-Multi-touch-support.patch \
> -            file://0006-Add-support-for-DVI-monitors.patch"
> +            file://0006-Add-support-for-DVI-monitors.patch \
> +            file://0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch"
> \ No newline at end of file

Which git option do you use to generate this "\ No newline at end of file"?

Patch

diff --git a/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch b/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
new file mode 100644
index 0000000..d02aa40
--- /dev/null
+++ b/recipes-kernel/linux/linux-imx-3.0.35/0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch
@@ -0,0 +1,38 @@ 
+From cd31abbe08372fa870fac78ae845edd4859f8835 Mon Sep 17 00:00:00 2001
+From: Fabio Estevam <fabio.estevam@freescale.com>
+Date: Sat, 28 Sep 2013 18:46:18 -0300
+Subject: [PATCH] ARM: mach-mx6: board-mx6q_sabresd: Register SDHC3 first
+Organization: O.S. Systems Software LTDA.
+
+On sabresd boards we boot from SDHC3, so let's register it as mmc0.
+
+Currently eMMC is mmc0 and mmc1 can be SDHC3 or SDHC2 (if present).
+
+Registering SDHC3 is safer as we can always find the rootfs.
+
+Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
+---
+ arch/arm/mach-mx6/board-mx6q_sabresd.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
+index 3f9a845..4e6b323 100644
+--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c
++++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c
+@@ -1847,12 +1847,9 @@ static void __init mx6_sabresd_board_init(void)
+ 
+ 	imx6q_add_pm_imx(0, &mx6q_sabresd_pm_data);
+ 
+-	/* Move sd4 to first because sd4 connect to emmc.
+-	   Mfgtools want emmc is mmcblk0 and other sd card is mmcblk1.
+-	*/
++	imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
+ 	imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabresd_sd4_data);
+ 	imx6q_add_sdhci_usdhc_imx(1, &mx6q_sabresd_sd2_data);
+-	imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabresd_sd3_data);
+ 	imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata);
+ 	imx6q_sabresd_init_usb();
+ 	/* SATA is not supported by MX6DL/Solo */
+-- 
+1.8.4.rc3
+
diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb
index dbdbd97..608fb87 100644
--- a/recipes-kernel/linux/linux-imx_3.0.35.bb
+++ b/recipes-kernel/linux/linux-imx_3.0.35.bb
@@ -18,4 +18,5 @@  SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \
             file://0003-ARM-7670-1-fix-the-memset-fix.patch \
             file://0004-ENGR00271136-Fix-build-break-when-CONFIG_CLK_DEBUG-i.patch \
             file://0005-ENGR00271359-Add-Multi-touch-support.patch \
-            file://0006-Add-support-for-DVI-monitors.patch"
+            file://0006-Add-support-for-DVI-monitors.patch \
+            file://0007-ARM-mach-mx6-board-mx6q_sabresd-Register-SDHC3-first.patch"