Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/arm/samsung Fix typo & include mct_reg.h
details: https://anonhg.NetBSD.org/src/rev/fac343f469d3
branches: trunk
changeset: 796585:fac343f469d3
user: matt <matt%NetBSD.org@localhost>
date: Wed Jun 11 05:54:54 2014 +0000
description:
Fix typo & include mct_reg.h
diffstat:
sys/arch/arm/samsung/exynos_soc.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (42 lines):
diff -r 82e51f849a66 -r fac343f469d3 sys/arch/arm/samsung/exynos_soc.c
--- a/sys/arch/arm/samsung/exynos_soc.c Wed Jun 11 05:50:46 2014 +0000
+++ b/sys/arch/arm/samsung/exynos_soc.c Wed Jun 11 05:54:54 2014 +0000
@@ -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 @@
#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 @@
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
Home |
Main Index |
Thread Index |
Old Index