From: visa <visa@openbsd.org>
Date: Mon, 19 Jun 2017 13:45:22 +0000 (+0000)
Subject: There is no RTC on the E1000 board.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d227ddd6f1f194bbece90ef81f14f5be018190f0;p=openbsd

There is no RTC on the E1000 board.
---

diff --git a/sys/arch/octeon/dev/octrtc.c b/sys/arch/octeon/dev/octrtc.c
index 8dd090abf8c..0a310c62c56 100644
--- a/sys/arch/octeon/dev/octrtc.c
+++ b/sys/arch/octeon/dev/octrtc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octrtc.c,v 1.5 2016/12/17 13:13:57 visa Exp $	*/
+/*	$OpenBSD: octrtc.c,v 1.6 2017/06/19 13:45:22 visa Exp $	*/
 
 /*
  * Copyright (c) 2013, 2014 Paul Irofti.
@@ -86,6 +86,7 @@ octrtc_match(struct device *parent, void *match, void *aux)
 	/* No RTC on Ubiquiti */
 	if ((octeon_boot_info->board_type == BOARD_TYPE_UBIQUITI_E100) ||
 	    (octeon_boot_info->board_type == BOARD_TYPE_UBIQUITI_E200) ||
+	    (octeon_boot_info->board_type == BOARD_TYPE_UBIQUITI_E1000) ||
 	    (octeon_boot_info->board_type == BOARD_TYPE_RHINOLABS_SHASTA))
 		return 0;
 	return 1;
diff --git a/sys/arch/octeon/include/octeonvar.h b/sys/arch/octeon/include/octeonvar.h
index 2fed2082f4c..f65360770c6 100644
--- a/sys/arch/octeon/include/octeonvar.h
+++ b/sys/arch/octeon/include/octeonvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: octeonvar.h,v 1.33 2016/12/17 13:13:57 visa Exp $	*/
+/*	$OpenBSD: octeonvar.h,v 1.34 2017/06/19 13:45:22 visa Exp $	*/
 /*	$NetBSD: maltavar.h,v 1.3 2002/03/18 10:10:16 simonb Exp $	*/
 
 /*-
@@ -181,6 +181,7 @@ struct octeon_fau_map {
 #define	BOARD_TYPE_CN3010_EVB_HS5	11
 #define	BOARD_TYPE_UBIQUITI_E100	20002
 #define	BOARD_TYPE_UBIQUITI_E200	20003
+#define	BOARD_TYPE_UBIQUITI_E1000	20010
 #define	BOARD_TYPE_RHINOLABS_SHASTA	20012
 #define	BOARD_TYPE_DSR_500		20015