aboutsummaryrefslogtreecommitdiff
path: root/sys/arm/broadcom
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arm/broadcom')
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c4
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_dma.c1
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_fb.c9
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_fbd.c1
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_ft5406.c1
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_intr.c1
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_machdep.c10
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_sdhci.c1
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_spi.c1
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_systimer.c1
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_wdog.c1
11 files changed, 11 insertions, 20 deletions
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
index ea4b6f604ee4..f20d5204828d 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c
@@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <machine/intr.h>
-#include <dev/fdt/fdt_common.h>
-
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
@@ -1261,7 +1259,7 @@ bcm2835_cpufreq_identify(driver_t *driver, device_t parent)
root = OF_finddevice("/");
for (compat = compat_data; compat->ocd_str != NULL; compat++)
- if (fdt_is_compatible(root, compat->ocd_str))
+ if (ofw_bus_node_is_compatible(root, compat->ocd_str))
break;
if (compat->ocd_data == 0)
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
index 3b6c03201fa1..acb6e3afa97a 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
#include <sys/resource.h>
#include <sys/rman.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fb.c b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
index 58caac2cd884..d8c25b5a6e80 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fb.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <vm/pmap.h>
#include <dev/fb/fbreg.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
#include <dev/syscons/syscons.h>
@@ -474,15 +473,15 @@ bcmfb_configure(int flags)
if ((root != 0) &&
(display = fdt_find_compatible(root, "broadcom,bcm2835-fb", 1))) {
if (sc->width == 0) {
- if ((OF_getprop(display, "broadcom,width",
+ if ((OF_getencprop(display, "broadcom,width",
&cell, sizeof(cell))) > 0)
- sc->width = (int)fdt32_to_cpu(cell);
+ sc->width = cell;
}
if (sc->height == 0) {
- if ((OF_getprop(display, "broadcom,height",
+ if ((OF_getencprop(display, "broadcom,height",
&cell, sizeof(cell))) > 0)
- sc->height = (int)fdt32_to_cpu(cell);
+ sc->height = cell;
}
}
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
index 04cc83a42c81..f26b5c19697c 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c b/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c
index 86432cfca4ad..026d4c574f68 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_ft5406.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_intr.c b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
index f3a5a2832845..249b86703fd6 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_intr.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_intr.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/intr.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
index 56413beb6280..bd1762f88963 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
@@ -78,13 +78,15 @@ bcm2835_late_init(platform_t plat)
system = OF_finddevice("/system");
if (system != 0) {
- len = OF_getprop(system, "linux,serial", &cells, sizeof(cells));
+ len = OF_getencprop(system, "linux,serial", cells,
+ sizeof(cells));
if (len > 0)
- board_set_serial(fdt64_to_cpu(*((uint64_t *)cells)));
+ board_set_serial(((uint64_t)cells[0]) << 32 | cells[1]);
- len = OF_getprop(system, "linux,revision", &cells, sizeof(cells));
+ len = OF_getencprop(system, "linux,revision", cells,
+ sizeof(cells));
if (len > 0)
- board_set_revision(fdt32_to_cpu(*((uint32_t *)cells)));
+ board_set_revision(cells[0]);
}
}
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
index b74fefd958e1..f98d07df193c 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spi.c b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
index b30fac7819c9..dbfec6ea4f99 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_spi.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <machine/resource.h>
#include <machine/intr.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
index 3fbaa903c59d..724e5efbc86b 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
#include <machine/intr.h>
#include <machine/machdep.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
index 39b16e34c5c8..7a11b660a4ee 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/rman.h>
-#include <dev/fdt/fdt_common.h>
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 14:43:36 +0000