Module Name: src
Committed By: matt
Date: Wed Jun 11 05:54:54 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: exynos_soc.c
Log Message:
Fix typo & include mct_reg.h
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/samsung/exynos_soc.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_soc.c
diff -u src/sys/arch/arm/samsung/exynos_soc.c:1.13 src/sys/arch/arm/samsung/exynos_soc.c:1.14
--- src/sys/arch/arm/samsung/exynos_soc.c:1.13 Wed Jun 11 05:43:39 2014
+++ src/sys/arch/arm/samsung/exynos_soc.c Wed Jun 11 05:54:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_soc.c,v 1.13 2014/06/11 05:43:39 matt Exp $ */
+/* $NetBSD: exynos_soc.c,v 1.14 2014/06/11 05:54:54 matt 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.13 2014/06/11 05:43:39 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.14 2014/06/11 05:54:54 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -52,6 +52,7 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_soc.c
#include <arm/samsung/exynos_reg.h>
#include <arm/samsung/exynos_var.h>
+#include <arm/samsung/mct_reg.h>
#include <arm/samsung/smc.h>
#include <arm/cortex/pl310_var.h>
@@ -311,13 +312,13 @@ exynos_device_register(device_t self, vo
return;
}
if (device_is_a(self, "armgtmr") || device_is_a(self, "mct")) {
-#ifdef EXONYS5
+#ifdef EXYNOS5
/*
* The global timer is dependent on the MCT running.
*/
bus_size_t o = EXYNOS5_MCT_OFFSET + MCT_G_TCON;
uint32_t v = bus_space_read_4(&exynos_bs_tag, exynos_core_bsh,
- p);
+ o);
v |= G_TCON_START;
bus_space_write_4(&exynos_bs_tag, exynos_core_bsh, o, v);
#endif
