[PATCH 3/3] ARM: i.MX: bbu-internal: update board files to make use of new bbu handler

[Uwe Kleine-König]

From: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>

Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
Hello,

this is only compile tested. There are some boards that write to
mmcX.boot0.barebox. On the board I tested this series on I don't have
such a setup, so I didn't touch these. Probably this series needs
adaption to be able to handle this scenario.

Best regards
Uwe

 arch/arm/boards/dfi-fs700-m60/board.c | 3 +--
 arch/arm/boards/guf-santaro/board.c   | 2 +-
 arch/arm/boards/karo-tx6x/board.c     | 4 ++--
 arch/arm/boards/tqma6x/board.c        | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boards/dfi-fs700-m60/board.c b/arch/arm/boards/dfi-fs700-m60/board.c
index bef4612d9e66..c2c73db8e547 100644
--- a/arch/arm/boards/dfi-fs700-m60/board.c
+++ b/arch/arm/boards/dfi-fs700-m60/board.c
@@ -110,8 +110,7 @@ static int dfi_fs700_m60_init(void)
 	else
 		flag_mmc |= BBU_HANDLER_FLAG_DEFAULT;
 
-	imx6_bbu_internal_mmc_register_handler("mmc", "/dev/mmc3.boot0",
-		flag_mmc);
+	imx6_bbu_internal_mmcboot_register_handler("mmc", "mmc3", flag_mmc);
 	imx6_bbu_internal_spi_i2c_register_handler("spiflash", "/dev/m25p0",
 		flag_spi);
 
diff --git a/arch/arm/boards/guf-santaro/board.c b/arch/arm/boards/guf-santaro/board.c
index e54110886bd9..adf6830dff1d 100644
--- a/arch/arm/boards/guf-santaro/board.c
+++ b/arch/arm/boards/guf-santaro/board.c
@@ -150,7 +150,7 @@ static int santaro_device_init(void)
 	}
 
 	imx6_bbu_internal_mmc_register_handler("sd", "/dev/mmc1", flag_sd);
-	imx6_bbu_internal_mmc_register_handler("emmc", "/dev/mmc3.boot0", flag_emmc);
+	imx6_bbu_internal_mmcboot_register_handler("emmc", "mmc3", flag_emmc);
 
 	return 0;
 }
diff --git a/arch/arm/boards/karo-tx6x/board.c b/arch/arm/boards/karo-tx6x/board.c
index 31c1c3a9ff5d..3e239bb653e0 100644
--- a/arch/arm/boards/karo-tx6x/board.c
+++ b/arch/arm/boards/karo-tx6x/board.c
@@ -123,8 +123,8 @@ static int tx6x_devices_init(void)
 		of_device_enable_and_register_by_name("environment-nand");
 		of_device_enable_and_register_by_name("gpmi-nand at 00112000");
 	} else {
-		imx6_bbu_internal_mmc_register_handler("eMMC", "/dev/mmc3.boot0",
-						       BBU_HANDLER_FLAG_DEFAULT);
+		imx6_bbu_internal_mmcboot_register_handler("eMMC", "mmc3",
+							   BBU_HANDLER_FLAG_DEFAULT);
 		of_device_enable_and_register_by_name("environment-emmc");
 		of_device_enable_and_register_by_name("usdhc at 0219c000");
 	}
diff --git a/arch/arm/boards/tqma6x/board.c b/arch/arm/boards/tqma6x/board.c
index 8946a27b696a..ecf8fa06af01 100644
--- a/arch/arm/boards/tqma6x/board.c
+++ b/arch/arm/boards/tqma6x/board.c
@@ -105,7 +105,7 @@ static int tqma6x_env_init(void)
 
 	imx6_bbu_internal_spi_i2c_register_handler("spiflash", "/dev/m25p0.barebox",
 		BBU_HANDLER_FLAG_DEFAULT);
-	imx6_bbu_internal_mmc_register_handler("emmc", "/dev/mmc2.boot0", 0);
+	imx6_bbu_internal_mmcboot_register_handler("emmc", "mmc2", 0);
 
 	device_detect_by_name("mmc2");
 
-- 
2.14.2