Module Name: src
Committed By: reinoud
Date: Sat May 10 20:38:15 UTC 2014
Modified Files:
src/sys/arch/arm/samsung: exynos_io.c exynos_soc.c
Log Message:
No use in duplicating the frequency settings of mct and gtmr at two different
places.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/samsung/exynos_io.c
cvs rdiff -u -r1.9 -r1.10 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_io.c
diff -u src/sys/arch/arm/samsung/exynos_io.c:1.4 src/sys/arch/arm/samsung/exynos_io.c:1.5
--- src/sys/arch/arm/samsung/exynos_io.c:1.4 Sat May 10 20:24:06 2014
+++ src/sys/arch/arm/samsung/exynos_io.c Sat May 10 20:38:15 2014
@@ -34,7 +34,7 @@
#include "opt_exynos.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_io.c,v 1.4 2014/05/10 20:24:06 reinoud Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_io.c,v 1.5 2014/05/10 20:38:15 reinoud Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -92,13 +92,6 @@ exyo_print(void *aux, const char *pnp)
void
exyo_device_register(device_t self, void *aux)
{
- prop_dictionary_t dict = device_properties(self);
-
- if (device_is_a(self, "mct")) {
- /* This clock always runs at F_in / xusbxti of 24 Mhz */
- prop_dictionary_set_uint32(dict, "frequency", EXYNOS_F_IN_FREQ);
- return;
- }
}
void
Index: src/sys/arch/arm/samsung/exynos_soc.c
diff -u src/sys/arch/arm/samsung/exynos_soc.c:1.9 src/sys/arch/arm/samsung/exynos_soc.c:1.10
--- src/sys/arch/arm/samsung/exynos_soc.c:1.9 Sat May 10 20:24:06 2014
+++ src/sys/arch/arm/samsung/exynos_soc.c Sat May 10 20:38:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_soc.c,v 1.9 2014/05/10 20:24:06 reinoud Exp $ */
+/* $NetBSD: exynos_soc.c,v 1.10 2014/05/10 20:38:15 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.9 2014/05/10 20:24:06 reinoud Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.10 2014/05/10 20:38:15 reinoud Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -289,17 +289,15 @@ exynos_device_register(device_t self, vo
}
return;
}
-#if defined(CPU_CORTEXA7) || defined(CPU_CORTEXA15)
- if (device_is_a(self, "armgtmr")) {
+ if (device_is_a(self, "armgtmr") || device_is_a(self, "mct")) {
/*
- * The frequency of the generic timer is the reference
+ * The frequencies of the timers are the reference
* frequency.
*/
prop_dictionary_set_uint32(device_properties(self),
- "frequency", 24000000);
+ "frequency", EXYNOS_F_IN_FREQ);
return;
}
-#endif
exyo_device_register(self, aux);
}
