Module Name: src
Committed By: skrll
Date: Sun Aug 5 14:02:36 UTC 2018
Modified Files:
src/sys/arch/arm/arm32: arm32_machdep.c
src/sys/arch/arm/broadcom: bcm283x_platform.c
src/sys/arch/arm/fdt: arm_fdt.c arm_fdtvar.h
src/sys/arch/arm/nvidia: tegra_platform.c
src/sys/arch/arm/rockchip: rk_platform.c
src/sys/arch/arm/samsung: exynos_platform.c
src/sys/arch/arm/sunxi: sunxi_platform.c
src/sys/arch/arm/ti: ti_platform.c
src/sys/arch/arm/vexpress: vexpress_platform.c
src/sys/arch/arm/virt: virt_platform.c
src/sys/arch/evbarm/fdt: fdt_machdep.c
Log Message:
Add prefixes to struct arm_platform{,_info} members.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/fdt/arm_fdt.c \
src/sys/arch/arm/fdt/arm_fdtvar.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/nvidia/tegra_platform.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rk_platform.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/samsung/exynos_platform.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/sunxi/sunxi_platform.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_platform.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/vexpress/vexpress_platform.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/virt/virt_platform.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/fdt/fdt_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.117 src/sys/arch/arm/arm32/arm32_machdep.c:1.118
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.117 Sun Aug 5 06:48:50 2018
+++ src/sys/arch/arm/arm32/arm32_machdep.c Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.117 2018/08/05 06:48:50 skrll Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.118 2018/08/05 14:02:35 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.117 2018/08/05 06:48:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.118 2018/08/05 14:02:35 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_fdt.h"
@@ -815,7 +815,7 @@ cpu_kernel_vm_init(paddr_t memory_start,
arm32_bootmem_init(memory_start, memory_size, KERNEL_BASE_PHYS);
arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0,
- plat->devmap(), mapallmem_p);
+ plat->ap_devmap(), mapallmem_p);
}
#endif
Index: src/sys/arch/arm/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.10 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.11
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.10 Fri Aug 3 15:46:41 2018
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.10 2018/08/03 15:46:41 skrll Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.11 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.10 2018/08/03 15:46:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.11 2018/08/05 14:02:35 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -1415,14 +1415,14 @@ bcm283x_platform_uart_freq(void)
#if defined(SOC_BCM2835)
static const struct arm_platform bcm2835_platform = {
- .devmap = bcm2835_platform_devmap,
- .bootstrap = bcm2835_platform_bootstrap,
- .init_attach_args = bcm2835_platform_init_attach_args,
- .early_putchar = bcm2835_platform_early_putchar,
- .device_register = bcm283x_platform_device_register,
- .reset = bcm2835_system_reset,
- .delay = bcm2835_tmr_delay,
- .uart_freq = bcm283x_platform_uart_freq,
+ .ap_devmap = bcm2835_platform_devmap,
+ .ap_bootstrap = bcm2835_platform_bootstrap,
+ .ap_init_attach_args = bcm2835_platform_init_attach_args,
+ .ap_early_putchar = bcm2835_platform_early_putchar,
+ .ap_device_register = bcm283x_platform_device_register,
+ .ap_reset = bcm2835_system_reset,
+ .ap_delay = bcm2835_tmr_delay,
+ .ap_uart_freq = bcm283x_platform_uart_freq,
};
ARM_PLATFORM(bcm2835, "brcm,bcm2835", &bcm2835_platform);
@@ -1437,25 +1437,25 @@ bcm2837_platform_uart_freq(void)
}
static const struct arm_platform bcm2836_platform = {
- .devmap = bcm2836_platform_devmap,
- .bootstrap = bcm2836_platform_bootstrap,
- .init_attach_args = bcm2836_platform_init_attach_args,
- .early_putchar = bcm2836_platform_early_putchar,
- .device_register = bcm283x_platform_device_register,
- .reset = bcm2835_system_reset,
- .delay = gtmr_delay,
- .uart_freq = bcm283x_platform_uart_freq,
+ .ap_devmap = bcm2836_platform_devmap,
+ .ap_bootstrap = bcm2836_platform_bootstrap,
+ .ap_init_attach_args = bcm2836_platform_init_attach_args,
+ .ap_early_putchar = bcm2836_platform_early_putchar,
+ .ap_device_register = bcm283x_platform_device_register,
+ .ap_reset = bcm2835_system_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = bcm283x_platform_uart_freq,
};
static const struct arm_platform bcm2837_platform = {
- .devmap = bcm2836_platform_devmap,
- .bootstrap = bcm2836_platform_bootstrap,
- .init_attach_args = bcm2836_platform_init_attach_args,
- .early_putchar = bcm2837_platform_early_putchar,
- .device_register = bcm283x_platform_device_register,
- .reset = bcm2835_system_reset,
- .delay = gtmr_delay,
- .uart_freq = bcm2837_platform_uart_freq,
+ .ap_devmap = bcm2836_platform_devmap,
+ .ap_bootstrap = bcm2836_platform_bootstrap,
+ .ap_init_attach_args = bcm2836_platform_init_attach_args,
+ .ap_early_putchar = bcm2837_platform_early_putchar,
+ .ap_device_register = bcm283x_platform_device_register,
+ .ap_reset = bcm2835_system_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = bcm2837_platform_uart_freq,
};
ARM_PLATFORM(bcm2836, "brcm,bcm2836", &bcm2836_platform);
Index: src/sys/arch/arm/fdt/arm_fdt.c
diff -u src/sys/arch/arm/fdt/arm_fdt.c:1.7 src/sys/arch/arm/fdt/arm_fdt.c:1.8
--- src/sys/arch/arm/fdt/arm_fdt.c:1.7 Sun Dec 10 21:38:26 2017
+++ src/sys/arch/arm/fdt/arm_fdt.c Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_fdt.c,v 1.7 2017/12/10 21:38:26 skrll Exp $ */
+/* $NetBSD: arm_fdt.c,v 1.8 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_arm_timer.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.7 2017/12/10 21:38:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.8 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -79,7 +79,7 @@ arm_fdt_attach(device_t parent, device_t
aprint_naive("\n");
aprint_normal("\n");
- plat->init_attach_args(&faa);
+ plat->ap_init_attach_args(&faa);
faa.faa_name = "";
faa.faa_phandle = OF_peer(0);
@@ -99,7 +99,7 @@ arm_fdt_platform(void)
int match, best_match = 0;
__link_set_foreach(info, arm_platforms) {
- const char * const compat[] = { (*info)->compat, NULL };
+ const char * const compat[] = { (*info)->api_compat, NULL };
match = of_match_compatible(phandle, compat);
if (match > best_match) {
best_match = match;
@@ -110,7 +110,7 @@ arm_fdt_platform(void)
booted_platform = best_info;
}
- return booted_platform == NULL ? NULL : booted_platform->ops;
+ return booted_platform == NULL ? NULL : booted_platform->api_ops;
}
void
@@ -166,7 +166,7 @@ arm_fdt_memory_dump(paddr_t pa)
bus_space_tag_t bst;
bus_space_handle_t bsh;
- plat->init_attach_args(&faa);
+ plat->ap_init_attach_args(&faa);
bst = faa.faa_bst;
bus_space_map(bst, pa, 0x100, 0, &bsh);
Index: src/sys/arch/arm/fdt/arm_fdtvar.h
diff -u src/sys/arch/arm/fdt/arm_fdtvar.h:1.7 src/sys/arch/arm/fdt/arm_fdtvar.h:1.8
--- src/sys/arch/arm/fdt/arm_fdtvar.h:1.7 Thu Aug 24 13:06:23 2017
+++ src/sys/arch/arm/fdt/arm_fdtvar.h Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_fdtvar.h,v 1.7 2017/08/24 13:06:23 jmcneill Exp $ */
+/* $NetBSD: arm_fdtvar.h,v 1.8 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -36,19 +36,19 @@
struct fdt_attach_args;
struct arm_platform {
- const struct pmap_devmap * (*devmap)(void);
- void (*bootstrap)(void);
- void (*init_attach_args)(struct fdt_attach_args *);
- void (*early_putchar)(char);
- void (*device_register)(device_t, void *);
- void (*reset)(void);
- void (*delay)(u_int);
- u_int (*uart_freq)(void);
+ const struct pmap_devmap * (*ap_devmap)(void);
+ void (*ap_bootstrap)(void);
+ void (*ap_init_attach_args)(struct fdt_attach_args *);
+ void (*ap_early_putchar)(char);
+ void (*ap_device_register)(device_t, void *);
+ void (*ap_reset)(void);
+ void (*ap_delay)(u_int);
+ u_int (*ap_uart_freq)(void);
};
struct arm_platform_info {
- const char * compat;
- const struct arm_platform * ops;
+ const char * api_compat;
+ const struct arm_platform * api_ops;
};
#define _ARM_PLATFORM_REGISTER(name) \
@@ -56,8 +56,8 @@ struct arm_platform_info {
#define ARM_PLATFORM(_name, _compat, _ops) \
static const struct arm_platform_info __CONCAT(_name,_platinfo) = { \
- .compat = (_compat), \
- .ops = (_ops) \
+ .api_compat = (_compat), \
+ .api_ops = (_ops) \
}; \
_ARM_PLATFORM_REGISTER(_name)
Index: src/sys/arch/arm/nvidia/tegra_platform.c
diff -u src/sys/arch/arm/nvidia/tegra_platform.c:1.13 src/sys/arch/arm/nvidia/tegra_platform.c:1.14
--- src/sys/arch/arm/nvidia/tegra_platform.c:1.13 Sun Jul 8 11:37:50 2018
+++ src/sys/arch/arm/nvidia/tegra_platform.c Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_platform.c,v 1.13 2018/07/08 11:37:50 jmcneill Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.14 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -33,7 +33,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.13 2018/07/08 11:37:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.14 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -213,14 +213,14 @@ tegra_platform_uart_freq(void)
#ifdef SOC_TEGRA124
static const struct arm_platform tegra124_platform = {
- .devmap = tegra_platform_devmap,
- .bootstrap = tegra124_platform_bootstrap,
- .init_attach_args = tegra_platform_init_attach_args,
- .early_putchar = tegra_platform_early_putchar,
- .device_register = tegra_platform_device_register,
- .reset = tegra_platform_reset,
- .delay = tegra_platform_delay,
- .uart_freq = tegra_platform_uart_freq,
+ .ap_devmap = tegra_platform_devmap,
+ .ap_bootstrap = tegra124_platform_bootstrap,
+ .ap_init_attach_args = tegra_platform_init_attach_args,
+ .ap_early_putchar = tegra_platform_early_putchar,
+ .ap_device_register = tegra_platform_device_register,
+ .ap_reset = tegra_platform_reset,
+ .ap_delay = tegra_platform_delay,
+ .ap_uart_freq = tegra_platform_uart_freq,
};
ARM_PLATFORM(tegra124, "nvidia,tegra124", &tegra124_platform);
@@ -228,14 +228,14 @@ ARM_PLATFORM(tegra124, "nvidia,tegra124"
#ifdef SOC_TEGRA210
static const struct arm_platform tegra210_platform = {
- .devmap = tegra_platform_devmap,
- .bootstrap = tegra210_platform_bootstrap,
- .init_attach_args = tegra_platform_init_attach_args,
- .early_putchar = tegra_platform_early_putchar,
- .device_register = tegra_platform_device_register,
- .reset = tegra_platform_reset,
- .delay = tegra_platform_delay,
- .uart_freq = tegra_platform_uart_freq,
+ .ap_devmap = tegra_platform_devmap,
+ .ap_bootstrap = tegra210_platform_bootstrap,
+ .ap_init_attach_args = tegra_platform_init_attach_args,
+ .ap_early_putchar = tegra_platform_early_putchar,
+ .ap_device_register = tegra_platform_device_register,
+ .ap_reset = tegra_platform_reset,
+ .ap_delay = tegra_platform_delay,
+ .ap_uart_freq = tegra_platform_uart_freq,
};
ARM_PLATFORM(tegra210, "nvidia,tegra210", &tegra210_platform);
Index: src/sys/arch/arm/rockchip/rk_platform.c
diff -u src/sys/arch/arm/rockchip/rk_platform.c:1.1 src/sys/arch/arm/rockchip/rk_platform.c:1.2
--- src/sys/arch/arm/rockchip/rk_platform.c:1.1 Sat Jun 16 00:19:04 2018
+++ src/sys/arch/arm/rockchip/rk_platform.c Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_platform.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $ */
+/* $NetBSD: rk_platform.c,v 1.2 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.2 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -145,14 +145,14 @@ rk3328_platform_uart_freq(void)
}
static const struct arm_platform rk3328_platform = {
- .devmap = rk3328_platform_devmap,
- .bootstrap = rk_platform_bootstrap,
- .init_attach_args = rk_platform_init_attach_args,
- .early_putchar = rk3328_platform_early_putchar,
- .device_register = rk_platform_device_register,
- .reset = psci_fdt_reset,
- .delay = gtmr_delay,
- .uart_freq = rk3328_platform_uart_freq,
+ .ap_devmap = rk3328_platform_devmap,
+ .ap_bootstrap = rk_platform_bootstrap,
+ .ap_init_attach_args = rk_platform_init_attach_args,
+ .ap_early_putchar = rk3328_platform_early_putchar,
+ .ap_device_register = rk_platform_device_register,
+ .ap_reset = psci_fdt_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = rk3328_platform_uart_freq,
};
ARM_PLATFORM(rk3328, "rockchip,rk3328", &rk3328_platform);
Index: src/sys/arch/arm/samsung/exynos_platform.c
diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.11 src/sys/arch/arm/samsung/exynos_platform.c:1.12
--- src/sys/arch/arm/samsung/exynos_platform.c:1.11 Tue Jul 31 06:46:25 2018
+++ src/sys/arch/arm/samsung/exynos_platform.c Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.11 2018/07/31 06:46:25 skrll Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.12 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <jmcne...@invisible.ca>
@@ -34,7 +34,7 @@
#include "ukbd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.11 2018/07/31 06:46:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.12 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -130,14 +130,14 @@ exynos_platform_uart_freq(void)
}
static const struct arm_platform exynos5_platform = {
- .devmap = exynos_platform_devmap,
- .bootstrap = exynos_platform_bootstrap,
- .init_attach_args = exynos_platform_init_attach_args,
- .early_putchar = exynos_platform_early_putchar,
- .device_register = exynos_platform_device_register,
- .reset = exynos5_platform_reset,
- .delay = mct_delay,
- .uart_freq = exynos_platform_uart_freq,
+ .ap_devmap = exynos_platform_devmap,
+ .ap_bootstrap = exynos_platform_bootstrap,
+ .ap_init_attach_args = exynos_platform_init_attach_args,
+ .ap_early_putchar = exynos_platform_early_putchar,
+ .ap_device_register = exynos_platform_device_register,
+ .ap_reset = exynos5_platform_reset,
+ .ap_delay = mct_delay,
+ .ap_uart_freq = exynos_platform_uart_freq,
};
ARM_PLATFORM(exynos5, "samsung,exynos5", &exynos5_platform);
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.24 src/sys/arch/arm/sunxi/sunxi_platform.c:1.25
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.24 Mon Jul 9 09:11:21 2018
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.24 2018/07/09 09:11:21 jmcneill Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.25 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.24 2018/07/09 09:11:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.25 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -290,67 +290,67 @@ sun50i_h6_platform_reset(void)
}
static const struct arm_platform sun4i_platform = {
- .devmap = sunxi_platform_devmap,
- .bootstrap = sunxi_platform_bootstrap,
- .init_attach_args = sunxi_platform_init_attach_args,
- .early_putchar = sunxi_platform_early_putchar,
- .device_register = sunxi_platform_device_register,
- .reset = sun4i_platform_reset,
- .delay = sun4i_platform_delay,
- .uart_freq = sunxi_platform_uart_freq,
+ .ap_devmap = sunxi_platform_devmap,
+ .ap_bootstrap = sunxi_platform_bootstrap,
+ .ap_init_attach_args = sunxi_platform_init_attach_args,
+ .ap_early_putchar = sunxi_platform_early_putchar,
+ .ap_device_register = sunxi_platform_device_register,
+ .ap_reset = sun4i_platform_reset,
+ .ap_delay = sun4i_platform_delay,
+ .ap_uart_freq = sunxi_platform_uart_freq,
};
ARM_PLATFORM(sun4i_a10, "allwinner,sun4i-a10", &sun4i_platform);
static const struct arm_platform sun5i_platform = {
- .devmap = sunxi_platform_devmap,
- .bootstrap = sunxi_platform_bootstrap,
- .init_attach_args = sunxi_platform_init_attach_args,
- .early_putchar = sunxi_platform_early_putchar,
- .device_register = sunxi_platform_device_register,
- .reset = sun4i_platform_reset,
- .delay = sun4i_platform_delay,
- .uart_freq = sunxi_platform_uart_freq,
+ .ap_devmap = sunxi_platform_devmap,
+ .ap_bootstrap = sunxi_platform_bootstrap,
+ .ap_init_attach_args = sunxi_platform_init_attach_args,
+ .ap_early_putchar = sunxi_platform_early_putchar,
+ .ap_device_register = sunxi_platform_device_register,
+ .ap_reset = sun4i_platform_reset,
+ .ap_delay = sun4i_platform_delay,
+ .ap_uart_freq = sunxi_platform_uart_freq,
};
ARM_PLATFORM(sun5i_a13, "allwinner,sun5i-a13", &sun5i_platform);
ARM_PLATFORM(sun5i_gr8, "nextthing,gr8", &sun5i_platform);
static const struct arm_platform sun6i_platform = {
- .devmap = sunxi_platform_devmap,
- .bootstrap = sunxi_platform_psci_bootstrap,
- .init_attach_args = sunxi_platform_init_attach_args,
- .early_putchar = sunxi_platform_early_putchar,
- .device_register = sunxi_platform_device_register,
- .reset = sun6i_platform_reset,
- .delay = gtmr_delay,
- .uart_freq = sunxi_platform_uart_freq,
+ .ap_devmap = sunxi_platform_devmap,
+ .ap_bootstrap = sunxi_platform_psci_bootstrap,
+ .ap_init_attach_args = sunxi_platform_init_attach_args,
+ .ap_early_putchar = sunxi_platform_early_putchar,
+ .ap_device_register = sunxi_platform_device_register,
+ .ap_reset = sun6i_platform_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = sunxi_platform_uart_freq,
};
ARM_PLATFORM(sun6i_a31, "allwinner,sun6i-a31", &sun6i_platform);
static const struct arm_platform sun7i_platform = {
- .devmap = sunxi_platform_devmap,
- .bootstrap = sunxi_platform_psci_bootstrap,
- .init_attach_args = sunxi_platform_init_attach_args,
- .early_putchar = sunxi_platform_early_putchar,
- .device_register = sunxi_platform_device_register,
- .reset = sun4i_platform_reset,
- .delay = sun4i_platform_delay,
- .uart_freq = sunxi_platform_uart_freq,
+ .ap_devmap = sunxi_platform_devmap,
+ .ap_bootstrap = sunxi_platform_psci_bootstrap,
+ .ap_init_attach_args = sunxi_platform_init_attach_args,
+ .ap_early_putchar = sunxi_platform_early_putchar,
+ .ap_device_register = sunxi_platform_device_register,
+ .ap_reset = sun4i_platform_reset,
+ .ap_delay = sun4i_platform_delay,
+ .ap_uart_freq = sunxi_platform_uart_freq,
};
ARM_PLATFORM(sun7i_a20, "allwinner,sun7i-a20", &sun7i_platform);
static const struct arm_platform sun8i_platform = {
- .devmap = sunxi_platform_devmap,
- .bootstrap = sunxi_platform_psci_bootstrap,
- .init_attach_args = sunxi_platform_init_attach_args,
- .early_putchar = sunxi_platform_early_putchar,
- .device_register = sunxi_platform_device_register,
- .reset = sun6i_platform_reset,
- .delay = gtmr_delay,
- .uart_freq = sunxi_platform_uart_freq,
+ .ap_devmap = sunxi_platform_devmap,
+ .ap_bootstrap = sunxi_platform_psci_bootstrap,
+ .ap_init_attach_args = sunxi_platform_init_attach_args,
+ .ap_early_putchar = sunxi_platform_early_putchar,
+ .ap_device_register = sunxi_platform_device_register,
+ .ap_reset = sun6i_platform_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = sunxi_platform_uart_freq,
};
ARM_PLATFORM(sun8i_h2plus, "allwinner,sun8i-h2-plus", &sun8i_platform);
@@ -358,41 +358,41 @@ ARM_PLATFORM(sun8i_h3, "allwinner,sun8i-
ARM_PLATFORM(sun8i_a83t, "allwinner,sun8i-a83t", &sun8i_platform);
static const struct arm_platform sun9i_platform = {
- .devmap = sunxi_platform_devmap,
- .bootstrap = sunxi_platform_bootstrap,
- .init_attach_args = sunxi_platform_init_attach_args,
- .early_putchar = sunxi_platform_early_putchar,
- .device_register = sunxi_platform_device_register,
- .reset = sun9i_platform_reset,
- .delay = gtmr_delay,
- .uart_freq = sunxi_platform_uart_freq,
+ .ap_devmap = sunxi_platform_devmap,
+ .ap_bootstrap = sunxi_platform_bootstrap,
+ .ap_init_attach_args = sunxi_platform_init_attach_args,
+ .ap_early_putchar = sunxi_platform_early_putchar,
+ .ap_device_register = sunxi_platform_device_register,
+ .ap_reset = sun9i_platform_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = sunxi_platform_uart_freq,
};
ARM_PLATFORM(sun9i_a80, "allwinner,sun9i-a80", &sun9i_platform);
static const struct arm_platform sun50i_platform = {
- .devmap = sunxi_platform_devmap,
- .bootstrap = sunxi_platform_psci_bootstrap,
- .init_attach_args = sunxi_platform_init_attach_args,
- .early_putchar = sunxi_platform_early_putchar,
- .device_register = sunxi_platform_device_register,
- .reset = sun6i_platform_reset,
- .delay = gtmr_delay,
- .uart_freq = sunxi_platform_uart_freq,
+ .ap_devmap = sunxi_platform_devmap,
+ .ap_bootstrap = sunxi_platform_psci_bootstrap,
+ .ap_init_attach_args = sunxi_platform_init_attach_args,
+ .ap_early_putchar = sunxi_platform_early_putchar,
+ .ap_device_register = sunxi_platform_device_register,
+ .ap_reset = sun6i_platform_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = sunxi_platform_uart_freq,
};
ARM_PLATFORM(sun50i_a64, "allwinner,sun50i-a64", &sun50i_platform);
ARM_PLATFORM(sun50i_h5, "allwinner,sun50i-h5", &sun50i_platform);
static const struct arm_platform sun50i_h6_platform = {
- .devmap = sunxi_platform_devmap,
- .bootstrap = sunxi_platform_psci_bootstrap,
- .init_attach_args = sunxi_platform_init_attach_args,
- .early_putchar = sunxi_platform_early_putchar,
- .device_register = sunxi_platform_device_register,
- .reset = sun50i_h6_platform_reset,
- .delay = gtmr_delay,
- .uart_freq = sunxi_platform_uart_freq,
+ .ap_devmap = sunxi_platform_devmap,
+ .ap_bootstrap = sunxi_platform_psci_bootstrap,
+ .ap_init_attach_args = sunxi_platform_init_attach_args,
+ .ap_early_putchar = sunxi_platform_early_putchar,
+ .ap_device_register = sunxi_platform_device_register,
+ .ap_reset = sun50i_h6_platform_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = sunxi_platform_uart_freq,
};
ARM_PLATFORM(sun50i_h6, "allwinner,sun50i-h6", &sun50i_h6_platform);
Index: src/sys/arch/arm/ti/ti_platform.c
diff -u src/sys/arch/arm/ti/ti_platform.c:1.3 src/sys/arch/arm/ti/ti_platform.c:1.4
--- src/sys/arch/arm/ti/ti_platform.c:1.3 Sat Mar 17 18:34:09 2018
+++ src/sys/arch/arm/ti/ti_platform.c Sun Aug 5 14:02:35 2018
@@ -1,9 +1,9 @@
-/* $NetBSD: ti_platform.c,v 1.3 2018/03/17 18:34:09 ryo Exp $ */
+/* $NetBSD: ti_platform.c,v 1.4 2018/08/05 14:02:35 skrll Exp $ */
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.3 2018/03/17 18:34:09 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_platform.c,v 1.4 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
@@ -124,12 +124,12 @@ am33xx_platform_delay(u_int n)
}
static const struct arm_platform am33xx_platform = {
- .devmap = am33xx_platform_devmap,
- .init_attach_args = am33xx_platform_init_attach_args,
- .early_putchar = am33xx_platform_early_putchar,
- .bootstrap = am33xx_platform_bootstrap,
- .uart_freq = am33xx_platform_uart_freq,
- .delay = am33xx_platform_delay,
+ .ap_devmap = am33xx_platform_devmap,
+ .ap_init_attach_args = am33xx_platform_init_attach_args,
+ .ap_early_putchar = am33xx_platform_early_putchar,
+ .ap_bootstrap = am33xx_platform_bootstrap,
+ .ap_uart_freq = am33xx_platform_uart_freq,
+ .ap_delay = am33xx_platform_delay,
};
void dummysetstatclockrate(int);
Index: src/sys/arch/arm/vexpress/vexpress_platform.c
diff -u src/sys/arch/arm/vexpress/vexpress_platform.c:1.8 src/sys/arch/arm/vexpress/vexpress_platform.c:1.9
--- src/sys/arch/arm/vexpress/vexpress_platform.c:1.8 Mon Jun 11 19:49:18 2018
+++ src/sys/arch/arm/vexpress/vexpress_platform.c Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_platform.c,v 1.8 2018/06/11 19:49:18 jakllsch Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.9 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.8 2018/06/11 19:49:18 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.9 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -219,14 +219,14 @@ vexpress_platform_uart_freq(void)
}
static const struct arm_platform vexpress_platform = {
- .devmap = vexpress_platform_devmap,
- .bootstrap = vexpress_platform_bootstrap,
- .init_attach_args = vexpress_platform_init_attach_args,
- .early_putchar = vexpress_platform_early_putchar,
- .device_register = vexpress_platform_device_register,
- .reset = vexpress_platform_reset,
- .delay = gtmr_delay,
- .uart_freq = vexpress_platform_uart_freq,
+ .ap_devmap = vexpress_platform_devmap,
+ .ap_bootstrap = vexpress_platform_bootstrap,
+ .ap_init_attach_args = vexpress_platform_init_attach_args,
+ .ap_early_putchar = vexpress_platform_early_putchar,
+ .ap_device_register = vexpress_platform_device_register,
+ .ap_reset = vexpress_platform_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = vexpress_platform_uart_freq,
};
ARM_PLATFORM(vexpress, "arm,vexpress", &vexpress_platform);
Index: src/sys/arch/arm/virt/virt_platform.c
diff -u src/sys/arch/arm/virt/virt_platform.c:1.4 src/sys/arch/arm/virt/virt_platform.c:1.5
--- src/sys/arch/arm/virt/virt_platform.c:1.4 Sat Jun 16 10:42:41 2018
+++ src/sys/arch/arm/virt/virt_platform.c Sun Aug 5 14:02:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virt_platform.c,v 1.4 2018/06/16 10:42:41 jmcneill Exp $ */
+/* $NetBSD: virt_platform.c,v 1.5 2018/08/05 14:02:35 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.4 2018/06/16 10:42:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virt_platform.c,v 1.5 2018/08/05 14:02:35 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -119,14 +119,14 @@ virt_platform_uart_freq(void)
}
static const struct arm_platform virt_platform = {
- .devmap = virt_platform_devmap,
- .bootstrap = psci_fdt_bootstrap,
- .init_attach_args = virt_platform_init_attach_args,
- .early_putchar = virt_platform_early_putchar,
- .device_register = virt_platform_device_register,
- .reset = psci_fdt_reset,
- .delay = gtmr_delay,
- .uart_freq = virt_platform_uart_freq,
+ .ap_devmap = virt_platform_devmap,
+ .ap_bootstrap = psci_fdt_bootstrap,
+ .ap_init_attach_args = virt_platform_init_attach_args,
+ .ap_early_putchar = virt_platform_early_putchar,
+ .ap_device_register = virt_platform_device_register,
+ .ap_reset = psci_fdt_reset,
+ .ap_delay = gtmr_delay,
+ .ap_uart_freq = virt_platform_uart_freq,
};
ARM_PLATFORM(virt, "linux,dummy-virt", &virt_platform);
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.31 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.32
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.31 Sun Aug 5 06:48:50 2018
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Sun Aug 5 14:02:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.31 2018/08/05 06:48:50 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.32 2018/08/05 14:02:36 skrll Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.31 2018/08/05 06:48:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.32 2018/08/05 14:02:36 skrll Exp $");
#include "opt_machdep.h"
#include "opt_bootconfig.h"
@@ -126,8 +126,8 @@ static void
fdt_putchar(char c)
{
const struct arm_platform *plat = arm_fdt_platform();
- if (plat && plat->early_putchar) {
- plat->early_putchar(c);
+ if (plat && plat->ap_early_putchar) {
+ plat->ap_early_putchar(c);
}
#ifdef EARLYCONS
else {
@@ -381,9 +381,9 @@ initarm(void *arg)
boot_args = bootargs;
VPRINTF("devmap\n");
- pmap_devmap_register(plat->devmap());
+ pmap_devmap_register(plat->ap_devmap());
#ifdef __aarch64__
- pmap_devmap_bootstrap(plat->devmap());
+ pmap_devmap_bootstrap(plat->ap_devmap());
#endif
/* Heads up ... Setup the CPU / MMU / TLB functions. */
@@ -392,7 +392,7 @@ initarm(void *arg)
panic("cpu not recognized!");
VPRINTF("bootstrap\n");
- plat->bootstrap();
+ plat->ap_bootstrap();
/*
* If stdout-path is specified on the command line, override the
@@ -514,11 +514,11 @@ consinit(void)
if (initialized || cons == NULL)
return;
- plat->init_attach_args(&faa);
+ plat->ap_init_attach_args(&faa);
faa.faa_phandle = fdtbus_get_stdout_phandle();
- if (plat->uart_freq != NULL)
- uart_freq = plat->uart_freq();
+ if (plat->ap_uart_freq != NULL)
+ uart_freq = plat->ap_uart_freq();
cons->consinit(&faa, uart_freq);
@@ -534,7 +534,7 @@ delay(u_int us)
{
const struct arm_platform *plat = arm_fdt_platform();
- plat->delay(us);
+ plat->ap_delay(us);
}
static void
@@ -545,8 +545,8 @@ fdt_device_register(device_t self, void
if (device_is_a(self, "armfdt"))
fdt_setup_initrd();
- if (plat && plat->device_register)
- plat->device_register(self, aux);
+ if (plat && plat->ap_device_register)
+ plat->ap_device_register(self, aux);
}
static void
@@ -556,8 +556,8 @@ fdt_reset(void)
fdtbus_power_reset();
- if (plat && plat->reset)
- plat->reset();
+ if (plat && plat->ap_reset)
+ plat->ap_reset();
}
static void
