31c31
< __FBSDID("$FreeBSD: stable/10/sys/arm/samsung/exynos/exynos5_machdep.c 259365 2013-12-14 00:16:08Z ian $");
---
> __FBSDID("$FreeBSD: stable/10/sys/arm/samsung/exynos/exynos5_machdep.c 266275 2014-05-16 23:49:40Z ian $");
33c33
< #define _ARM32_BUS_DMA_PRIVATE
---
> #define _ARM32_BUS_DMA_PRIVATE
39d38
< #include <vm/pmap.h>
40a40
> #include <machine/armreg.h>
47,48d46
< #define DEVMAP_BOOTSTRAP_MAP_START 0xF0000000
<
53c51
< return (DEVMAP_BOOTSTRAP_MAP_START);
---
> return (arm_devmap_lastaddr());
64a63
>
69a69
>
72,79d71
< #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.
< */
83d74
< int i;
85,91c76,77
< 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);
93d78
< arm_devmap_register_table(&fdt_devmap[0]);
< __FBSDID("$FreeBSD: stable/10/sys/arm/samsung/exynos/exynos5_machdep.c 259365 2013-12-14 00:16:08Z ian $");
---
> __FBSDID("$FreeBSD: stable/10/sys/arm/samsung/exynos/exynos5_machdep.c 266275 2014-05-16 23:49:40Z ian $");
33c33
< #define _ARM32_BUS_DMA_PRIVATE
---
> #define _ARM32_BUS_DMA_PRIVATE
39d38
< #include <vm/pmap.h>
40a40
> #include <machine/armreg.h>
47,48d46
< #define DEVMAP_BOOTSTRAP_MAP_START 0xF0000000
<
53c51
< return (DEVMAP_BOOTSTRAP_MAP_START);
---
> return (arm_devmap_lastaddr());
64a63
>
69a69
>
72,79d71
< #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.
< */
83d74
< int i;
85,91c76,77
< 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);
93d78
< arm_devmap_register_table(&fdt_devmap[0]);