[PATCH 2/2] ARM: boards: fix nand bbu_handler device paths

[PATCH 2/2] ARM: boards: fix nand bbu_handler device paths

[Stefano Manni]

The bbu handler for nand now takes the device
path as parameter and no longer use the hardcoded
value.
Make the change accordingly to all the boards
using it.

Signed-off-by: Stefano Manni <stefano.manni@gmail.com>
---
 arch/arm/boards/digi-ccimx6ulsom/board.c | 3 ++-
 arch/arm/boards/gateworks-ventana/board.c | 4 +++-
 arch/arm/boards/karo-tx6x/board.c | 3 ++-
 arch/arm/boards/phytec-som-imx6/board.c | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/digi-ccimx6ulsom/board.c 
b/arch/arm/boards/digi-ccimx6ulsom/board.c
index ef6828c02c..9765c65839 100644
--- a/arch/arm/boards/digi-ccimx6ulsom/board.c
+++ b/arch/arm/boards/digi-ccimx6ulsom/board.c
@@ -11,7 +11,8 @@ static int digi_ccimx6ulsbcpro_device_init(void)
  if (!of_machine_is_compatible("digi,ccimx6ulsbcpro"))
   return 0;

- imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
+ imx6_bbu_nand_register_handler("nand", "/dev/nand0.barebox",
+ BBU_HANDLER_FLAG_DEFAULT);

  barebox_set_hostname("ccimx6ulsbcpro");

diff --git a/arch/arm/boards/gateworks-ventana/board.c 
b/arch/arm/boards/gateworks-ventana/board.c
index aa2137a971..9c0012b359 100644
--- a/arch/arm/boards/gateworks-ventana/board.c
+++ b/arch/arm/boards/gateworks-ventana/board.c
@@ -72,7 +72,9 @@ static int gw54xx_devices_init(void)
  if (gsc_get_rev(&client) < 'E')
   of_register_fixup(gw54xx_wdog_of_fixup, NULL);

- imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
+ imx6_bbu_nand_register_handler("nand",
+ "/dev/nand0.barebox",
+ BBU_HANDLER_FLAG_DEFAULT);

  barebox_set_hostname("gw54xx");

diff --git a/arch/arm/boards/karo-tx6x/board.c 
b/arch/arm/boards/karo-tx6x/board.c
index f964ddefd1..1e14a75272 100644
--- a/arch/arm/boards/karo-tx6x/board.c
+++ b/arch/arm/boards/karo-tx6x/board.c
@@ -110,7 +110,8 @@ static int tx6x_devices_init(void)
   * this board has eMMC or NAND.
   */
  if (sbmr1 & (1 << 7)) {
- imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
+ imx6_bbu_nand_register_handler("nand", "/dev/nand0.barebox",
+ BBU_HANDLER_FLAG_DEFAULT);
   of_device_enable_and_register_by_name("environment-nand");
   of_device_enable_and_register_by_alias("nand");
  } else {
diff --git a/arch/arm/boards/phytec-som-imx6/board.c 
b/arch/arm/boards/phytec-som-imx6/board.c
index 2db3fa1db8..7e6f61bc36 100644
--- a/arch/arm/boards/phytec-som-imx6/board.c
+++ b/arch/arm/boards/phytec-som-imx6/board.c
@@ -259,7 +259,9 @@ static int physom_imx6_probe(struct device *dev)
   imx6_bbu_internal_mmcboot_register_handler("mmc1-boot",
       "mmc1", 0);
  } else {
- imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
+ imx6_bbu_nand_register_handler("nand",
+ "/dev/nand0.barebox",
+ BBU_HANDLER_FLAG_DEFAULT);
  }

  defaultenv_append_directory(defaultenv_physom_imx6);
-- 
2.25.1

[PATCH 2/2] ARM: boards: fix nand bbu_handler device paths

[Stefano Manni]

The bbu handler for nand now takes the device
path as parameter and no longer use the hardcoded
value.
Make the change accordingly to all the boards
using it.

Signed-off-by: Stefano Manni <stefano.manni@gmail.com>
---
 arch/arm/boards/digi-ccimx6ulsom/board.c  | 3 ++-
 arch/arm/boards/gateworks-ventana/board.c | 4 +++-
 arch/arm/boards/karo-tx6x/board.c         | 3 ++-
 arch/arm/boards/phytec-som-imx6/board.c   | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boards/digi-ccimx6ulsom/board.c b/arch/arm/boards/digi-ccimx6ulsom/board.c
index ef6828c02c..9765c65839 100644
--- a/arch/arm/boards/digi-ccimx6ulsom/board.c
+++ b/arch/arm/boards/digi-ccimx6ulsom/board.c
@@ -11,7 +11,8 @@ static int digi_ccimx6ulsbcpro_device_init(void)
 	if (!of_machine_is_compatible("digi,ccimx6ulsbcpro"))
 		return 0;
 
-	imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
+	imx6_bbu_nand_register_handler("nand", "/dev/nand0.barebox",
+			BBU_HANDLER_FLAG_DEFAULT);
 
 	barebox_set_hostname("ccimx6ulsbcpro");
 
diff --git a/arch/arm/boards/gateworks-ventana/board.c b/arch/arm/boards/gateworks-ventana/board.c
index aa2137a971..9c0012b359 100644
--- a/arch/arm/boards/gateworks-ventana/board.c
+++ b/arch/arm/boards/gateworks-ventana/board.c
@@ -72,7 +72,9 @@ static int gw54xx_devices_init(void)
 	if (gsc_get_rev(&client) < 'E')
 		of_register_fixup(gw54xx_wdog_of_fixup, NULL);
 
-	imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
+	imx6_bbu_nand_register_handler("nand",
+			"/dev/nand0.barebox",
+			BBU_HANDLER_FLAG_DEFAULT);
 
 	barebox_set_hostname("gw54xx");
 
diff --git a/arch/arm/boards/karo-tx6x/board.c b/arch/arm/boards/karo-tx6x/board.c
index f964ddefd1..1e14a75272 100644
--- a/arch/arm/boards/karo-tx6x/board.c
+++ b/arch/arm/boards/karo-tx6x/board.c
@@ -110,7 +110,8 @@ static int tx6x_devices_init(void)
 	 * this board has eMMC or NAND.
 	 */
 	if (sbmr1 & (1 << 7)) {
-		imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
+		imx6_bbu_nand_register_handler("nand", "/dev/nand0.barebox",
+								BBU_HANDLER_FLAG_DEFAULT);
 		of_device_enable_and_register_by_name("environment-nand");
 		of_device_enable_and_register_by_alias("nand");
 	} else {
diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c
index 2db3fa1db8..7e6f61bc36 100644
--- a/arch/arm/boards/phytec-som-imx6/board.c
+++ b/arch/arm/boards/phytec-som-imx6/board.c
@@ -259,7 +259,9 @@ static int physom_imx6_probe(struct device *dev)
 		imx6_bbu_internal_mmcboot_register_handler("mmc1-boot",
 						"mmc1", 0);
 	} else {
-		imx6_bbu_nand_register_handler("nand", BBU_HANDLER_FLAG_DEFAULT);
+		imx6_bbu_nand_register_handler("nand",
+						"/dev/nand0.barebox",
+						BBU_HANDLER_FLAG_DEFAULT);
 	}
 
 	defaultenv_append_directory(defaultenv_physom_imx6);
-- 
2.25.1