From c891acca172dfc60719419e19338508a83d97931 Mon Sep 17 00:00:00 2001
From: Alexandre Ghiti <alexandre.ghiti@canonical.com>
Date: Wed, 27 Oct 2021 09:43:36 +0200
Subject: include: sbi_utils: Introduce an helper to get fdt base address
This simply adds an helper to get fdt address which is more explicit than
sbi_scratch_thishart_arg1_ptr.
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
Reviewed-by: Xiang W <wxjstz@126.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
---
lib/utils/ipi/fdt_ipi.c | 2 +-
lib/utils/irqchip/fdt_irqchip.c | 2 +-
lib/utils/reset/fdt_reset.c | 2 +-
lib/utils/serial/fdt_serial.c | 2 +-
lib/utils/timer/fdt_timer.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
(limited to 'lib')
diff --git a/lib/utils/ipi/fdt_ipi.c b/lib/utils/ipi/fdt_ipi.c
index ed56e49..91f116f 100644
--- a/lib/utils/ipi/fdt_ipi.c
+++ b/lib/utils/ipi/fdt_ipi.c
@@ -45,7 +45,7 @@ static int fdt_ipi_cold_init(void)
int pos, noff, rc;
struct fdt_ipi *drv;
const struct fdt_match *match;
- void *fdt = sbi_scratch_thishart_arg1_ptr();
+ void *fdt = fdt_get_address();
for (pos = 0; pos < array_size(ipi_drivers); pos++) {
drv = ipi_drivers[pos];
diff --git a/lib/utils/irqchip/fdt_irqchip.c b/lib/utils/irqchip/fdt_irqchip.c
index 1306d50..8dda661 100644
--- a/lib/utils/irqchip/fdt_irqchip.c
+++ b/lib/utils/irqchip/fdt_irqchip.c
@@ -38,7 +38,7 @@ static int fdt_irqchip_cold_init(void)
int pos, noff, rc;
struct fdt_irqchip *drv;
const struct fdt_match *match;
- void *fdt = sbi_scratch_thishart_arg1_ptr();
+ void *fdt = fdt_get_address();
for (pos = 0; pos < array_size(irqchip_drivers); pos++) {
drv = irqchip_drivers[pos];
diff --git a/lib/utils/reset/fdt_reset.c b/lib/utils/reset/fdt_reset.c
index 168bb0c..7d0aba6 100644
--- a/lib/utils/reset/fdt_reset.c
+++ b/lib/utils/reset/fdt_reset.c
@@ -33,7 +33,7 @@ int fdt_reset_init(void)
int pos, noff, rc;
struct fdt_reset *drv;
const struct fdt_match *match;
- void *fdt = sbi_scratch_thishart_arg1_ptr();
+ void *fdt = fdt_get_address();
for (pos = 0; pos < array_size(reset_drivers); pos++) {
drv = reset_drivers[pos];
diff --git a/lib/utils/serial/fdt_serial.c b/lib/utils/serial/fdt_serial.c
index 1d1eba8..cedda04 100644
--- a/lib/utils/serial/fdt_serial.c
+++ b/lib/utils/serial/fdt_serial.c
@@ -40,7 +40,7 @@ int fdt_serial_init(void)
struct fdt_serial *drv;
const struct fdt_match *match;
int pos, noff = -1, len, coff, rc;
- void *fdt = sbi_scratch_thishart_arg1_ptr();
+ void *fdt = fdt_get_address();
/* Find offset of node pointed to by stdout-path */
coff = fdt_path_offset(fdt, "/chosen");
diff --git a/lib/utils/timer/fdt_timer.c b/lib/utils/timer/fdt_timer.c
index 148c05e..781bb63 100644
--- a/lib/utils/timer/fdt_timer.c
+++ b/lib/utils/timer/fdt_timer.c
@@ -45,7 +45,7 @@ static int fdt_timer_cold_init(void)
int pos, noff, rc;
struct fdt_timer *drv;
const struct fdt_match *match;
- void *fdt = sbi_scratch_thishart_arg1_ptr();
+ void *fdt = fdt_get_address();
for (pos = 0; pos < array_size(timer_drivers); pos++) {
drv = timer_drivers[pos];
--
cgit v1.2.3