Module Name: src
Committed By: reinoud
Date: Sat May 10 20:24:06 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: exynos_io.c exynos_soc.c exynos_var.h
src/sys/arch/evbarm/odroid: odroid_machdep.c
Log Message:
Implement evbarm_device_register_post_config() hook for odroid and its
decendents. This allows post attach actions on every level of the machine
support.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/samsung/exynos_io.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/samsung/exynos_soc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/samsung/exynos_var.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/odroid/odroid_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/samsung/exynos_io.c
diff -u src/sys/arch/arm/samsung/exynos_io.c:1.3 src/sys/arch/arm/samsung/exynos_io.c:1.4
--- src/sys/arch/arm/samsung/exynos_io.c:1.3 Fri May 9 22:19:22 2014
+++ src/sys/arch/arm/samsung/exynos_io.c Sat May 10 20:24:06 2014
@@ -34,7 +34,7 @@
#include "opt_exynos.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_io.c,v 1.3 2014/05/09 22:19:22 reinoud Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_io.c,v 1.4 2014/05/10 20:24:06 reinoud Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -101,6 +101,11 @@ exyo_device_register(device_t self, void
}
}
+void
+exyo_device_register_post_config(device_t self, void *aux)
+{
+}
+
static int
exyo_find(device_t parent, cfdata_t cf, const int *ldesc, void *aux)
{
Index: src/sys/arch/arm/samsung/exynos_soc.c
diff -u src/sys/arch/arm/samsung/exynos_soc.c:1.8 src/sys/arch/arm/samsung/exynos_soc.c:1.9
--- src/sys/arch/arm/samsung/exynos_soc.c:1.8 Fri May 9 21:49:43 2014
+++ src/sys/arch/arm/samsung/exynos_soc.c Sat May 10 20:24:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_soc.c,v 1.8 2014/05/09 21:49:43 reinoud Exp $ */
+/* $NetBSD: exynos_soc.c,v 1.9 2014/05/10 20:24:06 reinoud Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.8 2014/05/09 21:49:43 reinoud Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.9 2014/05/10 20:24:06 reinoud Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -304,3 +304,10 @@ exynos_device_register(device_t self, vo
exyo_device_register(self, aux);
}
+
+void
+exynos_device_register_post_config(device_t self, void *aux)
+{
+ exyo_device_register_post_config(self, aux);
+}
+
Index: src/sys/arch/arm/samsung/exynos_var.h
diff -u src/sys/arch/arm/samsung/exynos_var.h:1.7 src/sys/arch/arm/samsung/exynos_var.h:1.8
--- src/sys/arch/arm/samsung/exynos_var.h:1.7 Sat May 10 10:47:17 2014
+++ src/sys/arch/arm/samsung/exynos_var.h Sat May 10 20:24:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_var.h,v 1.7 2014/05/10 10:47:17 reinoud Exp $ */
+/* $NetBSD: exynos_var.h,v 1.8 2014/05/10 20:24:06 reinoud Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -118,7 +118,9 @@ extern void exynos_dma_bootstrap(psize_t
extern void exynos_gpio_bootstrap(void);
extern void exynos_device_register(device_t self, void *aux);
+extern void exynos_device_register_post_config(device_t self, void *aux);
extern void exyo_device_register(device_t self, void *aux);
+extern void exyo_device_register_post_config(device_t self, void *aux);
extern void exynos_wdt_reset(void);
extern bool exynos_gpio_pinset_available(const struct exynos_gpio_pinset *);
Index: src/sys/arch/evbarm/odroid/odroid_machdep.c
diff -u src/sys/arch/evbarm/odroid/odroid_machdep.c:1.13 src/sys/arch/evbarm/odroid/odroid_machdep.c:1.14
--- src/sys/arch/evbarm/odroid/odroid_machdep.c:1.13 Sat May 10 19:31:00 2014
+++ src/sys/arch/evbarm/odroid/odroid_machdep.c Sat May 10 20:24:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: odroid_machdep.c,v 1.13 2014/05/10 19:31:00 reinoud Exp $ */
+/* $NetBSD: odroid_machdep.c,v 1.14 2014/05/10 20:24:06 reinoud Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: odroid_machdep.c,v 1.13 2014/05/10 19:31:00 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: odroid_machdep.c,v 1.14 2014/05/10 20:24:06 reinoud Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_exynos.h"
@@ -203,6 +203,7 @@ void consinit(void);
static void kgdb_port_init(void);
#endif
void odroid_device_register(device_t self, void *aux);
+void odroid_device_register_post_config(device_t self, void *aux);
/*
@@ -403,6 +404,7 @@ strcpy(tmp, "-v");
/* we've a specific device_register routine */
evbarm_device_register = odroid_device_register;
+ evbarm_device_register_post_config = odroid_device_register_post_config;
/*
* If we couldn't map all of memory via TTBR1, limit the memory the
@@ -576,3 +578,10 @@ odroid_device_register(device_t self, vo
#endif
}
+
+void
+odroid_device_register_post_config(device_t self, void *aux)
+{
+ exynos_device_register_post_config(self, aux);
+}
+
