Module Name: src
Committed By: jmcneill
Date: Mon Jul 2 12:53:51 UTC 2018
Modified Files:
src/sys/arch/arm/samsung: files.exynos
src/sys/arch/evbarm/conf: EXYNOS
Log Message:
Attach mct early. Do not attach gtmr to mct.
XXX gtmr still needed for setstatclock symbol
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/EXYNOS
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/files.exynos
diff -u src/sys/arch/arm/samsung/files.exynos:1.26 src/sys/arch/arm/samsung/files.exynos:1.27
--- src/sys/arch/arm/samsung/files.exynos:1.26 Sun Jul 1 23:28:40 2018
+++ src/sys/arch/arm/samsung/files.exynos Mon Jul 2 12:53:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.exynos,v 1.26 2018/07/01 23:28:40 jmcneill Exp $
+# $NetBSD: files.exynos,v 1.27 2018/07/02 12:53:51 jmcneill Exp $
#
# Configuration info for Samsung Exynos SoC ARM Peripherals
#
@@ -56,7 +56,7 @@ attach exyortc at fdt with exynos_rtc
file arch/arm/samsung/exynos_rtc.c exynos_rtc
# Multi Core timer
-device mct { } : fdtbus, mpcorebus
+device mct
attach mct at fdt with exyo_mct
file arch/arm/samsung/mct.c exyo_mct
Index: src/sys/arch/evbarm/conf/EXYNOS
diff -u src/sys/arch/evbarm/conf/EXYNOS:1.26 src/sys/arch/evbarm/conf/EXYNOS:1.27
--- src/sys/arch/evbarm/conf/EXYNOS:1.26 Sun Jul 1 23:27:43 2018
+++ src/sys/arch/evbarm/conf/EXYNOS Mon Jul 2 12:53:51 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: EXYNOS,v 1.26 2018/07/01 23:27:43 jmcneill Exp $
+# $NetBSD: EXYNOS,v 1.27 2018/07/02 12:53:51 jmcneill Exp $
#
# Samsung Exynos SoC kernel
#
@@ -49,8 +49,9 @@ fregulator* at fdt? pass 4
gpiokeys* at fdt?
# Timer
-mct* at fdt? # Exynos Multi Core Timer (MCT)
-armgtmr0 at mct? # ARM Generic Timer
+mct* at fdt? pass 2 # Exynos Multi Core Timer (MCT)
+gtmr* at fdt? pass 2
+armgtmr0 at gtmr?
# Interrupt controller
exyointr* at fdt? pass 1
