o Use common ARMv6/v7 bus_space tag.

o Use new helper routines for arm static device mapping.
o style(9) tweaks.

1 files changed, 7 insertions, 22 deletions

diff --git a/sys/arm/samsung/exynos/exynos5_machdep.c b/sys/arm/samsung/exynos/exynos5_machdep.c
index 742d63d..c10ccab 100644
--- a/sys/arm/samsung/exynos/exynos5_machdep.c
+++ b/sys/arm/samsung/exynos/exynos5_machdep.c
@@ -30,27 +30,25 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#define _ARM32_BUS_DMA_PRIVATE
+#define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 
 #include <vm/vm.h>
-#include <vm/pmap.h>
 
+#include <machine/armreg.h>
 #include <machine/bus.h>
 #include <machine/devmap.h>
 #include <machine/machdep.h>
 
 #include <dev/fdt/fdt_common.h>
 
-#define	DEVMAP_BOOTSTRAP_MAP_START 0xF0000000
-
 vm_offset_t
 initarm_lastaddr(void)
 {
 
-	return (DEVMAP_BOOTSTRAP_MAP_START);
+	return (arm_devmap_lastaddr());
 }
 
 void
@@ -62,35 +60,22 @@ initarm_early_init(void)
 void
 initarm_gpio_init(void)
 {
+
 }
 
 void
 initarm_late_init(void)
 {
-}
 
-#define FDT_DEVMAP_MAX	(1 + 2 + 1 + 1)	/* FIXME */
-static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
-	{ 0, 0, 0, 0, 0, }
-};
+}
 
-/*
- * Construct pmap_devmap[] with DT-derived config data.
- */
 int
 initarm_devmap_init(void)
 {
-	int i;
 
-	i = 0;
-	fdt_devmap[i].pd_va = 0xf2C00000;
-	fdt_devmap[i].pd_pa = 0x12C00000;
-	fdt_devmap[i].pd_size = 0x100000;
-	fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
-	fdt_devmap[i].pd_cache = PTE_NOCACHE;
-	i++;
+	/* UART */
+	arm_devmap_add_entry(0x12C00000, 0x100000);
 
-	arm_devmap_register_table(&fdt_devmap[0]);
 	return (0);
 }