[src/trunk]: src/sys/arch/arm/samsung No use in duplicating the frequency set...

[reinoud <reinoud%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7125ce57dd82
branches:  trunk
changeset: 329140:7125ce57dd82
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Sat May 10 20:38:15 2014 +0000

description:
No use in duplicating the frequency settings of mct and gtmr at two different
places.

diffstat:

 sys/arch/arm/samsung/exynos_io.c  |   9 +--------
 sys/arch/arm/samsung/exynos_soc.c |  12 +++++-------
 2 files changed, 6 insertions(+), 15 deletions(-)

diffs (65 lines):

diff -r 57a068c6318c -r 7125ce57dd82 sys/arch/arm/samsung/exynos_io.c
--- a/sys/arch/arm/samsung/exynos_io.c  Sat May 10 20:24:06 2014 +0000
+++ b/sys/arch/arm/samsung/exynos_io.c  Sat May 10 20:38:15 2014 +0000
@@ -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 @@
 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
diff -r 57a068c6318c -r 7125ce57dd82 sys/arch/arm/samsung/exynos_soc.c
--- a/sys/arch/arm/samsung/exynos_soc.c Sat May 10 20:24:06 2014 +0000
+++ b/sys/arch/arm/samsung/exynos_soc.c Sat May 10 20:38:15 2014 +0000
@@ -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 @@
                }
                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);
 }