From 734e723c6a4d46e56914e63ef55254b75303cc56 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Sun, 26 May 2013 15:31:32 +0200 Subject: [PATCH] ARM: i.MX51: Add aliases for MMC controllers To get persistent names for the MMC controllers add aliases to them Signed-off-by: Sascha Hauer --- arch/arm/boards/freescale-mx51-pdk/board.c | 6 +++--- arch/arm/dts/imx51.dtsi | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/boards/freescale-mx51-pdk/board.c b/arch/arm/boards/freescale-mx51-pdk/board.c index 89ade446d..5ca24bc13 100644 --- a/arch/arm/boards/freescale-mx51-pdk/board.c +++ b/arch/arm/boards/freescale-mx51-pdk/board.c @@ -172,7 +172,7 @@ static int f3s_devices_init(void) armlinux_set_bootparams((void *)0x90000100); armlinux_set_architecture(MACH_TYPE_MX51_BABBAGE); - imx51_bbu_internal_mmc_register_handler("mmc", "/dev/disk0", + imx51_bbu_internal_mmc_register_handler("mmc", "/dev/mmc0", BBU_HANDLER_FLAG_DEFAULT, dcd_entry, sizeof(dcd_entry), 0); return 0; @@ -182,8 +182,8 @@ device_initcall(f3s_devices_init); static int f3s_part_init(void) { - devfs_add_partition("disk0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self0"); - devfs_add_partition("disk0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0"); + devfs_add_partition("mmc0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self0"); + devfs_add_partition("mmc0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0"); return 0; } diff --git a/arch/arm/dts/imx51.dtsi b/arch/arm/dts/imx51.dtsi index 02c132d75..a9002878b 100644 --- a/arch/arm/dts/imx51.dtsi +++ b/arch/arm/dts/imx51.dtsi @@ -22,6 +22,10 @@ gpio1 = &gpio2; gpio2 = &gpio3; gpio3 = &gpio4; + mmc0 = &esdhc1; + mmc1 = &esdhc2; + mmc2 = &esdhc3; + mmc3 = &esdhc4; }; tzic: tz-interrupt-controller@e0000000 {