Module Name: src
Committed By: skrll
Date: Fri Feb 5 08:07:14 UTC 2021
Modified Files:
src/sys/arch/arm/amlogic: meson_platform.c
src/sys/arch/arm/nxp: imx6_platform.c
src/sys/arch/arm/ti: omap3_platform.c
src/sys/arch/arm/vexpress: vexpress_platform.c
Log Message:
Fix build
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/amlogic/meson_platform.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nxp/imx6_platform.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ti/omap3_platform.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/vexpress/vexpress_platform.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/amlogic/meson_platform.c
diff -u src/sys/arch/arm/amlogic/meson_platform.c:1.18 src/sys/arch/arm/amlogic/meson_platform.c:1.19
--- src/sys/arch/arm/amlogic/meson_platform.c:1.18 Thu Feb 4 22:36:53 2021
+++ src/sys/arch/arm/amlogic/meson_platform.c Fri Feb 5 08:07:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_platform.c,v 1.18 2021/02/04 22:36:53 thorpej Exp $ */
+/* $NetBSD: meson_platform.c,v 1.19 2021/02/05 08:07:14 skrll Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -33,7 +33,7 @@
#include "arml2cc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.18 2021/02/04 22:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.19 2021/02/05 08:07:14 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -234,7 +234,7 @@ meson8b_platform_device_register(device_
device_t parent = device_parent(self);
char *ptr;
- fdtbus_device_register(dev, aux);
+ fdtbus_device_register(self, aux);
if (device_is_a(self, "ld") &&
device_is_a(parent, "sdmmc") &&
Index: src/sys/arch/arm/nxp/imx6_platform.c
diff -u src/sys/arch/arm/nxp/imx6_platform.c:1.4 src/sys/arch/arm/nxp/imx6_platform.c:1.5
--- src/sys/arch/arm/nxp/imx6_platform.c:1.4 Thu Feb 4 22:36:53 2021
+++ src/sys/arch/arm/nxp/imx6_platform.c Fri Feb 5 08:07:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_platform.c,v 1.4 2021/02/04 22:36:53 thorpej Exp $ */
+/* $NetBSD: imx6_platform.c,v 1.5 2021/02/05 08:07:14 skrll Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.4 2021/02/04 22:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.5 2021/02/05 08:07:14 skrll Exp $");
#include "arml2cc.h"
#include "opt_console.h"
@@ -119,7 +119,7 @@ imx_platform_device_register(device_t se
{
prop_dictionary_t prop = device_properties(self);
- fdtbus_device_register(dev, aux);
+ fdtbus_device_register(self, aux);
if (device_is_a(self, "atphy")) {
static const struct device_compatible_entry compat_data[] = {
Index: src/sys/arch/arm/ti/omap3_platform.c
diff -u src/sys/arch/arm/ti/omap3_platform.c:1.5 src/sys/arch/arm/ti/omap3_platform.c:1.6
--- src/sys/arch/arm/ti/omap3_platform.c:1.5 Thu Feb 4 22:36:53 2021
+++ src/sys/arch/arm/ti/omap3_platform.c Fri Feb 5 08:07:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_platform.c,v 1.5 2021/02/04 22:36:53 thorpej Exp $ */
+/* $NetBSD: omap3_platform.c,v 1.6 2021/02/05 08:07:14 skrll Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -30,7 +30,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.5 2021/02/04 22:36:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.6 2021/02/05 08:07:14 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -146,7 +146,7 @@ omap3_platform_early_putchar(char c)
static void
omap3_platform_device_register(device_t self, void *aux)
{
- fdtbus_device_register(dev, aux);
+ fdtbus_device_register(self, aux);
}
static u_int
Index: src/sys/arch/arm/vexpress/vexpress_platform.c
diff -u src/sys/arch/arm/vexpress/vexpress_platform.c:1.20 src/sys/arch/arm/vexpress/vexpress_platform.c:1.21
--- src/sys/arch/arm/vexpress/vexpress_platform.c:1.20 Thu Feb 4 22:36:54 2021
+++ src/sys/arch/arm/vexpress/vexpress_platform.c Fri Feb 5 08:07:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: vexpress_platform.c,v 1.20 2021/02/04 22:36:54 thorpej Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.21 2021/02/05 08:07:14 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -30,7 +30,7 @@
#include "opt_console.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.20 2021/02/04 22:36:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.21 2021/02/05 08:07:14 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -195,7 +195,7 @@ vexpress_platform_init_attach_args(struc
static void
vexpress_platform_device_register(device_t self, void *aux)
{
- fdtbus_device_register(dev, aux);
+ fdtbus_device_register(self, aux);
}
static void
