From 6af55769eb8cd5b9c7fdcd959586e0bc0fce3994 Mon Sep 17 00:00:00 2001
From: Bin Meng <bmeng.cn@gmail.com>
Date: Tue, 17 Mar 2020 07:59:42 -0700
Subject: lib: utils: Move PLIC DT fix up codes to fdt_helper.c

Now that we have a dedicated fdt_helper.c file for DT releated
helper routines, move plic_fdt_fixup() codes from plic.c to
fdt_helper.c and rename it to fdt_plic_fixup() at the same time,
to keep name consistency in the same file.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
---
 platform/andes/ae350/platform.c  | 3 ++-
 platform/ariane-fpga/platform.c  | 3 ++-
 platform/qemu/virt/platform.c    | 3 ++-
 platform/sifive/fu540/platform.c | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'platform')

diff --git a/platform/andes/ae350/platform.c b/platform/andes/ae350/platform.c
index 13c2b45..a42db9d 100644
--- a/platform/andes/ae350/platform.c
+++ b/platform/andes/ae350/platform.c
@@ -13,6 +13,7 @@
 #include <sbi/sbi_console.h>
 #include <sbi/sbi_const.h>
 #include <sbi/sbi_platform.h>
+#include <sbi_utils/fdt/fdt_helper.h>
 #include <sbi_utils/irqchip/plic.h>
 #include <sbi_utils/serial/uart8250.h>
 #include "platform.h"
@@ -47,7 +48,7 @@ static int ae350_final_init(bool cold_boot)
 		return 0;
 
 	fdt = sbi_scratch_thishart_arg1_ptr();
-	plic_fdt_fixup(fdt, "riscv,plic0");
+	fdt_plic_fixup(fdt, "riscv,plic0");
 
 	return 0;
 }
diff --git a/platform/ariane-fpga/platform.c b/platform/ariane-fpga/platform.c
index 84ffec6..742386b 100644
--- a/platform/ariane-fpga/platform.c
+++ b/platform/ariane-fpga/platform.c
@@ -11,6 +11,7 @@
 #include <sbi/sbi_const.h>
 #include <sbi/sbi_hart.h>
 #include <sbi/sbi_platform.h>
+#include <sbi_utils/fdt/fdt_helper.h>
 #include <sbi_utils/irqchip/plic.h>
 #include <sbi_utils/serial/uart8250.h>
 #include <sbi_utils/sys/clint.h>
@@ -55,7 +56,7 @@ static int ariane_final_init(bool cold_boot)
 	if (!cold_boot)
 		return 0;
 	fdt = sbi_scratch_thishart_arg1_ptr();
-	plic_fdt_fixup(fdt, "riscv,plic0");
+	fdt_plic_fixup(fdt, "riscv,plic0");
 	return 0;
 }
 
diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c
index 92f34aa..c103e85 100644
--- a/platform/qemu/virt/platform.c
+++ b/platform/qemu/virt/platform.c
@@ -14,6 +14,7 @@
 #include <sbi/sbi_const.h>
 #include <sbi/sbi_hart.h>
 #include <sbi/sbi_platform.h>
+#include <sbi_utils/fdt/fdt_helper.h>
 #include <sbi_utils/irqchip/plic.h>
 #include <sbi_utils/serial/uart8250.h>
 #include <sbi_utils/sys/clint.h>
@@ -46,7 +47,7 @@ static int virt_final_init(bool cold_boot)
 		return 0;
 
 	fdt = sbi_scratch_thishart_arg1_ptr();
-	plic_fdt_fixup(fdt, "riscv,plic0");
+	fdt_plic_fixup(fdt, "riscv,plic0");
 
 	return 0;
 }
diff --git a/platform/sifive/fu540/platform.c b/platform/sifive/fu540/platform.c
index 2eb9fa1..a10f50b 100644
--- a/platform/sifive/fu540/platform.c
+++ b/platform/sifive/fu540/platform.c
@@ -14,6 +14,7 @@
 #include <sbi/sbi_console.h>
 #include <sbi/sbi_const.h>
 #include <sbi/sbi_platform.h>
+#include <sbi_utils/fdt/fdt_helper.h>
 #include <sbi_utils/irqchip/plic.h>
 #include <sbi_utils/serial/sifive-uart.h>
 #include <sbi_utils/sys/clint.h>
@@ -87,7 +88,7 @@ static void fu540_modify_dt(void *fdt)
 	fdt_setprop_string(fdt, chosen_offset, "stdout-path",
 			   "/soc/serial@10010000:115200");
 
-	plic_fdt_fixup(fdt, "riscv,plic0");
+	fdt_plic_fixup(fdt, "riscv,plic0");
 }
 
 static int fu540_final_init(bool cold_boot)
-- 
cgit v1.2.3